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

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


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

Added:
   branches/Branch_5_2/src/debian/dsf-in/common.config
   branches/Branch_5_2/src/debian/dsf-in/common.templates
   branches/Branch_5_2/src/debian/dsf-in/mta-exim4.config
   branches/Branch_5_2/src/debian/dsf-in/mta-exim4.templates
   branches/Branch_5_2/src/debian/dsf-in/mta-postfix.templates
Removed:
   branches/Branch_5_2/src/debian/dsf-in/common.config.dsfh-in
   branches/Branch_5_2/src/debian/dsf-in/common.templates.dsfh-in
   branches/Branch_5_2/src/debian/dsf-in/mta-exim4.config.dsfh-in
   branches/Branch_5_2/src/debian/dsf-in/mta-exim4.templates.dsfh-in
   branches/Branch_5_2/src/debian/dsf-in/mta-postfix.templates.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.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 replacement of dsf-helper

Copied: branches/Branch_5_2/src/debian/dsf-in/common.config (from rev 15597, branches/Branch_5_2/src/debian/dsf-in/common.config.dsfh-in)
===================================================================
--- branches/Branch_5_2/src/debian/dsf-in/common.config	                        (rev 0)
+++ branches/Branch_5_2/src/debian/dsf-in/common.config	2012-05-29 16:49:07 UTC (rev 15598)
@@ -0,0 +1,23 @@
+#!/bin/sh -e
+
+# Source debconf library.
+. /usr/share/debconf/confmodule
+
+db_get @PACKAGE@/shared/web_host || true
+if [ -z "$RET" ] ; then
+   hostname=$(hostname -f 2>/dev/null) || hostname=localhost
+   db_set @PACKAGE@/shared/web_host $hostname
+fi
+db_input medium @PACKAGE@/shared/web_host || true
+db_go || true
+
+db_get @PACKAGE@/shared/server_admin || true
+if [ -z "$RET" ] ; then
+  db_get @PACKAGE@/shared/web_host || true
+  db_set @PACKAGE@/shared/server_admin "webmaster@$RET"
+fi
+
+db_input medium @PACKAGE@/shared/server_admin || true
+db_input low @PACKAGE@/shared/forge_name || true
+
+db_go || true

Deleted: branches/Branch_5_2/src/debian/dsf-in/common.config.dsfh-in
===================================================================
--- branches/Branch_5_2/src/debian/dsf-in/common.config.dsfh-in	2012-05-29 16:48:26 UTC (rev 15597)
+++ branches/Branch_5_2/src/debian/dsf-in/common.config.dsfh-in	2012-05-29 16:49:07 UTC (rev 15598)
@@ -1,23 +0,0 @@
-#!/bin/sh -e
-
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
-db_get @PACKAGE@/shared/web_host || true
-if [ -z "$RET" ] ; then
-   hostname=$(hostname -f 2>/dev/null) || hostname=localhost
-   db_set @PACKAGE@/shared/web_host $hostname
-fi
-db_input medium @PACKAGE@/shared/web_host || true
-db_go || true
-
-db_get @PACKAGE@/shared/server_admin || true
-if [ -z "$RET" ] ; then
-  db_get @PACKAGE@/shared/web_host || true
-  db_set @PACKAGE@/shared/server_admin "webmaster@$RET"
-fi
-
-db_input medium @PACKAGE@/shared/server_admin || true
-db_input low @PACKAGE@/shared/forge_name || true
-
-db_go || true

Copied: branches/Branch_5_2/src/debian/dsf-in/common.templates (from rev 15597, branches/Branch_5_2/src/debian/dsf-in/common.templates.dsfh-in)
===================================================================
--- branches/Branch_5_2/src/debian/dsf-in/common.templates	                        (rev 0)
+++ branches/Branch_5_2/src/debian/dsf-in/common.templates	2012-05-29 16:49:07 UTC (rev 15598)
@@ -0,0 +1,22 @@
+# 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/web_host
+Type: string
+_Description: @FORGENAME@ domain or subdomain name:
+ Please enter the domain that will host the @FORGENAME@ installation. Some
+ services (scm, lists, etc.) will be given their own subdomain in that
+ domain.
+
+Template: @PACKAGE@/shared/forge_name
+Type: string
+Default: @FORGENAME@
+_Description: @FORGENAME@ system name:
+ Please enter the name of the @FORGENAME@ system. It is used in various places
+ throughout the system.

Deleted: branches/Branch_5_2/src/debian/dsf-in/common.templates.dsfh-in
===================================================================
--- branches/Branch_5_2/src/debian/dsf-in/common.templates.dsfh-in	2012-05-29 16:48:26 UTC (rev 15597)
+++ branches/Branch_5_2/src/debian/dsf-in/common.templates.dsfh-in	2012-05-29 16:49:07 UTC (rev 15598)
@@ -1,23 +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.
-
-#DSFHELPER:common-variables#
-Template: @PACKAGE@/shared/web_host
-Type: string
-_Description: @FORGENAME@ domain or subdomain name:
- Please enter the domain that will host the @FORGENAME@ installation. Some
- services (scm, lists, etc.) will be given their own subdomain in that
- domain.
-
-Template: @PACKAGE@/shared/forge_name
-Type: string
-Default: @FORGENAME@
-_Description: @FORGENAME@ system name:
- Please enter the name of the @FORGENAME@ system. It is used in various places
- throughout the system.

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:48:26 UTC (rev 15597)
+++ branches/Branch_5_2/src/debian/dsf-in/db-postgresql.templates.dsfh-in	2012-05-29 16:49:07 UTC (rev 15598)
@@ -15,8 +15,6 @@
  Please enter the hostname of the server that will host the @FORGENAME@
  shell accounts.
 
-#DSFHELPER:users-variables#
-
 #DSFHELPER:lists-variables#
 
 Template: @PACKAGE@/shared/download_host

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:48:26 UTC (rev 15597)
+++ branches/Branch_5_2/src/debian/dsf-in/dns-bind9.templates.dsfh-in	2012-05-29 16:49:07 UTC (rev 15598)
@@ -9,7 +9,6 @@
 
 #DSFHELPER:common-variables#
 #DSFHELPER:shellhost-variables#
-#DSFHELPER:users-variables#
 #DSFHELPER:lists-variables#
 #DSFHELPER:downloadhost-variables#
 #DSFHELPER:host-variables#

Copied: branches/Branch_5_2/src/debian/dsf-in/mta-exim4.config (from rev 15597, branches/Branch_5_2/src/debian/dsf-in/mta-exim4.config.dsfh-in)
===================================================================
--- branches/Branch_5_2/src/debian/dsf-in/mta-exim4.config	                        (rev 0)
+++ branches/Branch_5_2/src/debian/dsf-in/mta-exim4.config	2012-05-29 16:49:07 UTC (rev 15598)
@@ -0,0 +1,28 @@
+#!/bin/sh -e
+
+# Source debconf library.
+. /usr/share/debconf/confmodule
+
+if [ -f /etc/aliases. at OLDPACKAGE@-new ] 
+then
+	ucf --debconf-ok /etc/aliases. at OLDPACKAGE@-new /etc/aliases
+	rm /etc/aliases. at OLDPACKAGE@-new
+fi
+if [ -f /etc/exim4/exim4.conf. at OLDPACKAGE@-new ]
+then
+	ucf --debconf-ok /etc/exim4/exim4.conf. at OLDPACKAGE@-new /etc/exim4/exim4.conf
+	rm /etc/exim4/exim4.conf. at OLDPACKAGE@-new
+fi
+if [ -f /etc/exim4/exim4.conf.template. at OLDPACKAGE@-new ]
+then
+	ucf --debconf-ok /etc/exim4/exim4.conf.template. at OLDPACKAGE@-new /etc/exim4/exim4.conf.template
+	rm /etc/exim4/exim4.conf.template. at OLDPACKAGE@-new
+fi
+if [ -f /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs. at OLDPACKAGE@-new ]
+then
+	ucf --debconf-ok /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs. at OLDPACKAGE@-new /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs
+	rm /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs. at OLDPACKAGE@-new
+fi
+db_stop
+
+

Deleted: branches/Branch_5_2/src/debian/dsf-in/mta-exim4.config.dsfh-in
===================================================================
--- branches/Branch_5_2/src/debian/dsf-in/mta-exim4.config.dsfh-in	2012-05-29 16:48:26 UTC (rev 15597)
+++ branches/Branch_5_2/src/debian/dsf-in/mta-exim4.config.dsfh-in	2012-05-29 16:49:07 UTC (rev 15598)
@@ -1,28 +0,0 @@
-#!/bin/sh -e
-
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
-if [ -f /etc/aliases. at OLDPACKAGE@-new ] 
-then
-	ucf --debconf-ok /etc/aliases. at OLDPACKAGE@-new /etc/aliases
-	rm /etc/aliases. at OLDPACKAGE@-new
-fi
-if [ -f /etc/exim4/exim4.conf. at OLDPACKAGE@-new ]
-then
-	ucf --debconf-ok /etc/exim4/exim4.conf. at OLDPACKAGE@-new /etc/exim4/exim4.conf
-	rm /etc/exim4/exim4.conf. at OLDPACKAGE@-new
-fi
-if [ -f /etc/exim4/exim4.conf.template. at OLDPACKAGE@-new ]
-then
-	ucf --debconf-ok /etc/exim4/exim4.conf.template. at OLDPACKAGE@-new /etc/exim4/exim4.conf.template
-	rm /etc/exim4/exim4.conf.template. at OLDPACKAGE@-new
-fi
-if [ -f /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs. at OLDPACKAGE@-new ]
-then
-	ucf --debconf-ok /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs. at OLDPACKAGE@-new /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs
-	rm /etc/exim4/conf.d/main/01_exim4-config_listmacrosdefs. at OLDPACKAGE@-new
-fi
-db_stop
-
-

Copied: branches/Branch_5_2/src/debian/dsf-in/mta-exim4.templates (from rev 15597, branches/Branch_5_2/src/debian/dsf-in/mta-exim4.templates.dsfh-in)
===================================================================
--- branches/Branch_5_2/src/debian/dsf-in/mta-exim4.templates	                        (rev 0)
+++ branches/Branch_5_2/src/debian/dsf-in/mta-exim4.templates	2012-05-29 16:49:07 UTC (rev 15598)
@@ -0,0 +1,11 @@
+Template: @PACKAGE@/shared/noreply_to_bitbucket
+Type: boolean
+Default: true
+_Description: Do you want mail to ${noreply} to be deleted?
+ @FORGENAME@ sends plenty of e-mail from the "${noreply}" address,
+ and maybe even some e-mail to that address too.
+ .
+ It is advised that you let the package direct e-mail to that address to a
+ black hole (/dev/null), unless you have another use for that address.
+ .
+ Accepting this option will perform that redirection.

Deleted: branches/Branch_5_2/src/debian/dsf-in/mta-exim4.templates.dsfh-in
===================================================================
--- branches/Branch_5_2/src/debian/dsf-in/mta-exim4.templates.dsfh-in	2012-05-29 16:48:26 UTC (rev 15597)
+++ branches/Branch_5_2/src/debian/dsf-in/mta-exim4.templates.dsfh-in	2012-05-29 16:49:07 UTC (rev 15598)
@@ -1,15 +0,0 @@
-#DSFHELPER:common-variables#
-#DSFHELPER:users-variables#
-#DSFHELPER:lists-variables#
-
-Template: @PACKAGE@/shared/noreply_to_bitbucket
-Type: boolean
-Default: true
-_Description: Do you want mail to ${noreply} to be deleted?
- @FORGENAME@ sends plenty of e-mail from the "${noreply}" address,
- and maybe even some e-mail to that address too.
- .
- It is advised that you let the package direct e-mail to that address to a
- black hole (/dev/null), unless you have another use for that address.
- .
- Accepting this option will perform that redirection.

Copied: branches/Branch_5_2/src/debian/dsf-in/mta-postfix.templates (from rev 15597, branches/Branch_5_2/src/debian/dsf-in/mta-postfix.templates.dsfh-in)
===================================================================
--- branches/Branch_5_2/src/debian/dsf-in/mta-postfix.templates	                        (rev 0)
+++ branches/Branch_5_2/src/debian/dsf-in/mta-postfix.templates	2012-05-29 16:49:07 UTC (rev 15598)
@@ -0,0 +1,18 @@
+# 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/noreply_to_bitbucket
+Type: boolean
+Default: true
+_Description: Do you want mail to ${noreply} to be discarded?
+ @FORGENAME@ sends and receives plenty of e-mail to and from the
+ "${noreply}" address.
+ .
+ E-mail to that address should be directed to a
+ black hole (/dev/null), unless you have another use for that address.

Deleted: branches/Branch_5_2/src/debian/dsf-in/mta-postfix.templates.dsfh-in
===================================================================
--- branches/Branch_5_2/src/debian/dsf-in/mta-postfix.templates.dsfh-in	2012-05-29 16:48:26 UTC (rev 15597)
+++ branches/Branch_5_2/src/debian/dsf-in/mta-postfix.templates.dsfh-in	2012-05-29 16:49:07 UTC (rev 15598)
@@ -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.
-
-#DSFHELPER:common-variables#
-#DSFHELPER:users-variables#
-#DSFHELPER:lists-variables#
-
-Template: @PACKAGE@/shared/noreply_to_bitbucket
-Type: boolean
-Default: true
-_Description: Do you want mail to ${noreply} to be discarded?
- @FORGENAME@ sends and receives plenty of e-mail to and from the
- "${noreply}" address.
- .
- E-mail to that address should be directed to a
- black hole (/dev/null), unless you have another use for that address.

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:48:26 UTC (rev 15597)
+++ branches/Branch_5_2/src/debian/dsf-in/web-apache2.templates.dsfh-in	2012-05-29 16:49:07 UTC (rev 15598)
@@ -4,7 +4,6 @@
 #DSFHELPER:ftpuploadhost-variables#
 #DSFHELPER:jabberhost-variables#
 #DSFHELPER:lists-variables#
-#DSFHELPER:users-variables#
 #DSFHELPER:shellhost-variables#
 #DSFHELPER:web-variables#
 #DSFHELPER:groupid-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:48:26 UTC (rev 15597)
+++ branches/Branch_5_2/src/debian/dsf-po/POTFILES.in	2012-05-29 16:49:07 UTC (rev 15598)
@@ -1,7 +1,6 @@
-[type: gettext/rfc822deb] dsf-in/common.templates.dsfh-in
+[type: gettext/rfc822deb] dsf-in/common.templates
 [type: gettext/rfc822deb] dsf-in/db-postgresql.templates.dsfh-in
 [type: gettext/rfc822deb] dsf-in/dns-bind9.templates.dsfh-in
-[type: gettext/rfc822deb] dsf-in/mta-postfix.templates.dsfh-in
 [type: gettext/rfc822deb] dsf-helper/common-variables.templates
 [type: gettext/rfc822deb] dsf-helper/dbhost-variables.templates
 [type: gettext/rfc822deb] dsf-helper/dbpasswd-variables.templates
@@ -10,5 +9,4 @@
 [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/users-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:48:26 UTC (rev 15597)
+++ branches/Branch_5_2/src/debian/dsf-po/cs.po	2012-05-29 16:49:07 UTC (rev 15598)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: fusionforge at packages.debian.org\n"
-"POT-Creation-Date: 2012-03-16 10:20+0100\n"
+"POT-Creation-Date: 2012-05-29 12:10+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"
@@ -26,6 +26,55 @@
 
 #. Type: string
 #. Description
+#: ../dsf-in/common.templates:2001
+#: ../dsf-helper/common-variables.templates:2001
+#, fuzzy
+#| msgid "@FORGENAME@ domain or subdomain name:"
+msgid "@FORGENAME@ domain or subdomain name:"
+msgstr "Název @FORGENAME@ domény nebo subdomény:"
+
+#. Type: string
+#. Description
+#: ../dsf-in/common.templates:2001
+#: ../dsf-helper/common-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the domain that will host the @FORGENAME@ installation. Some "
+#| "services (scm, lists, etc.) will be given their own subdomain in that "
+#| "domain."
+msgid ""
+"Please enter the domain that will host the @FORGENAME@ installation. Some "
+"services (scm, lists, etc.) will be given their own subdomain in that domain."
+msgstr ""
+"Zadejte prosím doménu, která bude hostit vaši instalaci @FORGENAME at . Některé "
+"služby obdrží své vlastní subdomény této domény (scm, lists, atd.)."
+
+#. Type: string
+#. Description
+#: ../dsf-in/common.templates:3001
+#: ../dsf-helper/common-variables.templates:4001
+#, fuzzy
+#| msgid "@FORGENAME@ system name:"
+msgid "@FORGENAME@ system name:"
+msgstr "Jméno @FORGENAME@ systému:"
+
+#. Type: string
+#. Description
+#: ../dsf-in/common.templates:3001
+#: ../dsf-helper/common-variables.templates:4001
+#, fuzzy
+#| msgid ""
+#| "Please enter the name of the @FORGENAME@ system. It is used in various "
+#| "places throughout the system."
+msgid ""
+"Please enter the name of the @FORGENAME@ system. It is used in various "
+"places throughout the system."
+msgstr ""
+"Zadejte prosím jméno @FORGENAME@ systému. Toto jméno je v systému používáno "
+"na několika místech."
+
+#. Type: string
+#. Description
 #: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 #: ../dsf-helper/shellhost-variables.templates:2001
 msgid "Shell server:"
@@ -68,7 +117,6 @@
 #: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 #: ../dsf-helper/lists-variables.templates:2001
-#: ../dsf-helper/users-variables.templates:2001
 #, fuzzy
 #| msgid "It should not be the same as the main @FORGENAME@ host."
 msgid "It should not be the same as the main @FORGENAME@ host."
@@ -186,61 +234,8 @@
 "Nastavení bude pouze předpokládat, budete mít všechny adresáře s weby "
 "projektů na jednom počítači a že pro SCM použijete jediný server."
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid "Do you want mail to ${noreply} to be discarded?"
-msgstr "Chcete, aby se pošta doručená na ${noreply} zahazovala?"
-
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-#, fuzzy
-#| msgid ""
-#| "@FORGENAME@ sends and receives plenty of e-mail to and from the "
-#| "\"${noreply}\" address."
-msgid ""
-"@FORGENAME@ sends and receives plenty of e-mail to and from the "
-"\"${noreply}\" address."
-msgstr ""
-"@FORGENAME@ využívá adresu „${noreply}“ k odesílání i příjmu velkého "
-"množství pošty."
-
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid ""
-"E-mail to that address should be directed to a black hole (/dev/null), "
-"unless you have another use for that address."
-msgstr ""
-"Pokud s touto adresou nemáte jiné plány, doporučujeme veškerou příchozí "
-"poštu přesměrovat do černé díry (/dev/null)."
-
 #. Type: string
 #. Description
-#: ../dsf-helper/common-variables.templates:2001
-#, fuzzy
-#| msgid "@FORGENAME@ domain or subdomain name:"
-msgid "@FORGENAME@ domain or subdomain name:"
-msgstr "Název @FORGENAME@ domény nebo subdomény:"
-
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:2001
-#, fuzzy
-#| msgid ""
-#| "Please enter the domain that will host the @FORGENAME@ installation. Some "
-#| "services (scm, lists, etc.) will be given their own subdomain in that "
-#| "domain."
-msgid ""
-"Please enter the domain that will host the @FORGENAME@ installation. Some "
-"services (scm, lists, etc.) will be given their own subdomain in that domain."
-msgstr ""
-"Zadejte prosím doménu, která bude hostit vaši instalaci @FORGENAME at . Některé "
-"služby obdrží své vlastní subdomény této domény (scm, lists, atd.)."
-
-#. Type: string
-#. Description
 #: ../dsf-helper/common-variables.templates:3001
 #, fuzzy
 #| msgid "@FORGENAME@ administrator e-mail address:"
@@ -263,28 +258,6 @@
 
 #. Type: string
 #. Description
-#: ../dsf-helper/common-variables.templates:4001
-#, fuzzy
-#| msgid "@FORGENAME@ system name:"
-msgid "@FORGENAME@ system name:"
-msgstr "Jméno @FORGENAME@ systému:"
-
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:4001
-#, fuzzy
-#| msgid ""
-#| "Please enter the name of the @FORGENAME@ system. It is used in various "
-#| "places throughout the system."
-msgid ""
-"Please enter the name of the @FORGENAME@ system. It is used in various "
-"places throughout the system."
-msgstr ""
-"Zadejte prosím jméno @FORGENAME@ systému. Toto jméno je v systému používáno "
-"na několika místech."
-
-#. Type: string
-#. Description
 #: ../dsf-helper/dbhost-variables.templates:2001
 msgid "Database server:"
 msgstr "Databázový server:"
@@ -440,26 +413,6 @@
 msgstr ""
 "Zadejte prosím jméno serveru, který bude hostit shellové účty @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-msgid "User mail redirector server:"
-msgstr "Server pro přesměrování pošty:"
-
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-#, fuzzy
-#| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ "
-#| "user mail redirector."
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ user "
-"mail redirector."
-msgstr ""
-"Zadejte prosím jméno serveru, který bude hostit přesměrování pošty pro "
-"uživatele @FORGENAME at ."
-
 #. Type: select
 #. Choices
 #: ../dsf-helper/web-variables.templates:2001
@@ -636,7 +589,42 @@
 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?"
+
 #, fuzzy
+#~| msgid ""
+#~| "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#~| "\"${noreply}\" address."
+#~ msgid ""
+#~ "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#~ "\"${noreply}\" address."
+#~ msgstr ""
+#~ "@FORGENAME@ využívá adresu „${noreply}“ k odesílání i příjmu velkého "
+#~ "množství pošty."
+
+#~ msgid ""
+#~ "E-mail to that address should be directed to a black hole (/dev/null), "
+#~ "unless you have another use for that address."
+#~ msgstr ""
+#~ "Pokud s touto adresou nemáte jiné plány, doporučujeme veškerou příchozí "
+#~ "poštu přesměrovat do černé díry (/dev/null)."
+
+#~ msgid "User mail redirector server:"
+#~ msgstr "Server pro přesměrování pošty:"
+
+#, fuzzy
+#~| msgid ""
+#~| "Please enter the host name of the server that will host the @FORGENAME@ "
+#~| "user mail redirector."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "user mail redirector."
+#~ msgstr ""
+#~ "Zadejte prosím jméno serveru, který bude hostit přesměrování pošty pro "
+#~ "uživatele @FORGENAME at ."
+
+#, fuzzy
 #~| msgid "@FORGENAME@ administrator login:"
 #~ msgid "@FORGENAME@ administrator login:"
 #~ msgstr "Přihlašovací jméno správce @FORGENAME@:"

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:48:26 UTC (rev 15597)
+++ branches/Branch_5_2/src/debian/dsf-po/de.po	2012-05-29 16:49:07 UTC (rev 15598)
@@ -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-03-16 10:20+0100\n"
+"POT-Creation-Date: 2012-05-29 12:10+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"
@@ -17,6 +17,45 @@
 
 #. Type: string
 #. Description
+#: ../dsf-in/common.templates:2001
+#: ../dsf-helper/common-variables.templates:2001
+msgid "@FORGENAME@ domain or subdomain name:"
+msgstr "@FORGENAME@ Domain- oder Subdomain-Name:"
+
+#. Type: string
+#. Description
+#: ../dsf-in/common.templates:2001
+#: ../dsf-helper/common-variables.templates:2001
+msgid ""
+"Please enter the domain that will host the @FORGENAME@ installation. Some "
+"services (scm, lists, etc.) will be given their own subdomain in that domain."
+msgstr ""
+"Bitte geben Sie die Domain an, die Ihre @FORGENAME at -Installation beherbergen "
+"wird. Einigen Diensten (scm, lists, usw.) wird innerhalb der Domain eine "
+"eigene Subdomain zugewiesen."
+
+#. Type: string
+#. Description
+#: ../dsf-in/common.templates:3001
+#: ../dsf-helper/common-variables.templates:4001
+#, fuzzy
+#| msgid "@FORGENAME@/FusionForge system name:"
+msgid "@FORGENAME@ system name:"
+msgstr "@FORGENAME@/FusionForge-Systemname:"
+
+#. Type: string
+#. Description
+#: ../dsf-in/common.templates:3001
+#: ../dsf-helper/common-variables.templates:4001
+msgid ""
+"Please enter the name of the @FORGENAME@ system. It is used in various "
+"places throughout the system."
+msgstr ""
+"Bitte geben Sie den Namen des @FORGENAME at -Systems ein. Er wird an "
+"verschiedenen Stellen im ganzen System verwendet."
+
+#. Type: string
+#. Description
 #: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 #: ../dsf-helper/shellhost-variables.templates:2001
 msgid "Shell server:"
@@ -54,7 +93,6 @@
 #: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 #: ../dsf-helper/lists-variables.templates:2001
-#: ../dsf-helper/users-variables.templates:2001
 msgid "It should not be the same as the main @FORGENAME@ host."
 msgstr ""
 "Dieser sollte nicht mit dem Namen des Haupt- at FORGENAME@-Rechners "
@@ -167,52 +205,8 @@
 "angenommen, dass sich alle Webverzeichnisse der Projekte auf dem gleichen "
 "Server mit einem einzelnen Server für SCM befinden."
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid "Do you want mail to ${noreply} to be discarded?"
-msgstr "Möchten Sie, dass E-Mail an ${noreply} verworfen wird?"
-
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid ""
-"@FORGENAME@ sends and receives plenty of e-mail to and from the "
-"\"${noreply}\" address."
-msgstr ""
-"@FORGENAME@ sendet und empfängt viele E-Mails von und auf der »${noreply}«-"
-"Adresse."
-
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid ""
-"E-mail to that address should be directed to a black hole (/dev/null), "
-"unless you have another use for that address."
-msgstr ""
-"E-Mails an diese Adresse sollten an ein schwarzes Loch (/dev/null) "
-"umgeleitet werden, es sei denn, Sie haben für diese Adresse eine andere "
-"Verwendung."
-
 #. Type: string
 #. Description
-#: ../dsf-helper/common-variables.templates:2001
-msgid "@FORGENAME@ domain or subdomain name:"
-msgstr "@FORGENAME@ Domain- oder Subdomain-Name:"
-
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:2001
-msgid ""
-"Please enter the domain that will host the @FORGENAME@ installation. Some "
-"services (scm, lists, etc.) will be given their own subdomain in that domain."
-msgstr ""
-"Bitte geben Sie die Domain an, die Ihre @FORGENAME at -Installation beherbergen "
-"wird. Einigen Diensten (scm, lists, usw.) wird innerhalb der Domain eine "
-"eigene Subdomain zugewiesen."
-
-#. Type: string
-#. Description
 #: ../dsf-helper/common-variables.templates:3001
 msgid "@FORGENAME@ administrator e-mail address:"
 msgstr "E-Mail-Adresse des @FORGENAME at -Administrators:"
@@ -229,24 +223,6 @@
 
 #. Type: string
 #. Description
-#: ../dsf-helper/common-variables.templates:4001
-#, fuzzy
-#| msgid "@FORGENAME@/FusionForge system name:"
-msgid "@FORGENAME@ system name:"
-msgstr "@FORGENAME@/FusionForge-Systemname:"
-
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:4001
-msgid ""
-"Please enter the name of the @FORGENAME@ system. It is used in various "
-"places throughout the system."
-msgstr ""
-"Bitte geben Sie den Namen des @FORGENAME at -Systems ein. Er wird an "
-"verschiedenen Stellen im ganzen System verwendet."
-
-#. Type: string
-#. Description
 #: ../dsf-helper/dbhost-variables.templates:2001
 msgid "Database server:"
 msgstr "Datenbank-Server:"
@@ -379,22 +355,6 @@
 "Bitte geben Sie den Rechnernamen des Servers ein, der Ihre @FORGENAME at -Shell-"
 "Konten beherbergen wird."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-msgid "User mail redirector server:"
-msgstr "Benutzer-E-Mail-Umleitungsserver:"
-
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ user "
-"mail redirector."
-msgstr ""
-"Bitte geben Sie den Rechnernamen des Servers ein, der Ihren @FORGENAME at -"
-"Benutzer-E-Mail-Umleiter beherbergen wird."
-
 #. Type: select
 #. Choices
 #: ../dsf-helper/web-variables.templates:2001
@@ -572,6 +532,34 @@
 "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?"
+
+#~ msgid ""
+#~ "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#~ "\"${noreply}\" address."
+#~ msgstr ""
+#~ "@FORGENAME@ sendet und empfängt viele E-Mails von und auf der "
+#~ "»${noreply}«-Adresse."
+
+#~ msgid ""
+#~ "E-mail to that address should be directed to a black hole (/dev/null), "
+#~ "unless you have another use for that address."
+#~ msgstr ""
+#~ "E-Mails an diese Adresse sollten an ein schwarzes Loch (/dev/null) "
+#~ "umgeleitet werden, es sei denn, Sie haben für diese Adresse eine andere "
+#~ "Verwendung."
+
+#~ msgid "User mail redirector server:"
+#~ msgstr "Benutzer-E-Mail-Umleitungsserver:"
+
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "user mail redirector."
+#~ msgstr ""
+#~ "Bitte geben Sie den Rechnernamen des Servers ein, der Ihren @FORGENAME at -"
+#~ "Benutzer-E-Mail-Umleiter beherbergen wird."
+
 #~ msgid "@FORGENAME@ administrator login:"
 #~ msgstr "@FORGENAME at -Administrator-Anmeldung:"
 

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:48:26 UTC (rev 15597)
+++ branches/Branch_5_2/src/debian/dsf-po/es.po	2012-05-29 16:49:07 UTC (rev 15598)
@@ -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-03-16 10:20+0100\n"
+"POT-Creation-Date: 2012-05-29 12:10+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"
@@ -42,6 +42,55 @@
 
 #. Type: string
 #. Description
+#: ../dsf-in/common.templates:2001
+#: ../dsf-helper/common-variables.templates:2001
+#, fuzzy
+#| msgid "@FORGENAME@ domain or subdomain name:"
+msgid "@FORGENAME@ domain or subdomain name:"
+msgstr "El nombre de dominio o subdominio de @FORGENAME@:"
+
+#. Type: string
+#. Description
+#: ../dsf-in/common.templates:2001
+#: ../dsf-helper/common-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the domain that will host the @FORGENAME@ installation. Some "
+#| "services (scm, lists, etc.) will be given their own subdomain in that "
+#| "domain."
+msgid ""
+"Please enter the domain that will host the @FORGENAME@ installation. Some "
+"services (scm, lists, etc.) will be given their own subdomain in that domain."
+msgstr ""
+"Introduzca el dominio que albergará la instalación de @FORGENAME at . Algunos "
+"servicios (scm, lists, etc.) tendrán su propio subdominio en ese dominio."
+
+#. Type: string
+#. Description
+#: ../dsf-in/common.templates:3001
+#: ../dsf-helper/common-variables.templates:4001
+#, fuzzy
+#| msgid "@FORGENAME@ system name:"
+msgid "@FORGENAME@ system name:"
+msgstr "Nombre del sistema de @FORGENAME@:"
+
+#. Type: string
+#. Description
+#: ../dsf-in/common.templates:3001
+#: ../dsf-helper/common-variables.templates:4001
+#, fuzzy
+#| msgid ""
+#| "Please enter the name of the @FORGENAME@ system. It is used in various "
+#| "places throughout the system."
+msgid ""
+"Please enter the name of the @FORGENAME@ system. It is used in various "
+"places throughout the system."
+msgstr ""
+"Introduzca el nombre del sistema de @FORGENAME at . Se utiliza en varios sitios "
+"del sistema."
+
+#. Type: string
+#. Description
 #: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 #: ../dsf-helper/shellhost-variables.templates:2001
 msgid "Shell server:"
@@ -86,7 +135,6 @@
 #: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 #: ../dsf-helper/lists-variables.templates:2001
-#: ../dsf-helper/users-variables.templates:2001
 #, fuzzy
 #| msgid "It should not be the same as the main @FORGENAME@ host."
 msgid "It should not be the same as the main @FORGENAME@ host."
@@ -207,62 +255,8 @@
 "que todos los directorios web de los proyectos están en el mismo servidor y "
 "que tiene un único servidor para SCM."
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid "Do you want mail to ${noreply} to be discarded?"
-msgstr "¿Desea borrar los correos enviados a ${noreply}?"
-
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-#, fuzzy
-#| msgid ""
-#| "@FORGENAME@ sends and receives plenty of e-mail to and from the "
-#| "\"${noreply}\" address."
-msgid ""
-"@FORGENAME@ sends and receives plenty of e-mail to and from the "
-"\"${noreply}\" address."
-msgstr ""
-"@FORGENAME@ envía y recibe muchos correos electrónicos hacia y desde la "
-"dirección «${noreply}»."
-
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid ""
-"E-mail to that address should be directed to a black hole (/dev/null), "
-"unless you have another use for that address."
-msgstr ""
-"Los correos electrónicos que se envíen a esa dirección se deberían "
-"redireccionar a un agujero negro («/dev/null»), a menos que esa dirección "
-"tenga otro uso."
-
 #. Type: string
 #. Description
-#: ../dsf-helper/common-variables.templates:2001
-#, fuzzy
-#| msgid "@FORGENAME@ domain or subdomain name:"
-msgid "@FORGENAME@ domain or subdomain name:"
-msgstr "El nombre de dominio o subdominio de @FORGENAME@:"
-
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:2001
-#, fuzzy
-#| msgid ""
-#| "Please enter the domain that will host the @FORGENAME@ installation. Some "
-#| "services (scm, lists, etc.) will be given their own subdomain in that "
-#| "domain."
-msgid ""
-"Please enter the domain that will host the @FORGENAME@ installation. Some "
-"services (scm, lists, etc.) will be given their own subdomain in that domain."
-msgstr ""
-"Introduzca el dominio que albergará la instalación de @FORGENAME at . Algunos "
-"servicios (scm, lists, etc.) tendrán su propio subdominio en ese dominio."
-
-#. Type: string
-#. Description
 #: ../dsf-helper/common-variables.templates:3001
 #, fuzzy
 #| msgid "@FORGENAME@ administrator e-mail address:"
@@ -285,28 +279,6 @@
 
 #. Type: string
 #. Description
-#: ../dsf-helper/common-variables.templates:4001
-#, fuzzy
-#| msgid "@FORGENAME@ system name:"
-msgid "@FORGENAME@ system name:"
-msgstr "Nombre del sistema de @FORGENAME@:"
-
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:4001
-#, fuzzy
-#| msgid ""
-#| "Please enter the name of the @FORGENAME@ system. It is used in various "
-#| "places throughout the system."
-msgid ""
-"Please enter the name of the @FORGENAME@ system. It is used in various "
-"places throughout the system."
-msgstr ""
-"Introduzca el nombre del sistema de @FORGENAME at . Se utiliza en varios sitios "
-"del sistema."
-
-#. Type: string
-#. Description
 #: ../dsf-helper/dbhost-variables.templates:2001
 msgid "Database server:"
 msgstr "Servidor de bases de datos:"
@@ -468,26 +440,6 @@
 "Introduzca el nombre del servidor que albergará las cuentas de la consola de "
 "@FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-msgid "User mail redirector server:"
-msgstr "Servidor de reenvío de los correos de usuarios:"
-
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-#, fuzzy
-#| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ "
-#| "user mail redirector."
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ user "
-"mail redirector."
-msgstr ""
-"Introduzca el nombre del servidor que albergará el redirector de los correos "
-"electrónicos de usuarios de @FORGENAME at ."
-
 #. Type: select
 #. Choices
 #: ../dsf-helper/web-variables.templates:2001
@@ -664,7 +616,43 @@
 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}?"
+
 #, fuzzy
+#~| msgid ""
+#~| "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#~| "\"${noreply}\" address."
+#~ msgid ""
+#~ "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#~ "\"${noreply}\" address."
+#~ msgstr ""
+#~ "@FORGENAME@ envía y recibe muchos correos electrónicos hacia y desde la "
+#~ "dirección «${noreply}»."
+
+#~ msgid ""
+#~ "E-mail to that address should be directed to a black hole (/dev/null), "
+#~ "unless you have another use for that address."
+#~ msgstr ""
+#~ "Los correos electrónicos que se envíen a esa dirección se deberían "
+#~ "redireccionar a un agujero negro («/dev/null»), a menos que esa dirección "
+#~ "tenga otro uso."
+
+#~ msgid "User mail redirector server:"
+#~ msgstr "Servidor de reenvío de los correos de usuarios:"
+
+#, fuzzy
+#~| msgid ""
+#~| "Please enter the host name of the server that will host the @FORGENAME@ "
+#~| "user mail redirector."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "user mail redirector."
+#~ msgstr ""
+#~ "Introduzca el nombre del servidor que albergará el redirector de los "
+#~ "correos electrónicos de usuarios de @FORGENAME at ."
+
+#, fuzzy
 #~| msgid "@FORGENAME@ administrator login:"
 #~ msgid "@FORGENAME@ administrator login:"
 #~ msgstr "Usuario del administrador de @FORGENAME@:"

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:48:26 UTC (rev 15597)
+++ branches/Branch_5_2/src/debian/dsf-po/fi.po	2012-05-29 16:49:07 UTC (rev 15598)
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: fusionforge at packages.debian.org\n"
-"POT-Creation-Date: 2012-03-16 10:20+0100\n"
+"POT-Creation-Date: 2012-05-29 12:10+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"
@@ -15,6 +15,56 @@
 
 #. Type: string
 #. Description
+#: ../dsf-in/common.templates:2001
+#: ../dsf-helper/common-variables.templates:2001
+#, fuzzy
+#| msgid "@FORGENAME@ domain or subdomain name:"
+msgid "@FORGENAME@ domain or subdomain name:"
+msgstr "@FORGENAME at n verkkotunnus tai aliverkkotunnus:"
+
+#. Type: string
+#. Description
+#: ../dsf-in/common.templates:2001
+#: ../dsf-helper/common-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the domain that will host the @FORGENAME@ installation. Some "
+#| "services (scm, lists, etc.) will be given their own subdomain in that "
+#| "domain."
+msgid ""
+"Please enter the domain that will host the @FORGENAME@ installation. Some "
+"services (scm, lists, etc.) will be given their own subdomain in that domain."
+msgstr ""
+"Anna @FORGENAME at -asennuksen verkkotunnus. Joillekin palveluille "
+"(versionhallinta, listat, jne.) annetaan oma aliverkkotunnus tämän "
+"verkkotunnuksen alta."
+
+#. Type: string
+#. Description
+#: ../dsf-in/common.templates:3001
+#: ../dsf-helper/common-variables.templates:4001
+#, fuzzy
+#| msgid "@FORGENAME@ system name:"
+msgid "@FORGENAME@ system name:"
+msgstr "@FORGENAME at n järjestelmänimi:"
+
+#. Type: string
+#. Description
+#: ../dsf-in/common.templates:3001
+#: ../dsf-helper/common-variables.templates:4001
+#, fuzzy
+#| msgid ""
+#| "Please enter the name of the @FORGENAME@ system. It is used in various "
+#| "places throughout the system."
+msgid ""
+"Please enter the name of the @FORGENAME@ system. It is used in various "
+"places throughout the system."
+msgstr ""
+"Anna @FORGENAME at -järjestelmän nimi. Tätä käytetään eri paikoissa ympäri "
+"järjestelmää."
+
+#. Type: string
+#. Description
 #: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 #: ../dsf-helper/shellhost-variables.templates:2001
 msgid "Shell server:"
@@ -57,7 +107,6 @@
 #: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 #: ../dsf-helper/lists-variables.templates:2001
-#: ../dsf-helper/users-variables.templates:2001
 #, fuzzy
 #| msgid "It should not be the same as the main @FORGENAME@ host."
 msgid "It should not be the same as the main @FORGENAME@ host."
@@ -176,63 +225,8 @@
 "projektien verkkohakemistot ovat samalla palvelimella yhden "
 "versionhallintapalvelimen kanssa."
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid "Do you want mail to ${noreply} to be discarded?"
-msgstr ""
-"Haluatko, että osoitteeseen ${noreply} tuleva sähköposti heitetään pois?"
-
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-#, fuzzy
-#| msgid ""
-#| "@FORGENAME@ sends and receives plenty of e-mail to and from the "
-#| "\"${noreply}\" address."
-msgid ""
-"@FORGENAME@ sends and receives plenty of e-mail to and from the "
-"\"${noreply}\" address."
-msgstr ""
-"@FORGENAME@ lähettää ja vastaanottaa paljon sähköpostia osoitteen "
-"”${noreply}” kautta."
-
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid ""
-"E-mail to that address should be directed to a black hole (/dev/null), "
-"unless you have another use for that address."
-msgstr ""
-"Tuohon osoitteeseen tuleva sähköposti tulisi ohjata mustaan aukkoon (/dev/"
-"null), jos osoitteelle ei ole muuta käyttöä."
-
 #. Type: string
 #. Description
-#: ../dsf-helper/common-variables.templates:2001
-#, fuzzy
-#| msgid "@FORGENAME@ domain or subdomain name:"
-msgid "@FORGENAME@ domain or subdomain name:"
-msgstr "@FORGENAME at n verkkotunnus tai aliverkkotunnus:"
-
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:2001
-#, fuzzy
-#| msgid ""
-#| "Please enter the domain that will host the @FORGENAME@ installation. Some "
-#| "services (scm, lists, etc.) will be given their own subdomain in that "
-#| "domain."
-msgid ""
-"Please enter the domain that will host the @FORGENAME@ installation. Some "
-"services (scm, lists, etc.) will be given their own subdomain in that domain."
-msgstr ""
-"Anna @FORGENAME at -asennuksen verkkotunnus. Joillekin palveluille "
-"(versionhallinta, listat, jne.) annetaan oma aliverkkotunnus tämän "
-"verkkotunnuksen alta."
-
-#. Type: string
-#. Description
 #: ../dsf-helper/common-variables.templates:3001
 #, fuzzy
 #| msgid "@FORGENAME@ administrator e-mail address:"
@@ -255,28 +249,6 @@
 
 #. Type: string
 #. Description
-#: ../dsf-helper/common-variables.templates:4001
-#, fuzzy
-#| msgid "@FORGENAME@ system name:"
-msgid "@FORGENAME@ system name:"
-msgstr "@FORGENAME at n järjestelmänimi:"
-
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:4001
-#, fuzzy
-#| msgid ""
-#| "Please enter the name of the @FORGENAME@ system. It is used in various "
-#| "places throughout the system."
-msgid ""
-"Please enter the name of the @FORGENAME@ system. It is used in various "
-"places throughout the system."
-msgstr ""
-"Anna @FORGENAME at -järjestelmän nimi. Tätä käytetään eri paikoissa ympäri "
-"järjestelmää."
-
-#. Type: string
-#. Description
 #: ../dsf-helper/dbhost-variables.templates:2001
 msgid "Database server:"
 msgstr "Tietokantapalvelin:"
@@ -429,26 +401,6 @@
 msgstr ""
 "Anna @FORGENAME at n komentorivitunnuksia isännöivän palvelimen verkkonimi."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-msgid "User mail redirector server:"
-msgstr "Käyttäjäpostien edelleenohjaajapalvelin:"
-
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-#, fuzzy
-#| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ "
-#| "user mail redirector."
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ user "
-"mail redirector."
-msgstr ""
-"Anna @FORGENAME at n käyttäjäpostien edelleenohjaajaa isännöivän palvelimen "
-"verkkonimi."
-
 #. Type: select
 #. Choices
 #: ../dsf-helper/web-variables.templates:2001
@@ -624,7 +576,43 @@
 "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?"
+
 #, fuzzy
+#~| msgid ""
+#~| "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#~| "\"${noreply}\" address."
+#~ msgid ""
+#~ "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#~ "\"${noreply}\" address."
+#~ msgstr ""
+#~ "@FORGENAME@ lähettää ja vastaanottaa paljon sähköpostia osoitteen "
+#~ "”${noreply}” kautta."
+
+#~ msgid ""
+#~ "E-mail to that address should be directed to a black hole (/dev/null), "
+#~ "unless you have another use for that address."
+#~ msgstr ""
+#~ "Tuohon osoitteeseen tuleva sähköposti tulisi ohjata mustaan aukkoon (/dev/"
+#~ "null), jos osoitteelle ei ole muuta käyttöä."
+
+#~ msgid "User mail redirector server:"
+#~ msgstr "Käyttäjäpostien edelleenohjaajapalvelin:"
+
+#, fuzzy
+#~| msgid ""
+#~| "Please enter the host name of the server that will host the @FORGENAME@ "
+#~| "user mail redirector."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "user mail redirector."
+#~ msgstr ""
+#~ "Anna @FORGENAME at n käyttäjäpostien edelleenohjaajaa isännöivän palvelimen "
+#~ "verkkonimi."
+
+#, fuzzy
 #~| msgid "@FORGENAME@ administrator login:"
 #~ msgid "@FORGENAME@ administrator login:"
 #~ msgstr "@FORGENAME at n ylläpitotunnus:"

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:48:26 UTC (rev 15597)
+++ branches/Branch_5_2/src/debian/dsf-po/fr.po	2012-05-29 16:49:07 UTC (rev 15598)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGENAME@\n"
 "Report-Msgid-Bugs-To: fusionforge at packages.debian.org\n"
-"POT-Creation-Date: 2012-03-16 10:20+0100\n"
+"POT-Creation-Date: 2012-05-29 12:10+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"
@@ -20,6 +20,45 @@
 
 #. Type: string
 #. Description
+#: ../dsf-in/common.templates:2001
+#: ../dsf-helper/common-variables.templates:2001
+msgid "@FORGENAME@ domain or subdomain name:"
+msgstr "Nom de domaine ou de sous-domaine @FORGENAME@ :"
+
+#. Type: string
+#. Description
+#: ../dsf-in/common.templates:2001
+#: ../dsf-helper/common-variables.templates:2001
+msgid ""
+"Please enter the domain that will host the @FORGENAME@ installation. Some "
+"services (scm, lists, etc.) will be given their own subdomain in that domain."
+msgstr ""
+"Veuillez indiquer le nom de domaine qui hébergera le serveur @FORGENAME at . "
+"Certains services auront leur propre sous-domaine à l'intérieur de ce "
+"domaine (scm, lists, etc.)."
+
+#. Type: string
+#. Description
+#: ../dsf-in/common.templates:3001
+#: ../dsf-helper/common-variables.templates:4001
+#, fuzzy
+#| msgid "@FORGENAME@/FusionForge system name:"
+msgid "@FORGENAME@ system name:"
+msgstr "Nom du système @FORGENAME@/FusionForge :"
+
+#. Type: string
+#. Description
+#: ../dsf-in/common.templates:3001
+#: ../dsf-helper/common-variables.templates:4001
+msgid ""
+"Please enter the name of the @FORGENAME@ system. It is used in various "
+"places throughout the system."
+msgstr ""
+"Veuillez indiquer le nom du système @FORGENAME at . Il est utilisé dans "
+"plusieurs parties du serveur."
+
+#. Type: string
+#. Description
 #: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 #: ../dsf-helper/shellhost-variables.templates:2001
 msgid "Shell server:"
@@ -56,7 +95,6 @@
 #: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 #: ../dsf-helper/lists-variables.templates:2001
-#: ../dsf-helper/users-variables.templates:2001
 msgid "It should not be the same as the main @FORGENAME@ host."
 msgstr "Ce nom devrait être différent du nom d'hôte principal de @FORGENAME at ."
 
@@ -168,51 +206,8 @@
 "choix n'apporte qu'une restriction : tous les répertoires web sont sur un "
 "seul serveur, ainsi que tous les entrepôts SCM."
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid "Do you want mail to ${noreply} to be discarded?"
-msgstr "Faut-il supprimer les courriers pour ${noreply} ?"
-
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid ""
-"@FORGENAME@ sends and receives plenty of e-mail to and from the "
-"\"${noreply}\" address."
-msgstr ""
-"@FORGENAME@ envoie fréquemment des courriers de et vers l'adresse "
-"« ${noreply} »."
-
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid ""
-"E-mail to that address should be directed to a black hole (/dev/null), "
-"unless you have another use for that address."
-msgstr ""
-"Il est conseillé de rediriger les courriers adressés à cette adresse vers un "
-"trou noir (/dev/null), sauf si elle est utilisée par ailleurs."
-
 #. Type: string
 #. Description
-#: ../dsf-helper/common-variables.templates:2001
-msgid "@FORGENAME@ domain or subdomain name:"
-msgstr "Nom de domaine ou de sous-domaine @FORGENAME@ :"
-
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:2001
-msgid ""
-"Please enter the domain that will host the @FORGENAME@ installation. Some "
-"services (scm, lists, etc.) will be given their own subdomain in that domain."
-msgstr ""
-"Veuillez indiquer le nom de domaine qui hébergera le serveur @FORGENAME at . "
-"Certains services auront leur propre sous-domaine à l'intérieur de ce "
-"domaine (scm, lists, etc.)."
-
-#. Type: string
-#. Description
 #: ../dsf-helper/common-variables.templates:3001
 msgid "@FORGENAME@ administrator e-mail address:"
 msgstr "Adresse électronique de l'administrateur @FORGENAME@ :"
@@ -229,24 +224,6 @@
 
 #. Type: string
 #. Description
-#: ../dsf-helper/common-variables.templates:4001
-#, fuzzy
-#| msgid "@FORGENAME@/FusionForge system name:"
-msgid "@FORGENAME@ system name:"
-msgstr "Nom du système @FORGENAME@/FusionForge :"
-
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:4001
-msgid ""
-"Please enter the name of the @FORGENAME@ system. It is used in various "
-"places throughout the system."
-msgstr ""
-"Veuillez indiquer le nom du système @FORGENAME at . Il est utilisé dans "
-"plusieurs parties du serveur."
-
-#. Type: string
-#. Description
 #: ../dsf-helper/dbhost-variables.templates:2001
 msgid "Database server:"
 msgstr "Serveur de base de données :"
@@ -378,22 +355,6 @@
 "Veuillez indiquer le nom d'hôte du serveur qui hébergera les comptes "
 "interactifs @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-msgid "User mail redirector server:"
-msgstr "Redirecteur des courriers des utilisateurs :"
-
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ user "
-"mail redirector."
-msgstr ""
-"Veuillez indiquer le nom du serveur qui hébergera le redirecteur du courriel "
-"utilisateurs de @FORGENAME at ."
-
 #. Type: select
 #. Choices
 #: ../dsf-helper/web-variables.templates:2001
@@ -571,6 +532,33 @@
 "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} ?"
+
+#~ msgid ""
+#~ "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#~ "\"${noreply}\" address."
+#~ msgstr ""
+#~ "@FORGENAME@ envoie fréquemment des courriers de et vers l'adresse "
+#~ "« ${noreply} »."
+
+#~ msgid ""
+#~ "E-mail to that address should be directed to a black hole (/dev/null), "
+#~ "unless you have another use for that address."
+#~ msgstr ""
+#~ "Il est conseillé de rediriger les courriers adressés à cette adresse vers "
+#~ "un trou noir (/dev/null), sauf si elle est utilisée par ailleurs."
+
+#~ msgid "User mail redirector server:"
+#~ msgstr "Redirecteur des courriers des utilisateurs :"
+
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "user mail redirector."
+#~ msgstr ""
+#~ "Veuillez indiquer le nom du serveur qui hébergera le redirecteur du "
+#~ "courriel utilisateurs de @FORGENAME at ."
+
 #~ msgid "@FORGENAME@ administrator login:"
 #~ msgstr "Identifiant de l'administrateur de @FORGENAME@ :"
 

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:48:26 UTC (rev 15597)
+++ branches/Branch_5_2/src/debian/dsf-po/gl.po	2012-05-29 16:49:07 UTC (rev 15598)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: fusionforge at packages.debian.org\n"
-"POT-Creation-Date: 2012-03-16 10:20+0100\n"
+"POT-Creation-Date: 2012-05-29 12:10+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"
@@ -17,6 +17,56 @@
 
 #. Type: string
 #. Description
+#: ../dsf-in/common.templates:2001
+#: ../dsf-helper/common-variables.templates:2001
+#, fuzzy
+#| msgid "@FORGENAME@ domain or subdomain name:"
+msgid "@FORGENAME@ domain or subdomain name:"
+msgstr "Nome de dominio ou subdominio de @FORGENAME@:"
+
+#. Type: string
+#. Description
+#: ../dsf-in/common.templates:2001
+#: ../dsf-helper/common-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the domain that will host the @FORGENAME@ installation. Some "
+#| "services (scm, lists, etc.) will be given their own subdomain in that "
+#| "domain."
+msgid ""
+"Please enter the domain that will host the @FORGENAME@ installation. Some "
+"services (scm, lists, etc.) will be given their own subdomain in that domain."
+msgstr ""
+"Introduza o dominio que ha hospedar a instalación de @FORGENAME at . Algúns "
+"servizos (scm, listas, etc.) han ter o seu propio subdominio dentro dese "
+"dominio."
+
+#. Type: string
+#. Description
+#: ../dsf-in/common.templates:3001
+#: ../dsf-helper/common-variables.templates:4001
+#, fuzzy
+#| msgid "@FORGENAME@ system name:"
+msgid "@FORGENAME@ system name:"
+msgstr "Nome do sistema @FORGENAME@:"
+
+#. Type: string
+#. Description
+#: ../dsf-in/common.templates:3001
+#: ../dsf-helper/common-variables.templates:4001
+#, fuzzy
+#| msgid ""
+#| "Please enter the name of the @FORGENAME@ system. It is used in various "
+#| "places throughout the system."
+msgid ""
+"Please enter the name of the @FORGENAME@ system. It is used in various "
+"places throughout the system."
+msgstr ""
+"Introduza o nome do sistema @FORGENAME at . Emprégase en varios lugares do "
+"sistema."
+
+#. Type: string
+#. Description
 #: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 #: ../dsf-helper/shellhost-variables.templates:2001
 msgid "Shell server:"
@@ -60,7 +110,6 @@
 #: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 #: ../dsf-helper/lists-variables.templates:2001
-#: ../dsf-helper/users-variables.templates:2001
 #, fuzzy
 #| msgid "It should not be the same as the main @FORGENAME@ host."
 msgid "It should not be the same as the main @FORGENAME@ host."
@@ -179,62 +228,8 @@
 "os servidores dos proxectos; só supón que tódolos directorios web dos "
 "proxectos están no mesmo servidor cun só servidor para SCM."
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid "Do you want mail to ${noreply} to be discarded?"
-msgstr "¿Quere que se descarten as mensaxes enviadas a ${noreply}?"
-
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-#, fuzzy
-#| msgid ""
-#| "@FORGENAME@ sends and receives plenty of e-mail to and from the "
-#| "\"${noreply}\" address."
-msgid ""
-"@FORGENAME@ sends and receives plenty of e-mail to and from the "
-"\"${noreply}\" address."
-msgstr ""
-"@FORGENAME@ envía e recibe moito email desde e para o enderezo "
-"\"${noreply}\"."
-
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid ""
-"E-mail to that address should be directed to a black hole (/dev/null), "
-"unless you have another use for that address."
-msgstr ""
-"O email dirixido a ese enderezo debería ser enviado a un burato negro (/dev/"
-"null), a menos que empregue ese enderezo para outra cousa."
-
 #. Type: string
 #. Description
-#: ../dsf-helper/common-variables.templates:2001
-#, fuzzy
-#| msgid "@FORGENAME@ domain or subdomain name:"
-msgid "@FORGENAME@ domain or subdomain name:"
-msgstr "Nome de dominio ou subdominio de @FORGENAME@:"
-
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:2001
-#, fuzzy
-#| msgid ""
-#| "Please enter the domain that will host the @FORGENAME@ installation. Some "
-#| "services (scm, lists, etc.) will be given their own subdomain in that "
-#| "domain."
-msgid ""
-"Please enter the domain that will host the @FORGENAME@ installation. Some "
-"services (scm, lists, etc.) will be given their own subdomain in that domain."
-msgstr ""
-"Introduza o dominio que ha hospedar a instalación de @FORGENAME at . Algúns "
-"servizos (scm, listas, etc.) han ter o seu propio subdominio dentro dese "
-"dominio."
-
-#. Type: string
-#. Description
 #: ../dsf-helper/common-variables.templates:3001
 #, fuzzy
 #| msgid "@FORGENAME@ administrator e-mail address:"
@@ -257,28 +252,6 @@
 
 #. Type: string
 #. Description
-#: ../dsf-helper/common-variables.templates:4001
-#, fuzzy
-#| msgid "@FORGENAME@ system name:"
-msgid "@FORGENAME@ system name:"
-msgstr "Nome do sistema @FORGENAME@:"
-
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:4001
-#, fuzzy
-#| msgid ""
-#| "Please enter the name of the @FORGENAME@ system. It is used in various "
-#| "places throughout the system."
-msgid ""
-"Please enter the name of the @FORGENAME@ system. It is used in various "
-"places throughout the system."
-msgstr ""
-"Introduza o nome do sistema @FORGENAME at . Emprégase en varios lugares do "
-"sistema."
-
-#. Type: string
-#. Description
 #: ../dsf-helper/dbhost-variables.templates:2001
 msgid "Database server:"
 msgstr "Servidor de bases de datos:"
@@ -438,26 +411,6 @@
 msgstr ""
 "Introduza o nome do servidor que ha hospedar as contas shell de @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-msgid "User mail redirector server:"
-msgstr "Redirector de correo dos usuarios:"
-
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-#, fuzzy
-#| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ "
-#| "user mail redirector."
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ user "
-"mail redirector."
-msgstr ""
-"Introduza o nome do servidor que ha hospedar o redirector do correo dos "
-"usuarios de @FORGENAME at ."
-
 #. Type: select
 #. Choices
 #: ../dsf-helper/web-variables.templates:2001
@@ -634,7 +587,42 @@
 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}?"
+
 #, fuzzy
+#~| msgid ""
+#~| "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#~| "\"${noreply}\" address."
+#~ msgid ""
+#~ "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#~ "\"${noreply}\" address."
+#~ msgstr ""
+#~ "@FORGENAME@ envía e recibe moito email desde e para o enderezo "
+#~ "\"${noreply}\"."
+
+#~ msgid ""
+#~ "E-mail to that address should be directed to a black hole (/dev/null), "
+#~ "unless you have another use for that address."
+#~ msgstr ""
+#~ "O email dirixido a ese enderezo debería ser enviado a un burato negro (/"
+#~ "dev/null), a menos que empregue ese enderezo para outra cousa."
+
+#~ msgid "User mail redirector server:"
+#~ msgstr "Redirector de correo dos usuarios:"
+
+#, fuzzy
+#~| msgid ""
+#~| "Please enter the host name of the server that will host the @FORGENAME@ "
+#~| "user mail redirector."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "user mail redirector."
+#~ msgstr ""
+#~ "Introduza o nome do servidor que ha hospedar o redirector do correo dos "
+#~ "usuarios de @FORGENAME at ."
+
+#, fuzzy
 #~| msgid "@FORGENAME@ administrator login:"
 #~ msgid "@FORGENAME@ administrator login:"
 #~ msgstr "Nome do usuario administrador de @FORGENAME@:"

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:48:26 UTC (rev 15597)
+++ branches/Branch_5_2/src/debian/dsf-po/nl.po	2012-05-29 16:49:07 UTC (rev 15598)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: fusionforge at packages.debian.org\n"
-"POT-Creation-Date: 2012-03-16 10:20+0100\n"
+"POT-Creation-Date: 2012-05-29 12:10+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"
@@ -29,6 +29,64 @@
 #  Description
 #. Type: string
 #. Description
+#: ../dsf-in/common.templates:2001
+#: ../dsf-helper/common-variables.templates:2001
+#, fuzzy
+#| msgid "@FORGENAME@ domain or subdomain name:"
+msgid "@FORGENAME@ domain or subdomain name:"
+msgstr "De @FORGENAME at -domeinnaam (of subdomeinnaam):"
+
+#  Type: string
+#  Description
+#. Type: string
+#. Description
+#: ../dsf-in/common.templates:2001
+#: ../dsf-helper/common-variables.templates:2001
+#, fuzzy
+#| msgid ""
+#| "Please enter the domain that will host the @FORGENAME@ installation. Some "
+#| "services (scm, lists, etc.) will be given their own subdomain in that "
+#| "domain."
+msgid ""
+"Please enter the domain that will host the @FORGENAME@ installation. Some "
+"services (scm, lists, etc.) will be given their own subdomain in that domain."
+msgstr ""
+"Wat is het domein waarop uw @FORGENAME at -installatie gehost wordt? Sommige "
+"diensten (broncodebeheer, lijsten, ...) zullen hun eigen subdomein krijgen "
+"binnen dat domein."
+
+#  Type: string
+#  Description
+#. Type: string
+#. Description
+#: ../dsf-in/common.templates:3001
+#: ../dsf-helper/common-variables.templates:4001
+#, fuzzy
+#| msgid "@FORGENAME@ system name:"
+msgid "@FORGENAME@ system name:"
+msgstr "Naam van het @FORGENAME at -systeem:"
+
+#  Type: string
+#  Description
+#. Type: string
+#. Description
+#: ../dsf-in/common.templates:3001
+#: ../dsf-helper/common-variables.templates:4001
+#, fuzzy
+#| msgid ""
+#| "Please enter the name of the @FORGENAME@ system. It is used in various "
+#| "places throughout the system."
+msgid ""
+"Please enter the name of the @FORGENAME@ system. It is used in various "
+"places throughout the system."
+msgstr ""
+"Wat is de naam van het @FORGENAME at -systeem? Deze naam wordt op verschillende "
+"plaatsen in het systeem gebruikt."
+
+#  Type: string
+#  Description
+#. Type: string
+#. Description
 #: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 #: ../dsf-helper/shellhost-variables.templates:2001
 msgid "Shell server:"
@@ -80,7 +138,6 @@
 #: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 #: ../dsf-helper/lists-variables.templates:2001
-#: ../dsf-helper/users-variables.templates:2001
 #, fuzzy
 #| msgid "It should not be the same as the main @FORGENAME@ host."
 msgid "It should not be the same as the main @FORGENAME@ host."
@@ -221,74 +278,10 @@
 "dat alle project-webmappen op dezelfde server staan, en dat u een enkele "
 "server heeft voor bronbeheer (SCM)."
 
-#  Type: boolean
-#  Description
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid "Do you want mail to ${noreply} to be discarded?"
-msgstr "Wilt u dat e-mail voor ${noreply} weggegooid wordt?"
-
-#  Type: boolean
-#  Description
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-#, fuzzy
-#| msgid ""
-#| "@FORGENAME@ sends and receives plenty of e-mail to and from the "
-#| "\"${noreply}\" address."
-msgid ""
-"@FORGENAME@ sends and receives plenty of e-mail to and from the "
-"\"${noreply}\" address."
-msgstr ""
-"@FORGENAME@ verstuurt en ontvangt een heleboel e-mails van en naar  het "
-"adres '${noreply}'."
-
-#  Type: boolean
-#  Description
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid ""
-"E-mail to that address should be directed to a black hole (/dev/null), "
-"unless you have another use for that address."
-msgstr ""
-"Tenzij u dat adres voor iets anders gebruikt is het aan te raden om de e-"
-"mail naar dat adres om te leiden naar een zwart gat (/dev/null)."
-
 #  Type: string
 #  Description
 #. Type: string
 #. Description
-#: ../dsf-helper/common-variables.templates:2001
-#, fuzzy
-#| msgid "@FORGENAME@ domain or subdomain name:"
-msgid "@FORGENAME@ domain or subdomain name:"
-msgstr "De @FORGENAME at -domeinnaam (of subdomeinnaam):"
-
-#  Type: string
-#  Description
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:2001
-#, fuzzy
-#| msgid ""
-#| "Please enter the domain that will host the @FORGENAME@ installation. Some "
-#| "services (scm, lists, etc.) will be given their own subdomain in that "
-#| "domain."
-msgid ""
-"Please enter the domain that will host the @FORGENAME@ installation. Some "
-"services (scm, lists, etc.) will be given their own subdomain in that domain."
-msgstr ""
-"Wat is het domein waarop uw @FORGENAME at -installatie gehost wordt? Sommige "
-"diensten (broncodebeheer, lijsten, ...) zullen hun eigen subdomein krijgen "
-"binnen dat domein."
-
-#  Type: string
-#  Description
-#. Type: string
-#. Description
 #: ../dsf-helper/common-variables.templates:3001
 #, fuzzy
 #| msgid "@FORGENAME@ administrator e-mail address:"
@@ -315,32 +308,6 @@
 #  Description
 #. Type: string
 #. Description
-#: ../dsf-helper/common-variables.templates:4001
-#, fuzzy
-#| msgid "@FORGENAME@ system name:"
-msgid "@FORGENAME@ system name:"
-msgstr "Naam van het @FORGENAME at -systeem:"
-
-#  Type: string
-#  Description
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:4001
-#, fuzzy
-#| msgid ""
-#| "Please enter the name of the @FORGENAME@ system. It is used in various "
-#| "places throughout the system."
-msgid ""
-"Please enter the name of the @FORGENAME@ system. It is used in various "
-"places throughout the system."
-msgstr ""
-"Wat is de naam van het @FORGENAME at -systeem? Deze naam wordt op verschillende "
-"plaatsen in het systeem gebruikt."
-
-#  Type: string
-#  Description
-#. Type: string
-#. Description
 #: ../dsf-helper/dbhost-variables.templates:2001
 msgid "Database server:"
 msgstr "Databaseserver:"
@@ -523,30 +490,6 @@
 "Wat is de computernaam van de server die de @FORGENAME at -shellaccounts gaat "
 "aanbieden?"
 
-#  Type: string
-#  Description
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-msgid "User mail redirector server:"
-msgstr "De e-mail-doorstuur-server:"
-
-#  Type: string
-#  Description
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-#, fuzzy
-#| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ "
-#| "user mail redirector."
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ user "
-"mail redirector."
-msgstr ""
-"Wat is de computernaam van de server verantwoordelijk voor het doorsturen "
-"van de mail voor @FORGENAME at -gebruikers?"
-
 #  Type: select
 #  DefaultChoice
 #. Type: select
@@ -778,9 +721,54 @@
 "Wat wordt het standaardthema voor webpagina's? Dit dient een geldige naam te "
 "zijn."
 
+#  Type: boolean
+#  Description
+#~ msgid "Do you want mail to ${noreply} to be discarded?"
+#~ msgstr "Wilt u dat e-mail voor ${noreply} weggegooid wordt?"
+
+#  Type: boolean
+#  Description
+#, fuzzy
+#~| msgid ""
+#~| "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#~| "\"${noreply}\" address."
+#~ msgid ""
+#~ "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#~ "\"${noreply}\" address."
+#~ msgstr ""
+#~ "@FORGENAME@ verstuurt en ontvangt een heleboel e-mails van en naar  het "
+#~ "adres '${noreply}'."
+
+#  Type: boolean
+#  Description
+#~ msgid ""
+#~ "E-mail to that address should be directed to a black hole (/dev/null), "
+#~ "unless you have another use for that address."
+#~ msgstr ""
+#~ "Tenzij u dat adres voor iets anders gebruikt is het aan te raden om de e-"
+#~ "mail naar dat adres om te leiden naar een zwart gat (/dev/null)."
+
 #  Type: string
 #  Description
+#~ msgid "User mail redirector server:"
+#~ msgstr "De e-mail-doorstuur-server:"
+
+#  Type: string
+#  Description
 #, fuzzy
+#~| msgid ""
+#~| "Please enter the host name of the server that will host the @FORGENAME@ "
+#~| "user mail redirector."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "user mail redirector."
+#~ msgstr ""
+#~ "Wat is de computernaam van de server verantwoordelijk voor het doorsturen "
+#~ "van de mail voor @FORGENAME at -gebruikers?"
+
+#  Type: string
+#  Description
+#, fuzzy
 #~| msgid "@FORGENAME@ administrator login:"
 #~ msgid "@FORGENAME@ administrator login:"
 #~ msgstr "Gebruikersnaam @FORGENAME at -beheerder:"

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:48:26 UTC (rev 15597)
+++ branches/Branch_5_2/src/debian/dsf-po/pt.po	2012-05-29 16:49:07 UTC (rev 15598)
@@ -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-03-16 10:20+0100\n"
+"POT-Creation-Date: 2012-05-29 12:10+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"
@@ -18,6 +18,49 @@
 
 #. Type: string
 #. Description
+#: ../dsf-in/common.templates:2001
+#: ../dsf-helper/common-variables.templates:2001
+msgid "@FORGENAME@ domain or subdomain name:"
+msgstr "O nome do domínio ou subdomínio do @FORGENAME@:"
+
+#. Type: string
+#. Description
+#: ../dsf-in/common.templates:2001
+#: ../dsf-helper/common-variables.templates:2001
+msgid ""
+"Please enter the domain that will host the @FORGENAME@ installation. Some "
+"services (scm, lists, etc.) will be given their own subdomain in that domain."
+msgstr ""
+"Por favor introduza o domínio que vai conter a instalação do @FORGENAME at . "
+"Alguns serviços (scm, listas de mail, etc.) terão o seu próprio subdomínio "
+"nesse domínio."
+
+#. Type: string
+#. Description
+#: ../dsf-in/common.templates:3001
+#: ../dsf-helper/common-variables.templates:4001
+#, fuzzy
+#| msgid "@FORGENAME@ system name:"
+msgid "@FORGENAME@ system name:"
+msgstr "Nome do sistema @FORGENAME@:"
+
+#. Type: string
+#. Description
+#: ../dsf-in/common.templates:3001
+#: ../dsf-helper/common-variables.templates:4001
+#, fuzzy
+#| msgid ""
+#| "Please enter the name of the @FORGENAME@ system. It is used in various "
+#| "places throughout the system."
+msgid ""
+"Please enter the name of the @FORGENAME@ system. It is used in various "
+"places throughout the system."
+msgstr ""
+"Por favor introduza o nome do sistema @FORGENAME at . Este nome é utilizado em "
+"vários lugares pelo sistema."
+
+#. Type: string
+#. Description
 #: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 #: ../dsf-helper/shellhost-variables.templates:2001
 msgid "Shell server:"
@@ -63,7 +106,6 @@
 #: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 #: ../dsf-helper/lists-variables.templates:2001
-#: ../dsf-helper/users-variables.templates:2001
 #, fuzzy
 #| msgid "It should not be the same as the main @FORGENAME@ host."
 msgid "It should not be the same as the main @FORGENAME@ host."
@@ -182,55 +224,8 @@
 "tem os directórios de projectos no mesmo servidor e tem um único servidor "
 "SCM."
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid "Do you want mail to ${noreply} to be discarded?"
-msgstr "Deseja que o mail para ${noreply} seja apagado?"
-
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-#, fuzzy
-#| msgid ""
-#| "@FORGENAME@ sends and receives plenty of e-mail to and from the "
-#| "\"${noreply}\" address."
-msgid ""
-"@FORGENAME@ sends and receives plenty of e-mail to and from the "
-"\"${noreply}\" address."
-msgstr ""
-"O @FORGENAME@ envia e recebe bastante e-mail para e a partir do endereço "
-"\"${noreply}\"."
-
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid ""
-"E-mail to that address should be directed to a black hole (/dev/null), "
-"unless you have another use for that address."
-msgstr ""
-"Os e-mails para esse endereço devem ser redireccionados para um buraco negro "
-"(/dev/null), a não ser que tenha outro uso para esse endereço."
-
 #. Type: string
 #. Description
-#: ../dsf-helper/common-variables.templates:2001
-msgid "@FORGENAME@ domain or subdomain name:"
-msgstr "O nome do domínio ou subdomínio do @FORGENAME@:"
-
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:2001
-msgid ""
-"Please enter the domain that will host the @FORGENAME@ installation. Some "
-"services (scm, lists, etc.) will be given their own subdomain in that domain."
-msgstr ""
-"Por favor introduza o domínio que vai conter a instalação do @FORGENAME at . "
-"Alguns serviços (scm, listas de mail, etc.) terão o seu próprio subdomínio "
-"nesse domínio."
-
-#. Type: string
-#. Description
 #: ../dsf-helper/common-variables.templates:3001
 #, fuzzy
 #| msgid "@FORGENAME@ administrator e-mail address:"
@@ -253,28 +248,6 @@
 
 #. Type: string
 #. Description
-#: ../dsf-helper/common-variables.templates:4001
-#, fuzzy
-#| msgid "@FORGENAME@ system name:"
-msgid "@FORGENAME@ system name:"
-msgstr "Nome do sistema @FORGENAME@:"
-
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:4001
-#, fuzzy
-#| msgid ""
-#| "Please enter the name of the @FORGENAME@ system. It is used in various "
-#| "places throughout the system."
-msgid ""
-"Please enter the name of the @FORGENAME@ system. It is used in various "
-"places throughout the system."
-msgstr ""
-"Por favor introduza o nome do sistema @FORGENAME at . Este nome é utilizado em "
-"vários lugares pelo sistema."
-
-#. Type: string
-#. Description
 #: ../dsf-helper/dbhost-variables.templates:2001
 msgid "Database server:"
 msgstr "Servidor de bases de dados:"
@@ -419,26 +392,6 @@
 "Por favor introduza o nome do servidor onde irão ficar as contas de shell do "
 "@FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-msgid "User mail redirector server:"
-msgstr "Servidor de redireccionamento de mail dos utilizadores:"
-
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-#, fuzzy
-#| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ "
-#| "user mail redirector."
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ user "
-"mail redirector."
-msgstr ""
-"Por favor introduza o nome do servidor que fará o redireccionamento do mail "
-"dos utilizadores do @FORGENAME at ."
-
 #. Type: select
 #. Choices
 #: ../dsf-helper/web-variables.templates:2001
@@ -616,7 +569,42 @@
 "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?"
+
 #, fuzzy
+#~| msgid ""
+#~| "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#~| "\"${noreply}\" address."
+#~ msgid ""
+#~ "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#~ "\"${noreply}\" address."
+#~ msgstr ""
+#~ "O @FORGENAME@ envia e recebe bastante e-mail para e a partir do endereço "
+#~ "\"${noreply}\"."
+
+#~ msgid ""
+#~ "E-mail to that address should be directed to a black hole (/dev/null), "
+#~ "unless you have another use for that address."
+#~ msgstr ""
+#~ "Os e-mails para esse endereço devem ser redireccionados para um buraco "
+#~ "negro (/dev/null), a não ser que tenha outro uso para esse endereço."
+
+#~ msgid "User mail redirector server:"
+#~ msgstr "Servidor de redireccionamento de mail dos utilizadores:"
+
+#, fuzzy
+#~| msgid ""
+#~| "Please enter the host name of the server that will host the @FORGENAME@ "
+#~| "user mail redirector."
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "user mail redirector."
+#~ msgstr ""
+#~ "Por favor introduza o nome do servidor que fará o redireccionamento do "
+#~ "mail dos utilizadores do @FORGENAME at ."
+
+#, fuzzy
 #~| msgid "@FORGENAME@ administrator login:"
 #~ msgid "@FORGENAME@ administrator login:"
 #~ msgstr "Login do administrador do @FORGENAME@:"

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:48:26 UTC (rev 15597)
+++ branches/Branch_5_2/src/debian/dsf-po/ru.po	2012-05-29 16:49:07 UTC (rev 15598)
@@ -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-03-16 10:20+0100\n"
+"POT-Creation-Date: 2012-05-29 12:10+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"
@@ -22,6 +22,45 @@
 
 #. Type: string
 #. Description
+#: ../dsf-in/common.templates:2001
+#: ../dsf-helper/common-variables.templates:2001
+msgid "@FORGENAME@ domain or subdomain name:"
+msgstr "Имя домена или поддомена @FORGENAME@:"
+
+#. Type: string
+#. Description
+#: ../dsf-in/common.templates:2001
+#: ../dsf-helper/common-variables.templates:2001
+msgid ""
+"Please enter the domain that will host the @FORGENAME@ installation. Some "
+"services (scm, lists, etc.) will be given their own subdomain in that domain."
+msgstr ""
+"Введите домен, который будет обслуживать установку @FORGENAME at . В этом "
+"домене некоторым сервисам (scm, lists и т.д.) будут присвоены свои "
+"собственные поддомены."
+
+#. Type: string
+#. Description
+#: ../dsf-in/common.templates:3001
+#: ../dsf-helper/common-variables.templates:4001
+#, fuzzy
+#| msgid "@FORGENAME@/FusionForge system name:"
+msgid "@FORGENAME@ system name:"
+msgstr "Имя системы @FORGENAME@/FusionForge:"
+
+#. Type: string
+#. Description
+#: ../dsf-in/common.templates:3001
+#: ../dsf-helper/common-variables.templates:4001
+msgid ""
+"Please enter the name of the @FORGENAME@ system. It is used in various "
+"places throughout the system."
+msgstr ""
+"Введите имя системы @FORGENAME at . Оно используется в разных местах по всей "
+"системе."
+
+#. Type: string
+#. Description
 #: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 #: ../dsf-helper/shellhost-variables.templates:2001
 msgid "Shell server:"
@@ -57,7 +96,6 @@
 #: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 #: ../dsf-helper/lists-variables.templates:2001
-#: ../dsf-helper/users-variables.templates:2001
 msgid "It should not be the same as the main @FORGENAME@ host."
 msgstr "Оно не должно совпадать с главным хостом @FORGENAME at ."
 
@@ -167,51 +205,8 @@
 "предполагается, что все веб-каталоги проектов размещены на том же сервере с "
 "одним сервером SCM."
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid "Do you want mail to ${noreply} to be discarded?"
-msgstr "Удалять почту, присланную на адрес ${noreply}?"
-
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid ""
-"@FORGENAME@ sends and receives plenty of e-mail to and from the "
-"\"${noreply}\" address."
-msgstr ""
-"@FORGENAME@ посылает и принимает множество электронных писем на адрес "
-"\"${noreply}\"."
-
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid ""
-"E-mail to that address should be directed to a black hole (/dev/null), "
-"unless you have another use for that address."
-msgstr ""
-"Почта на этот адрес должна быть перенаправлена в чёрную дыру (/dev/null), "
-"если вы не используете этот адрес для чего-то ещё."
-
 #. Type: string
 #. Description
-#: ../dsf-helper/common-variables.templates:2001
-msgid "@FORGENAME@ domain or subdomain name:"
-msgstr "Имя домена или поддомена @FORGENAME@:"
-
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:2001
-msgid ""
-"Please enter the domain that will host the @FORGENAME@ installation. Some "
-"services (scm, lists, etc.) will be given their own subdomain in that domain."
-msgstr ""
-"Введите домен, который будет обслуживать установку @FORGENAME at . В этом "
-"домене некоторым сервисам (scm, lists и т.д.) будут присвоены свои "
-"собственные поддомены."
-
-#. Type: string
-#. Description
 #: ../dsf-helper/common-variables.templates:3001
 msgid "@FORGENAME@ administrator e-mail address:"
 msgstr "Адрес электронной почты администратора @FORGENAME@:"
@@ -228,24 +223,6 @@
 
 #. Type: string
 #. Description
-#: ../dsf-helper/common-variables.templates:4001
-#, fuzzy
-#| msgid "@FORGENAME@/FusionForge system name:"
-msgid "@FORGENAME@ system name:"
-msgstr "Имя системы @FORGENAME@/FusionForge:"
-
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:4001
-msgid ""
-"Please enter the name of the @FORGENAME@ system. It is used in various "
-"places throughout the system."
-msgstr ""
-"Введите имя системы @FORGENAME at . Оно используется в разных местах по всей "
-"системе."
-
-#. Type: string
-#. Description
 #: ../dsf-helper/dbhost-variables.templates:2001
 msgid "Database server:"
 msgstr "Сервер базы данных:"
@@ -375,22 +352,6 @@
 "Введите имя сервера, на котором будут расположены учётные записи оболочек "
 "для @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-msgid "User mail redirector server:"
-msgstr "Сервер-перенаправитель пользовательской почты:"
-
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ user "
-"mail redirector."
-msgstr ""
-"Введите имя сервера, который будет перенаправлять почту пользователей "
-"@FORGENAME at ."
-
 #. Type: select
 #. Choices
 #: ../dsf-helper/web-variables.templates:2001
@@ -568,6 +529,33 @@
 "Выберите тему по умолчанию для веб-страниц. Должно быть указано допустимое "
 "имя."
 
+#~ msgid "Do you want mail to ${noreply} to be discarded?"
+#~ msgstr "Удалять почту, присланную на адрес ${noreply}?"
+
+#~ msgid ""
+#~ "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#~ "\"${noreply}\" address."
+#~ msgstr ""
+#~ "@FORGENAME@ посылает и принимает множество электронных писем на адрес "
+#~ "\"${noreply}\"."
+
+#~ msgid ""
+#~ "E-mail to that address should be directed to a black hole (/dev/null), "
+#~ "unless you have another use for that address."
+#~ msgstr ""
+#~ "Почта на этот адрес должна быть перенаправлена в чёрную дыру (/dev/null), "
+#~ "если вы не используете этот адрес для чего-то ещё."
+
+#~ msgid "User mail redirector server:"
+#~ msgstr "Сервер-перенаправитель пользовательской почты:"
+
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "user mail redirector."
+#~ msgstr ""
+#~ "Введите имя сервера, который будет перенаправлять почту пользователей "
+#~ "@FORGENAME at ."
+
 #~ msgid "@FORGENAME@ administrator login:"
 #~ msgstr "Учётная запись администратора @FORGENAME@:"
 

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:48:26 UTC (rev 15597)
+++ branches/Branch_5_2/src/debian/dsf-po/sv.po	2012-05-29 16:49:07 UTC (rev 15598)
@@ -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-03-16 10:20+0100\n"
+"POT-Creation-Date: 2012-05-29 12:10+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"
@@ -23,6 +23,44 @@
 
 #. Type: string
 #. Description
+#: ../dsf-in/common.templates:2001
+#: ../dsf-helper/common-variables.templates:2001
+msgid "@FORGENAME@ domain or subdomain name:"
+msgstr "Namn på @FORGENAME at -domänen eller -underdomänen:"
+
+#. Type: string
+#. Description
+#: ../dsf-in/common.templates:2001
+#: ../dsf-helper/common-variables.templates:2001
+msgid ""
+"Please enter the domain that will host the @FORGENAME@ installation. Some "
+"services (scm, lists, etc.) will be given their own subdomain in that domain."
+msgstr ""
+"Ange den domän som kommer att vara värd för @FORGENAME at -installationen.  "
+"Vissa tjänster (källkodshantering, listor, etc.) kommer att tilldelas sina "
+"egna underdomäner i den domänen."
+
+#. Type: string
+#. Description
+#: ../dsf-in/common.templates:3001
+#: ../dsf-helper/common-variables.templates:4001
+#, fuzzy
+#| msgid "@FORGENAME@/FusionForge system name:"
+msgid "@FORGENAME@ system name:"
+msgstr "@FORGENAME@ systemnamn:"
+
+#. Type: string
+#. Description
+#: ../dsf-in/common.templates:3001
+#: ../dsf-helper/common-variables.templates:4001
+msgid ""
+"Please enter the name of the @FORGENAME@ system. It is used in various "
+"places throughout the system."
+msgstr ""
+"Ange namnet på @FORGENAME at -systemet. Det används på olika ställen i systemet."
+
+#. Type: string
+#. Description
 #: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 #: ../dsf-helper/shellhost-variables.templates:2001
 msgid "Shell server:"
@@ -59,7 +97,6 @@
 #: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 #: ../dsf-helper/lists-variables.templates:2001
-#: ../dsf-helper/users-variables.templates:2001
 msgid "It should not be the same as the main @FORGENAME@ host."
 msgstr "Det ska inte vara samma som huvudvärden för @FORGENAME at ."
 
@@ -169,51 +206,8 @@
 "maskiner för dina projektservrar; den antar bara att du har alla projektens "
 "webbkataloger på samma server och en enda källkodshanteringsserver."
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid "Do you want mail to ${noreply} to be discarded?"
-msgstr "Vill du att e-post till ${noreply} ska tas bort?"
-
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid ""
-"@FORGENAME@ sends and receives plenty of e-mail to and from the "
-"\"${noreply}\" address."
-msgstr ""
-"@FORGENAME@ skickar och tar emot en mängd e-postmeddelanden till och från "
-"adressen \"${noreply}\"."
-
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid ""
-"E-mail to that address should be directed to a black hole (/dev/null), "
-"unless you have another use for that address."
-msgstr ""
-"E-post till den adressen ska pekas mot ett svart hål (/dev/null) såvida du "
-"inte har andra användningsområden för den adressen."
-
 #. Type: string
 #. Description
-#: ../dsf-helper/common-variables.templates:2001
-msgid "@FORGENAME@ domain or subdomain name:"
-msgstr "Namn på @FORGENAME at -domänen eller -underdomänen:"
-
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:2001
-msgid ""
-"Please enter the domain that will host the @FORGENAME@ installation. Some "
-"services (scm, lists, etc.) will be given their own subdomain in that domain."
-msgstr ""
-"Ange den domän som kommer att vara värd för @FORGENAME at -installationen.  "
-"Vissa tjänster (källkodshantering, listor, etc.) kommer att tilldelas sina "
-"egna underdomäner i den domänen."
-
-#. Type: string
-#. Description
 #: ../dsf-helper/common-variables.templates:3001
 msgid "@FORGENAME@ administrator e-mail address:"
 msgstr "@FORGENAME at -administratörens e-postadress:"
@@ -230,23 +224,6 @@
 
 #. Type: string
 #. Description
-#: ../dsf-helper/common-variables.templates:4001
-#, fuzzy
-#| msgid "@FORGENAME@/FusionForge system name:"
-msgid "@FORGENAME@ system name:"
-msgstr "@FORGENAME@ systemnamn:"
-
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:4001
-msgid ""
-"Please enter the name of the @FORGENAME@ system. It is used in various "
-"places throughout the system."
-msgstr ""
-"Ange namnet på @FORGENAME at -systemet. Det används på olika ställen i systemet."
-
-#. Type: string
-#. Description
 #: ../dsf-helper/dbhost-variables.templates:2001
 msgid "Database server:"
 msgstr "Databasserver:"
@@ -376,22 +353,6 @@
 "Ange värdnamnet för servern som kommer tillhandahålla skalkonton för "
 "@FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-msgid "User mail redirector server:"
-msgstr "Omdirigerarserver för användarnas e-post:"
-
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ user "
-"mail redirector."
-msgstr ""
-"Ange värdnamnet för servern som kommer tillhandahålla omdirigerarserver för "
-"användarnas e-post för @FORGENAME at ."
-
 #. Type: select
 #. Choices
 #: ../dsf-helper/web-variables.templates:2001
@@ -567,6 +528,33 @@
 "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?"
+
+#~ msgid ""
+#~ "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#~ "\"${noreply}\" address."
+#~ msgstr ""
+#~ "@FORGENAME@ skickar och tar emot en mängd e-postmeddelanden till och från "
+#~ "adressen \"${noreply}\"."
+
+#~ msgid ""
+#~ "E-mail to that address should be directed to a black hole (/dev/null), "
+#~ "unless you have another use for that address."
+#~ msgstr ""
+#~ "E-post till den adressen ska pekas mot ett svart hål (/dev/null) såvida "
+#~ "du inte har andra användningsområden för den adressen."
+
+#~ msgid "User mail redirector server:"
+#~ msgstr "Omdirigerarserver för användarnas e-post:"
+
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "user mail redirector."
+#~ msgstr ""
+#~ "Ange värdnamnet för servern som kommer tillhandahålla omdirigerarserver "
+#~ "för användarnas e-post för @FORGENAME at ."
+
 #~ msgid "@FORGENAME@ administrator login:"
 #~ msgstr "@FORGENAME at -administratörens användarnamn:"
 

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:48:26 UTC (rev 15597)
+++ branches/Branch_5_2/src/debian/dsf-po/templates.pot	2012-05-29 16:49:07 UTC (rev 15598)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: fusionforge\n"
 "Report-Msgid-Bugs-To: fusionforge at packages.debian.org\n"
-"POT-Creation-Date: 2012-03-16 10:20+0100\n"
+"POT-Creation-Date: 2012-05-29 12:10+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"
@@ -19,6 +19,38 @@
 
 #. Type: string
 #. Description
+#: ../dsf-in/common.templates:2001
+#: ../dsf-helper/common-variables.templates:2001
+msgid "@FORGENAME@ domain or subdomain name:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../dsf-in/common.templates:2001
+#: ../dsf-helper/common-variables.templates:2001
+msgid ""
+"Please enter the domain that will host the @FORGENAME@ installation. Some "
+"services (scm, lists, etc.) will be given their own subdomain in that domain."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../dsf-in/common.templates:3001
+#: ../dsf-helper/common-variables.templates:4001
+msgid "@FORGENAME@ system name:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../dsf-in/common.templates:3001
+#: ../dsf-helper/common-variables.templates:4001
+msgid ""
+"Please enter the name of the @FORGENAME@ system. It is used in various "
+"places throughout the system."
+msgstr ""
+
+#. Type: string
+#. Description
 #: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 #: ../dsf-helper/shellhost-variables.templates:2001
 msgid "Shell server:"
@@ -52,7 +84,6 @@
 #: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 #: ../dsf-helper/lists-variables.templates:2001
-#: ../dsf-helper/users-variables.templates:2001
 msgid "It should not be the same as the main @FORGENAME@ host."
 msgstr ""
 
@@ -144,44 +175,8 @@
 "the same server with a single SCM server."
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid "Do you want mail to ${noreply} to be discarded?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid ""
-"@FORGENAME@ sends and receives plenty of e-mail to and from the "
-"\"${noreply}\" address."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid ""
-"E-mail to that address should be directed to a black hole (/dev/null), "
-"unless you have another use for that address."
-msgstr ""
-
 #. Type: string
 #. Description
-#: ../dsf-helper/common-variables.templates:2001
-msgid "@FORGENAME@ domain or subdomain name:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:2001
-msgid ""
-"Please enter the domain that will host the @FORGENAME@ installation. Some "
-"services (scm, lists, etc.) will be given their own subdomain in that domain."
-msgstr ""
-
-#. Type: string
-#. Description
 #: ../dsf-helper/common-variables.templates:3001
 msgid "@FORGENAME@ administrator e-mail address:"
 msgstr ""
@@ -196,20 +191,6 @@
 
 #. Type: string
 #. Description
-#: ../dsf-helper/common-variables.templates:4001
-msgid "@FORGENAME@ system name:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:4001
-msgid ""
-"Please enter the name of the @FORGENAME@ system. It is used in various "
-"places throughout the system."
-msgstr ""
-
-#. Type: string
-#. Description
 #: ../dsf-helper/dbhost-variables.templates:2001
 msgid "Database server:"
 msgstr ""
@@ -325,20 +306,6 @@
 "shell accounts."
 msgstr ""
 
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-msgid "User mail redirector server:"
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ user "
-"mail redirector."
-msgstr ""
-
 #. Type: select
 #. Choices
 #: ../dsf-helper/web-variables.templates:2001

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:48:26 UTC (rev 15597)
+++ branches/Branch_5_2/src/debian/dsf-po/vi.po	2012-05-29 16:49:07 UTC (rev 15598)
@@ -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-03-16 10:20+0100\n"
+"POT-Creation-Date: 2012-05-29 12:10+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"
@@ -20,6 +20,42 @@
 
 #. Type: string
 #. Description
+#: ../dsf-in/common.templates:2001
+#: ../dsf-helper/common-variables.templates:2001
+msgid "@FORGENAME@ domain or subdomain name:"
+msgstr "Tên miền hay miền con @FORGENAME@:"
+
+#. Type: string
+#. Description
+#: ../dsf-in/common.templates:2001
+#: ../dsf-helper/common-variables.templates:2001
+msgid ""
+"Please enter the domain that will host the @FORGENAME@ installation. Some "
+"services (scm, lists, etc.) will be given their own subdomain in that domain."
+msgstr ""
+"Hãy gõ miền sẽ chứa bản cài đặt @FORGENAME at . Một số dịch vụ (scm, lists v."
+"v.) sẽ nhận miền con riêng ở trong miền đó."
+
+#. Type: string
+#. Description
+#: ../dsf-in/common.templates:3001
+#: ../dsf-helper/common-variables.templates:4001
+msgid "@FORGENAME@ system name:"
+msgstr "Tên hệ thống @FORGENAME@:"
+
+#. Type: string
+#. Description
+#: ../dsf-in/common.templates:3001
+#: ../dsf-helper/common-variables.templates:4001
+msgid ""
+"Please enter the name of the @FORGENAME@ system. It is used in various "
+"places throughout the system."
+msgstr ""
+"Hãy gõ tên của hệ thống @FORGENAME at . Nó được dùng ở các nơi khác nhau trên "
+"khắp hệ thống."
+
+#. Type: string
+#. Description
 #: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 #: ../dsf-helper/shellhost-variables.templates:2001
 msgid "Shell server:"
@@ -54,7 +90,6 @@
 #: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 #: ../dsf-helper/lists-variables.templates:2001
-#: ../dsf-helper/users-variables.templates:2001
 msgid "It should not be the same as the main @FORGENAME@ host."
 msgstr "Không nên trùng với máy chủ @FORGENAME@ chính."
 
@@ -162,49 +197,8 @@
 "mục Web của dự án nằm trên cùng một máy phục vụ, với một máy phục vụ SCM "
 "riêng lẻ."
 
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid "Do you want mail to ${noreply} to be discarded?"
-msgstr "Bạn có muốn hủy mọi thư được gửi cho ${noreply} không?"
-
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid ""
-"@FORGENAME@ sends and receives plenty of e-mail to and from the "
-"\"${noreply}\" address."
-msgstr ""
-"@FORGENAME@ gửi và nhận rất nhiều thư điện tử cho/từ địa chỉ « ${noreply} »."
-
-#. Type: boolean
-#. Description
-#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
-msgid ""
-"E-mail to that address should be directed to a black hole (/dev/null), "
-"unless you have another use for that address."
-msgstr ""
-"Các thư gửi đến địa chỉ đó nên bị chuyển hướng tới « /dev/null » (bị hủy), "
-"trừ bạn muốn sử dụng địa chỉ đó bằng cách khác."
-
 #. Type: string
 #. Description
-#: ../dsf-helper/common-variables.templates:2001
-msgid "@FORGENAME@ domain or subdomain name:"
-msgstr "Tên miền hay miền con @FORGENAME@:"
-
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:2001
-msgid ""
-"Please enter the domain that will host the @FORGENAME@ installation. Some "
-"services (scm, lists, etc.) will be given their own subdomain in that domain."
-msgstr ""
-"Hãy gõ miền sẽ chứa bản cài đặt @FORGENAME at . Một số dịch vụ (scm, lists v."
-"v.) sẽ nhận miền con riêng ở trong miền đó."
-
-#. Type: string
-#. Description
 #: ../dsf-helper/common-variables.templates:3001
 msgid "@FORGENAME@ administrator e-mail address:"
 msgstr "Địa chỉ thư của quản trị @FORGENAME@:"
@@ -221,22 +215,6 @@
 
 #. Type: string
 #. Description
-#: ../dsf-helper/common-variables.templates:4001
-msgid "@FORGENAME@ system name:"
-msgstr "Tên hệ thống @FORGENAME@:"
-
-#. Type: string
-#. Description
-#: ../dsf-helper/common-variables.templates:4001
-msgid ""
-"Please enter the name of the @FORGENAME@ system. It is used in various "
-"places throughout the system."
-msgstr ""
-"Hãy gõ tên của hệ thống @FORGENAME at . Nó được dùng ở các nơi khác nhau trên "
-"khắp hệ thống."
-
-#. Type: string
-#. Description
 #: ../dsf-helper/dbhost-variables.templates:2001
 msgid "Database server:"
 msgstr "Máy phục vụ cơ sở dữ liệu :"
@@ -361,22 +339,6 @@
 msgstr ""
 "Hãy gõ tên máy của máy phục vụ sẽ chứa các tài khoản trình bao @FORGENAME at ."
 
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-msgid "User mail redirector server:"
-msgstr "Máy phục vụ chuyển hướng thư tín người dùng:"
-
-#. Type: string
-#. Description
-#: ../dsf-helper/users-variables.templates:2001
-msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ user "
-"mail redirector."
-msgstr ""
-"Hãy gõ tên máy của máy phục vụ sẽ chứa bộ chuyển hướng thư tín người dùng "
-"@FORGENAME at ."
-
 #. Type: select
 #. Choices
 #: ../dsf-helper/web-variables.templates:2001
@@ -552,6 +514,33 @@
 "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?"
+
+#~ msgid ""
+#~ "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#~ "\"${noreply}\" address."
+#~ msgstr ""
+#~ "@FORGENAME@ gửi và nhận rất nhiều thư điện tử cho/từ địa chỉ « ${noreply} "
+#~ "»."
+
+#~ msgid ""
+#~ "E-mail to that address should be directed to a black hole (/dev/null), "
+#~ "unless you have another use for that address."
+#~ msgstr ""
+#~ "Các thư gửi đến địa chỉ đó nên bị chuyển hướng tới « /dev/null » (bị "
+#~ "hủy), trừ bạn muốn sử dụng địa chỉ đó bằng cách khác."
+
+#~ msgid "User mail redirector server:"
+#~ msgstr "Máy phục vụ chuyển hướng thư tín người dùng:"
+
+#~ msgid ""
+#~ "Please enter the host name of the server that will host the @FORGENAME@ "
+#~ "user mail redirector."
+#~ msgstr ""
+#~ "Hãy gõ tên máy của máy phục vụ sẽ chứa bộ chuyển hướng thư tín người dùng "
+#~ "@FORGENAME at ."
+
 #~ msgid "@FORGENAME@ administrator login:"
 #~ msgstr "Tên đăng nhập quản trị @FORGENAME@:"
 




More information about the Fusionforge-commits mailing list