[Fusionforge-commits] r10162 - trunk/src/debian/dsf-po

Roland Mas lolando at libremir.placard.fr.eu.org
Wed Jun 30 18:50:27 CEST 2010


Author: lolando
Date: 2010-06-30 18:50:26 +0200 (Wed, 30 Jun 2010)
New Revision: 10162

Modified:
   trunk/src/debian/dsf-po/cs.po
   trunk/src/debian/dsf-po/de.po
   trunk/src/debian/dsf-po/es.po
   trunk/src/debian/dsf-po/fi.po
   trunk/src/debian/dsf-po/fr.po
   trunk/src/debian/dsf-po/gl.po
   trunk/src/debian/dsf-po/nl.po
   trunk/src/debian/dsf-po/pt.po
   trunk/src/debian/dsf-po/ru.po
   trunk/src/debian/dsf-po/sv.po
   trunk/src/debian/dsf-po/vi.po
Log:
debconf-updatepo

Modified: trunk/src/debian/dsf-po/cs.po
===================================================================
--- trunk/src/debian/dsf-po/cs.po	2010-06-30 16:50:16 UTC (rev 10161)
+++ trunk/src/debian/dsf-po/cs.po	2010-06-30 16:50:26 UTC (rev 10162)
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
-"Report-Msgid-Bugs-To: @PACKAGENAME@@packages.debian.org\n"
+"Report-Msgid-Bugs-To: gforge at packages.debian.org\n"
 "POT-Creation-Date: 2009-06-12 23:23+0200\n"
 "PO-Revision-Date: 2008-03-30 14:36+0200\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
@@ -35,12 +35,13 @@
 #: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 #, fuzzy
 #| msgid ""
-#| "Please enter the hostname of the server that will host the @FORGENAME@ shell "
-#| "accounts."
+#| "Please enter the hostname of the server that will host the @FORGENAME@ "
+#| "shell accounts."
 msgid ""
 "Please enter the hostname of the server that will host the @FORGENAME@ shell "
 "accounts."
-msgstr "Zadejte prosím jméno serveru, který bude hostit shellové účty @FORGENAME at ."
+msgstr ""
+"Zadejte prosím jméno serveru, který bude hostit shellové účty @FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -88,14 +89,14 @@
 #: ../dsf-in/db-postgresql.templates.dsfh-in:10001
 #, fuzzy
 #| msgid ""
-#| "The @FORGENAME@ administrator account will have full privileges on the system. "
-#| "It will be used to approve the creation of new projects."
+#| "The @FORGENAME@ administrator account will have full privileges on the "
+#| "system. It will be used to approve the creation of new projects."
 msgid ""
 "The @FORGENAME@ administrator account will have full privileges on the "
 "system. It will be used to approve the creation of new projects."
 msgstr ""
-"Správce @FORGENAME@ bude mít v systému @FORGENAME@ všechna práva. Používá se například "
-"pro schvalování vytváření nových projektů."
+"Správce @FORGENAME@ bude mít v systému @FORGENAME@ všechna práva. Používá se "
+"například pro schvalování vytváření nových projektů."
 
 #. Type: string
 #. Description
@@ -121,7 +122,8 @@
 msgid ""
 "Please enter the IP address of the server that will host the @FORGENAME@ "
 "installation."
-msgstr "Zadejte prosím IP adresu serveru, který bude hostit instalaci @FORGENAME at ."
+msgstr ""
+"Zadejte prosím IP adresu serveru, který bude hostit instalaci @FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -169,9 +171,9 @@
 #: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 #, fuzzy
 #| msgid ""
-#| "@FORGENAME@ allows users to define a list of their skills, to be chosen from "
-#| "those present in the database. This list is the initial list of skills "
-#| "that will enter the database."
+#| "@FORGENAME@ allows users to define a list of their skills, to be chosen "
+#| "from those present in the database. This list is the initial list of "
+#| "skills that will enter the database."
 msgid ""
 "@FORGENAME@ allows users to define a list of their skills, to be chosen from "
 "those present in the database. This list is the initial list of skills that "
@@ -238,14 +240,14 @@
 #: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 #, fuzzy
 #| msgid ""
-#| "@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}\" "
-#| "address."
+#| "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#| "\"${noreply}\" address."
 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."
+"@FORGENAME@ využívá adresu „${noreply}“ k odesílání i příjmu velkého "
+"množství pošty."
 
 #. Type: boolean
 #. Description
@@ -293,14 +295,14 @@
 #: ../dsf-helper/common-variables.templates:3001
 #, fuzzy
 #| msgid ""
-#| "Please enter the e-mail address of the @FORGENAME@ administrator of this site. "
-#| "It will be used when problems occur."
+#| "Please enter the e-mail address of the @FORGENAME@ administrator of this "
+#| "site. It will be used when problems occur."
 msgid ""
 "Please enter the e-mail address of the @FORGENAME@ administrator of this "
 "site. It will be used when problems occur."
 msgstr ""
-"Zadejte prosím emailovou adresu správce tohoto systému @FORGENAME at . Adresa se "
-"použije v případě výskytu problémů."
+"Zadejte prosím emailovou adresu správce tohoto systému @FORGENAME at . Adresa "
+"se použije v případě výskytu problémů."
 
 #. Type: string
 #. Description
@@ -315,14 +317,14 @@
 #: ../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."
+#| "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."
+"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
@@ -341,8 +343,8 @@
 "Please enter the IP address (or hostname) of the server that will host the "
 "@FORGENAME@ database."
 msgstr ""
-"Zadejte prosím IP adresu (nebo jméno) serveru, který bude hostit vaši @FORGENAME@ "
-"databázi."
+"Zadejte prosím IP adresu (nebo jméno) serveru, který bude hostit vaši "
+"@FORGENAME@ databázi."
 
 #. Type: string
 #. Description
@@ -355,11 +357,13 @@
 #: ../dsf-helper/dbhost-variables.templates:3001
 #, fuzzy
 #| msgid ""
-#| "Please enter the name of the database that will host the @FORGENAME@ database."
+#| "Please enter the name of the database that will host the @FORGENAME@ "
+#| "database."
 msgid ""
 "Please enter the name of the database that will host the @FORGENAME@ "
 "database."
-msgstr "Zadejte prosím jméno databáze, která bude obsahovat databázi @FORGENAME at ."
+msgstr ""
+"Zadejte prosím jméno databáze, která bude obsahovat databázi @FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -422,17 +426,17 @@
 #: ../dsf-helper/groupid-variables.templates:2001
 #, fuzzy
 #| msgid ""
-#| "The members of the news admin group can approve news for the @FORGENAME@ main "
-#| "page. This group's ID must not be 1. This should be changed only if you "
-#| "upgrade from a previous version and want to keep the data."
+#| "The members of the news admin group can approve news for the @FORGENAME@ "
+#| "main page. This group's ID must not be 1. This should be changed only if "
+#| "you upgrade from a previous version and want to keep the data."
 msgid ""
 "The members of the news admin group can approve news for the @FORGENAME@ "
 "main page. This group's ID must not be 1. This should be changed only if you "
 "upgrade from a previous version and want to keep the data."
 msgstr ""
 "Členové správcovské skupiny pro novinky mohou schvalovat novinky pro hlavní "
-"stránku @FORGENAME at . Tato skupina nesmí mít ID 1. Toto byste měli měnit jen v "
-"případě, že přecházíte z dřívější verze a chcete zachovat svá data."
+"stránku @FORGENAME at . Tato skupina nesmí mít ID 1. Toto byste měli měnit jen "
+"v případě, že přecházíte z dřívější verze a chcete zachovat svá data."
 
 #. Type: string
 #. Description
@@ -463,19 +467,21 @@
 "Please enter the host name of the server that will host the @FORGENAME@ "
 "mailing lists."
 msgstr ""
-"Zadejte prosím jméno serveru, který bude hostit poštovní konference @FORGENAME at ."
+"Zadejte prosím jméno serveru, který bude hostit poštovní konference "
+"@FORGENAME at ."
 
 #. Type: string
 #. Description
 #: ../dsf-helper/shellhost-variables.templates:2001
 #, fuzzy
 #| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ shell "
-#| "accounts."
+#| "Please enter the host name of the server that will host the @FORGENAME@ "
+#| "shell accounts."
 msgid ""
 "Please enter the host name of the server that will host the @FORGENAME@ "
 "shell accounts."
-msgstr "Zadejte prosím jméno serveru, který bude hostit shellové účty @FORGENAME at ."
+msgstr ""
+"Zadejte prosím jméno serveru, který bude hostit shellové účty @FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -488,8 +494,8 @@
 #: ../dsf-helper/users-variables.templates:2001
 #, fuzzy
 #| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ user "
-#| "mail redirector."
+#| "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."

Modified: trunk/src/debian/dsf-po/de.po
===================================================================
--- trunk/src/debian/dsf-po/de.po	2010-06-30 16:50:16 UTC (rev 10161)
+++ trunk/src/debian/dsf-po/de.po	2010-06-30 16:50:26 UTC (rev 10162)
@@ -5,8 +5,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: @PACKAGENAME@ 4.8.2-1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-25 20:40+0100\n"
+"Report-Msgid-Bugs-To: gforge at packages.debian.org\n"
+"POT-Creation-Date: 2009-06-12 23:23+0200\n"
 "PO-Revision-Date: 2009-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"
@@ -16,14 +16,14 @@
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 #: ../dsf-helper/shellhost-variables.templates:2001
 msgid "Shell server:"
 msgstr "Shell-Server:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 msgid ""
 "Please enter the hostname of the server that will host the @FORGENAME@ shell "
 "accounts."
@@ -33,33 +33,35 @@
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 msgid "Download server:"
 msgstr "Download-Server:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 msgid ""
-"Please enter the hostname of the server that will host the @FORGENAME@ packages."
+"Please enter the hostname of the server that will host the @FORGENAME@ "
+"packages."
 msgstr ""
-"Bitte geben Sie den Rechnernamen des Servers ein, der Ihre @FORGENAME at -Pakete "
-"beherbergen wird."
+"Bitte geben Sie den Rechnernamen des Servers ein, der Ihre @FORGENAME at -"
+"Pakete beherbergen wird."
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 #: ../dsf-helper/lists-variables.templates:2001
 #: ../dsf-helper/users-variables.templates:2001
 msgid "It should not be the same as the main @FORGENAME@ host."
 msgstr ""
-"Dieser sollte nicht mit dem Namen des Haupt- at FORGENAME@-Rechners übereinstimmen."
+"Dieser sollte nicht mit dem Namen des Haupt- at FORGENAME@-Rechners "
+"übereinstimmen."
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 msgid "@FORGENAME@ administrator login:"
 msgstr "@FORGENAME at -Administrator-Anmeldung:"
 
@@ -67,94 +69,95 @@
 #. Description
 #. Type: password
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:8001
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
 msgid ""
-"The @FORGENAME@ administrator account will have full privileges on the system. It "
-"will be used to approve the creation of new projects."
+"The @FORGENAME@ administrator account will have full privileges on the "
+"system. It will be used to approve the creation of new projects."
 msgstr ""
-"Das @FORGENAME at -Administrator-Konto wird alle Privilegien auf dem @FORGENAME at -System "
-"haben. Es wird benötigt, um die Erstellung von neuen Projekten zu bewilligen."
+"Das @FORGENAME at -Administrator-Konto wird alle Privilegien auf dem "
+"@FORGENAME at -System haben. Es wird benötigt, um die Erstellung von neuen "
+"Projekten zu bewilligen."
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 msgid "Please choose the username for this account."
 msgstr "Bitte wählen Sie den Benutzernamen für dieses Konto."
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
 msgid "IP address:"
 msgstr "IP-Adresse:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
 msgid ""
 "Please enter the IP address of the server that will host the @FORGENAME@ "
 "installation."
 msgstr ""
-"Bitte geben Sie die IP-Adresse des Servers ein, der Ihre @FORGENAME at -Installation "
-"beherbergen wird."
+"Bitte geben Sie die IP-Adresse des Servers ein, der Ihre @FORGENAME at -"
+"Installation beherbergen wird."
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
 msgid "This is needed for the configuration of Apache virtual hosting."
 msgstr "Diese wird für die virtualhosting-Konfiguration des Apache benötigt."
 
 #. Type: password
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
 msgid "@FORGENAME@ administrator password:"
 msgstr "@FORGENAME at -Administrator-Passwort:"
 
 #. Type: password
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
 msgid "Please choose the password for this account."
 msgstr "Bitte wählen Sie das Passwort für dieses Konto."
 
 #. Type: password
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:11001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:11001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Password confirmation:"
 msgstr "Bestätigung des Passworts:"
 
 #. Type: password
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:11001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:11001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Bitte geben Sie zur Bestätigung das Passwort erneut ein."
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 msgid "Initial list of skills:"
 msgstr "Anfängliche Liste der Fähigkeiten:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 msgid ""
 "@FORGENAME@ allows users to define a list of their skills, to be chosen from "
 "those present in the database. This list is the initial list of skills that "
 "will enter the database."
 msgstr ""
-"@FORGENAME@ erlaubt es den Benutzern, eine Liste Ihrer Fähigkeiten zu definieren, "
-"die aus allen in der Datenbank hinterlegten Fähigkeiten ausgewählt werden "
-"können. Diese Liste ist die anfängliche Liste von Fähigkeiten, die in die "
-"Datenbank eingegeben wird."
+"@FORGENAME@ erlaubt es den Benutzern, eine Liste Ihrer Fähigkeiten zu "
+"definieren, die aus allen in der Datenbank hinterlegten Fähigkeiten "
+"ausgewählt werden können. Diese Liste ist die anfängliche Liste von "
+"Fähigkeiten, die in die Datenbank eingegeben wird."
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 msgid "Please enter a semicolon-separated list of skill names."
 msgstr ""
 "Bitte geben Sie die Namen der Fähigkeiten, getrennt durch Semikola »;«, ein."
@@ -163,7 +166,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGENAME at -dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
 msgid "Do you want a simple DNS setup for @FORGENAME@?"
 msgstr "Möchten Sie eine einfache DNS-Installation für @FORGENAME@?"
 
@@ -171,7 +174,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGENAME at -dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
 msgid ""
 "You can use a simple DNS setup with wildcards to map all project web-hosts "
 "to a single IP address, and direct all the scm-hosts to a single SCM server, "
@@ -187,7 +190,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGENAME at -dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
 msgid ""
 "Even if you use a simple DNS setup, you can still use separate machines as "
 "project servers; it just assumes that all the project web directories are on "
@@ -200,22 +203,23 @@
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGENAME at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 msgid "Do you want mail to ${noreply} to be discarded?"
 msgstr "Möchten Sie, dass E-Mail an ${noreply} verworfen wird?"
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGENAME at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 msgid ""
-"@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}\" "
-"address."
+"@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}"
+"\" address."
 msgstr ""
-"@FORGENAME@ sendet und empfängt viele E-Mails von und auf der »${noreply}«-Adresse."
+"@FORGENAME@ sendet und empfängt viele E-Mails von und auf der »${noreply}«-"
+"Adresse."
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGENAME at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 msgid ""
 "E-mail to that address should be directed to a black hole (/dev/null), "
 "unless you have another use for that address."
@@ -251,27 +255,29 @@
 #. Description
 #: ../dsf-helper/common-variables.templates:3001
 msgid ""
-"Please enter the e-mail address of the @FORGENAME@ administrator of this site. It "
-"will be used when problems occur."
+"Please enter the e-mail address of the @FORGENAME@ administrator of this "
+"site. It will be used when problems occur."
 msgstr ""
-"Bitte geben Sie die E-Mail-Adresse des @FORGENAME at -Administrators Ihrer Site an. "
-"Diese wird beim Auftritt von Problemen benötigt."
+"Bitte geben Sie die E-Mail-Adresse des @FORGENAME at -Administrators Ihrer Site "
+"an. Diese wird beim Auftritt von Problemen benötigt."
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:4001
-msgid "@FORGENAME@/FusionForge system name:"
+#, 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."
+"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."
+"Bitte geben Sie den Namen des @FORGENAME at -Systems ein. Er wird an "
+"verschiedenen Stellen im ganzen System verwendet."
 
 #. Type: string
 #. Description
@@ -299,7 +305,8 @@
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:3001
 msgid ""
-"Please enter the name of the database that will host the @FORGENAME@ database."
+"Please enter the name of the database that will host the @FORGENAME@ "
+"database."
 msgstr ""
 "Bitte geben Sie den Namen der Datenbank an, die die @FORGENAME at -Datenbank "
 "beherbergen wird."
@@ -343,10 +350,11 @@
 #. Description
 #: ../dsf-helper/downloadhost-variables.templates:2001
 msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ packages."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"packages."
 msgstr ""
-"Bitte geben Sie den Rechnernamen des Servers ein, der Ihre @FORGENAME at -Pakete "
-"beherbergen wird."
+"Bitte geben Sie den Rechnernamen des Servers ein, der Ihre @FORGENAME at -"
+"Pakete beherbergen wird."
 
 #. Type: string
 #. Description
@@ -358,14 +366,14 @@
 #. Description
 #: ../dsf-helper/groupid-variables.templates:2001
 msgid ""
-"The members of the news admin group can approve news for the @FORGENAME@ main "
-"page. This group's ID must not be 1. This should be changed only if you "
+"The members of the news admin group can approve news for the @FORGENAME@ "
+"main page. This group's ID must not be 1. This should be changed only if you "
 "upgrade from a previous version and want to keep the data."
 msgstr ""
-"Mitglieder der News-Administrator-Gruppe können Nachrichten für die @FORGENAME at -"
-"Hauptseite genehmigen. Diese Gruppen-ID darf nicht 1 sein. Dies sollte nur "
-"geändert werden, falls Sie ein Upgrade von einer vorhergehenden Version "
-"durchführen und Ihre Daten behalten möchten."
+"Mitglieder der News-Administrator-Gruppe können Nachrichten für die "
+"@FORGENAME at -Hauptseite genehmigen. Diese Gruppen-ID darf nicht 1 sein. Dies "
+"sollte nur geändert werden, falls Sie ein Upgrade von einer vorhergehenden "
+"Version durchführen und Ihre Daten behalten möchten."
 
 #. Type: string
 #. Description
@@ -389,8 +397,8 @@
 #. Description
 #: ../dsf-helper/lists-variables.templates:2001
 msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ mailing "
-"lists."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"mailing lists."
 msgstr ""
 "Bitte geben Sie den Rechnernamen des Servers ein, der Ihre @FORGENAME at -"
 "Mailinglisten beherbergen wird."
@@ -399,8 +407,8 @@
 #. Description
 #: ../dsf-helper/shellhost-variables.templates:2001
 msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ shell "
-"accounts."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"shell accounts."
 msgstr ""
 "Bitte geben Sie den Rechnernamen des Servers ein, der Ihre @FORGENAME at -Shell-"
 "Konten beherbergen wird."
@@ -415,11 +423,11 @@
 #. Description
 #: ../dsf-helper/users-variables.templates:2001
 msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ user mail "
-"redirector."
+"Please enter the host name of the server that will host the @FORGENAME@ user "
+"mail redirector."
 msgstr ""
-"Bitte geben Sie den Rechnernamen des Servers ein, der Ihren @FORGENAME at -Benutzer-"
-"E-Mail-Umleiter beherbergen wird."
+"Bitte geben Sie den Rechnernamen des Servers ein, der Ihren @FORGENAME at -"
+"Benutzer-E-Mail-Umleiter beherbergen wird."
 
 #. Type: select
 #. Choices

Modified: trunk/src/debian/dsf-po/es.po
===================================================================
--- trunk/src/debian/dsf-po/es.po	2010-06-30 16:50:16 UTC (rev 10161)
+++ trunk/src/debian/dsf-po/es.po	2010-06-30 16:50:26 UTC (rev 10162)
@@ -30,7 +30,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: @PACKAGE@ 4.7~rc2-7\n"
-"Report-Msgid-Bugs-To: @PACKAGENAME@@packages.debian.org\n"
+"Report-Msgid-Bugs-To: gforge at packages.debian.org\n"
 "POT-Creation-Date: 2009-06-12 23:23+0200\n"
 "PO-Revision-Date: 2009-04-15 14:37+0200\n"
 "Last-Translator: Francisco Javier Cuadrado <fcocuadrado at gmail.com>\n"
@@ -51,8 +51,8 @@
 #: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 #, fuzzy
 #| msgid ""
-#| "Please enter the hostname of the server that will host the @FORGENAME@ shell "
-#| "accounts."
+#| "Please enter the hostname of the server that will host the @FORGENAME@ "
+#| "shell accounts."
 msgid ""
 "Please enter the hostname of the server that will host the @FORGENAME@ shell "
 "accounts."
@@ -107,14 +107,14 @@
 #: ../dsf-in/db-postgresql.templates.dsfh-in:10001
 #, fuzzy
 #| msgid ""
-#| "The @FORGENAME@ administrator account will have full privileges on the system. "
-#| "It will be used to approve the creation of new projects."
+#| "The @FORGENAME@ administrator account will have full privileges on the "
+#| "system. It will be used to approve the creation of new projects."
 msgid ""
 "The @FORGENAME@ administrator account will have full privileges on the "
 "system. It will be used to approve the creation of new projects."
 msgstr ""
-"La cuenta de administrador de @FORGENAME@ tendrá privilegios completos sobre el "
-"sistema. Se debe utilizar para aprobar la creación de nuevos proyectos."
+"La cuenta de administrador de @FORGENAME@ tendrá privilegios completos sobre "
+"el sistema. Se debe utilizar para aprobar la creación de nuevos proyectos."
 
 #. Type: string
 #. Description
@@ -190,17 +190,17 @@
 #: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 #, fuzzy
 #| msgid ""
-#| "@FORGENAME@ allows users to define a list of their skills, to be chosen from "
-#| "those present in the database. This list is the initial list of skills "
-#| "that will enter the database."
+#| "@FORGENAME@ allows users to define a list of their skills, to be chosen "
+#| "from those present in the database. This list is the initial list of "
+#| "skills that will enter the database."
 msgid ""
 "@FORGENAME@ allows users to define a list of their skills, to be chosen from "
 "those present in the database. This list is the initial list of skills that "
 "will enter the database."
 msgstr ""
-"@FORGENAME@ permite que los usuarios definan una lista de habilidades, a elegir "
-"de las presentes en la base de datos. Esta lista es la lista inicial de "
-"habilidades que se introducirá en la base de datos."
+"@FORGENAME@ permite que los usuarios definan una lista de habilidades, a "
+"elegir de las presentes en la base de datos. Esta lista es la lista inicial "
+"de habilidades que se introducirá en la base de datos."
 
 #. Type: string
 #. Description
@@ -262,14 +262,14 @@
 #: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 #, fuzzy
 #| msgid ""
-#| "@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}\" "
-#| "address."
+#| "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#| "\"${noreply}\" address."
 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}»."
+"@FORGENAME@ envía y recibe muchos correos electrónicos hacia y desde la "
+"dirección «${noreply}»."
 
 #. Type: boolean
 #. Description
@@ -318,14 +318,14 @@
 #: ../dsf-helper/common-variables.templates:3001
 #, fuzzy
 #| msgid ""
-#| "Please enter the e-mail address of the @FORGENAME@ administrator of this site. "
-#| "It will be used when problems occur."
+#| "Please enter the e-mail address of the @FORGENAME@ administrator of this "
+#| "site. It will be used when problems occur."
 msgid ""
 "Please enter the e-mail address of the @FORGENAME@ administrator of this "
 "site. It will be used when problems occur."
 msgstr ""
-"Introduzca la dirección de correo electrónico del administrador de @FORGENAME@ de "
-"este sitio. Se utilizará en caso de que ocurra un problema."
+"Introduzca la dirección de correo electrónico del administrador de "
+"@FORGENAME@ de este sitio. Se utilizará en caso de que ocurra un problema."
 
 #. Type: string
 #. Description
@@ -340,14 +340,14 @@
 #: ../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."
+#| "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."
+"Introduzca el nombre del sistema de @FORGENAME at . Se utiliza en varios sitios "
+"del sistema."
 
 #. Type: string
 #. Description
@@ -380,7 +380,8 @@
 #: ../dsf-helper/dbhost-variables.templates:3001
 #, fuzzy
 #| msgid ""
-#| "Please enter the name of the database that will host the @FORGENAME@ database."
+#| "Please enter the name of the database that will host the @FORGENAME@ "
+#| "database."
 msgid ""
 "Please enter the name of the database that will host the @FORGENAME@ "
 "database."
@@ -452,18 +453,18 @@
 #: ../dsf-helper/groupid-variables.templates:2001
 #, fuzzy
 #| msgid ""
-#| "The members of the news admin group can approve news for the @FORGENAME@ main "
-#| "page. This group's ID must not be 1. This should be changed only if you "
-#| "upgrade from a previous version and want to keep the data."
+#| "The members of the news admin group can approve news for the @FORGENAME@ "
+#| "main page. This group's ID must not be 1. This should be changed only if "
+#| "you upgrade from a previous version and want to keep the data."
 msgid ""
 "The members of the news admin group can approve news for the @FORGENAME@ "
 "main page. This group's ID must not be 1. This should be changed only if you "
 "upgrade from a previous version and want to keep the data."
 msgstr ""
 "Los miembros del grupo de administradores de noticias pueden aprobar nuevas "
-"noticias en la página principal de @FORGENAME at . El identificador de este grupo no "
-"debe ser «1». Esto se debería cambiar sólo si actualiza desde una versión "
-"previa y quiere mantener los datos."
+"noticias en la página principal de @FORGENAME at . El identificador de este "
+"grupo no debe ser «1». Esto se debería cambiar sólo si actualiza desde una "
+"versión previa y quiere mantener los datos."
 
 #. Type: string
 #. Description
@@ -502,8 +503,8 @@
 #: ../dsf-helper/shellhost-variables.templates:2001
 #, fuzzy
 #| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ shell "
-#| "accounts."
+#| "Please enter the host name of the server that will host the @FORGENAME@ "
+#| "shell accounts."
 msgid ""
 "Please enter the host name of the server that will host the @FORGENAME@ "
 "shell accounts."
@@ -522,8 +523,8 @@
 #: ../dsf-helper/users-variables.templates:2001
 #, fuzzy
 #| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ user "
-#| "mail redirector."
+#| "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."

Modified: trunk/src/debian/dsf-po/fi.po
===================================================================
--- trunk/src/debian/dsf-po/fi.po	2010-06-30 16:50:16 UTC (rev 10161)
+++ trunk/src/debian/dsf-po/fi.po	2010-06-30 16:50:26 UTC (rev 10162)
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
-"Report-Msgid-Bugs-To: @PACKAGENAME@@packages.debian.org\n"
+"Report-Msgid-Bugs-To: gforge at packages.debian.org\n"
 "POT-Creation-Date: 2009-06-12 23:23+0200\n"
 "PO-Revision-Date: 2008-03-24 17:41+0200\n"
 "Last-Translator: Esko Arajärvi <edu at iki.fi>\n"
@@ -24,12 +24,13 @@
 #: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 #, fuzzy
 #| msgid ""
-#| "Please enter the hostname of the server that will host the @FORGENAME@ shell "
-#| "accounts."
+#| "Please enter the hostname of the server that will host the @FORGENAME@ "
+#| "shell accounts."
 msgid ""
 "Please enter the hostname of the server that will host the @FORGENAME@ shell "
 "accounts."
-msgstr "Anna @FORGENAME at n komentorivitunnuksia isännöivän palvelimen verkkonimi."
+msgstr ""
+"Anna @FORGENAME at n komentorivitunnuksia isännöivän palvelimen verkkonimi."
 
 #. Type: string
 #. Description
@@ -77,14 +78,14 @@
 #: ../dsf-in/db-postgresql.templates.dsfh-in:10001
 #, fuzzy
 #| msgid ""
-#| "The @FORGENAME@ administrator account will have full privileges on the system. "
-#| "It will be used to approve the creation of new projects."
+#| "The @FORGENAME@ administrator account will have full privileges on the "
+#| "system. It will be used to approve the creation of new projects."
 msgid ""
 "The @FORGENAME@ administrator account will have full privileges on the "
 "system. It will be used to approve the creation of new projects."
 msgstr ""
-"@FORGENAME at n ylläpitotunnuksella tulee olemaan täydet oikeudet järjestelmään. "
-"Sitä käytetään hyväksyttäessä uusien projektien luominen."
+"@FORGENAME at n ylläpitotunnuksella tulee olemaan täydet oikeudet "
+"järjestelmään. Sitä käytetään hyväksyttäessä uusien projektien luominen."
 
 #. Type: string
 #. Description
@@ -158,9 +159,9 @@
 #: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 #, fuzzy
 #| msgid ""
-#| "@FORGENAME@ allows users to define a list of their skills, to be chosen from "
-#| "those present in the database. This list is the initial list of skills "
-#| "that will enter the database."
+#| "@FORGENAME@ allows users to define a list of their skills, to be chosen "
+#| "from those present in the database. This list is the initial list of "
+#| "skills that will enter the database."
 msgid ""
 "@FORGENAME@ allows users to define a list of their skills, to be chosen from "
 "those present in the database. This list is the initial list of skills that "
@@ -230,14 +231,14 @@
 #: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 #, fuzzy
 #| msgid ""
-#| "@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}\" "
-#| "address."
+#| "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#| "\"${noreply}\" address."
 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."
+"@FORGENAME@ lähettää ja vastaanottaa paljon sähköpostia osoitteen "
+"”${noreply}” kautta."
 
 #. Type: boolean
 #. Description
@@ -269,8 +270,9 @@
 "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."
+"Anna @FORGENAME at -asennuksen verkkotunnus. Joillekin palveluille "
+"(versionhallinta, listat, jne.) annetaan oma aliverkkotunnus tämän "
+"verkkotunnuksen alta."
 
 #. Type: string
 #. Description
@@ -285,8 +287,8 @@
 #: ../dsf-helper/common-variables.templates:3001
 #, fuzzy
 #| msgid ""
-#| "Please enter the e-mail address of the @FORGENAME@ administrator of this site. "
-#| "It will be used when problems occur."
+#| "Please enter the e-mail address of the @FORGENAME@ administrator of this "
+#| "site. It will be used when problems occur."
 msgid ""
 "Please enter the e-mail address of the @FORGENAME@ administrator of this "
 "site. It will be used when problems occur."
@@ -307,8 +309,8 @@
 #: ../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."
+#| "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."
@@ -333,7 +335,8 @@
 "Please enter the IP address (or hostname) of the server that will host the "
 "@FORGENAME@ database."
 msgstr ""
-"Anna @FORGENAME at n tietokantaa isännöivän palvelimen IP-osoite (tai verkkonimi)."
+"Anna @FORGENAME at n tietokantaa isännöivän palvelimen IP-osoite (tai "
+"verkkonimi)."
 
 #. Type: string
 #. Description
@@ -346,7 +349,8 @@
 #: ../dsf-helper/dbhost-variables.templates:3001
 #, fuzzy
 #| msgid ""
-#| "Please enter the name of the database that will host the @FORGENAME@ database."
+#| "Please enter the name of the database that will host the @FORGENAME@ "
+#| "database."
 msgid ""
 "Please enter the name of the database that will host the @FORGENAME@ "
 "database."
@@ -413,9 +417,9 @@
 #: ../dsf-helper/groupid-variables.templates:2001
 #, fuzzy
 #| msgid ""
-#| "The members of the news admin group can approve news for the @FORGENAME@ main "
-#| "page. This group's ID must not be 1. This should be changed only if you "
-#| "upgrade from a previous version and want to keep the data."
+#| "The members of the news admin group can approve news for the @FORGENAME@ "
+#| "main page. This group's ID must not be 1. This should be changed only if "
+#| "you upgrade from a previous version and want to keep the data."
 msgid ""
 "The members of the news admin group can approve news for the @FORGENAME@ "
 "main page. This group's ID must not be 1. This should be changed only if you "
@@ -460,12 +464,13 @@
 #: ../dsf-helper/shellhost-variables.templates:2001
 #, fuzzy
 #| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ shell "
-#| "accounts."
+#| "Please enter the host name of the server that will host the @FORGENAME@ "
+#| "shell accounts."
 msgid ""
 "Please enter the host name of the server that will host the @FORGENAME@ "
 "shell accounts."
-msgstr "Anna @FORGENAME at n komentorivitunnuksia isännöivän palvelimen verkkonimi."
+msgstr ""
+"Anna @FORGENAME at n komentorivitunnuksia isännöivän palvelimen verkkonimi."
 
 #. Type: string
 #. Description
@@ -478,8 +483,8 @@
 #: ../dsf-helper/users-variables.templates:2001
 #, fuzzy
 #| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ user "
-#| "mail redirector."
+#| "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."

Modified: trunk/src/debian/dsf-po/fr.po
===================================================================
--- trunk/src/debian/dsf-po/fr.po	2010-06-30 16:50:16 UTC (rev 10161)
+++ trunk/src/debian/dsf-po/fr.po	2010-06-30 16:50:26 UTC (rev 10162)
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: @PACKAGENAME@\n"
-"Report-Msgid-Bugs-To: @PACKAGENAME@@packages.debian.org\n"
-"POT-Creation-Date: 2009-12-29 12:34+0100\n"
+"Report-Msgid-Bugs-To: gforge at packages.debian.org\n"
+"POT-Creation-Date: 2009-06-12 23:23+0200\n"
 "PO-Revision-Date: 2009-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"
@@ -19,14 +19,14 @@
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 #: ../dsf-helper/shellhost-variables.templates:2001
 msgid "Shell server:"
 msgstr "Serveur interactif (« shell server ») :"
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 msgid ""
 "Please enter the hostname of the server that will host the @FORGENAME@ shell "
 "accounts."
@@ -36,22 +36,23 @@
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 msgid "Download server:"
 msgstr "Serveur de téléchargement :"
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 msgid ""
-"Please enter the hostname of the server that will host the @FORGENAME@ packages."
+"Please enter the hostname of the server that will host the @FORGENAME@ "
+"packages."
 msgstr ""
 "Veuillez indiquer le nom du serveur qui hébergera les paquets de @FORGENAME at ."
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 #: ../dsf-helper/lists-variables.templates:2001
 #: ../dsf-helper/users-variables.templates:2001
@@ -60,7 +61,7 @@
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 msgid "@FORGENAME@ administrator login:"
 msgstr "Identifiant de l'administrateur de @FORGENAME@ :"
 
@@ -68,31 +69,31 @@
 #. Description
 #. Type: password
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:8001
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
 msgid ""
-"The @FORGENAME@ administrator account will have full privileges on the system. It "
-"will be used to approve the creation of new projects."
+"The @FORGENAME@ administrator account will have full privileges on the "
+"system. It will be used to approve the creation of new projects."
 msgstr ""
-"Le compte d'administration de @FORGENAME@ aura tous les privilèges sur le système "
-"@FORGENAME at . Il servira à approuver la création de projets."
+"Le compte d'administration de @FORGENAME@ aura tous les privilèges sur le "
+"système @FORGENAME at . Il servira à approuver la création de projets."
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 msgid "Please choose the username for this account."
 msgstr "Veuillez choisir l'identifiant à utiliser pour ce compte."
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
 msgid "IP address:"
 msgstr "Adresse IP :"
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
 msgid ""
 "Please enter the IP address of the server that will host the @FORGENAME@ "
@@ -101,7 +102,7 @@
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
 msgid "This is needed for the configuration of Apache virtual hosting."
 msgstr ""
@@ -110,50 +111,50 @@
 
 #. Type: password
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
 msgid "@FORGENAME@ administrator password:"
 msgstr "Mot de passe de l'administrateur de @FORGENAME@ :"
 
 #. Type: password
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
 msgid "Please choose the password for this account."
 msgstr "Veuillez choisir le mot de passe de ce compte."
 
 #. Type: password
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:11001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:11001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Password confirmation:"
 msgstr "Confirmation du mot de passe :"
 
 #. Type: password
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:11001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:11001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Veuillez entrer à nouveau le mot de passe, pour confirmation."
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 msgid "Initial list of skills:"
 msgstr "Liste initiale de domaines de compétences :"
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 msgid ""
 "@FORGENAME@ allows users to define a list of their skills, to be chosen from "
 "those present in the database. This list is the initial list of skills that "
 "will enter the database."
 msgstr ""
-"Les utilisateurs de @FORGENAME@ peuvent afficher leurs niveaux de compétence dans "
-"différents domaines. Cette liste est la liste initiale de ces domaines. "
+"Les utilisateurs de @FORGENAME@ peuvent afficher leurs niveaux de compétence "
+"dans différents domaines. Cette liste est la liste initiale de ces domaines. "
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 msgid "Please enter a semicolon-separated list of skill names."
 msgstr ""
 "Veuillez indiquer les noms de ces domaines de compétence, séparés par des "
@@ -163,7 +164,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGENAME at -dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
 msgid "Do you want a simple DNS setup for @FORGENAME@?"
 msgstr "Souhaitez-vous une configuration DNS simplifiée ?"
 
@@ -171,7 +172,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGENAME at -dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
 msgid ""
 "You can use a simple DNS setup with wildcards to map all project web-hosts "
 "to a single IP address, and direct all the scm-hosts to a single SCM server, "
@@ -189,7 +190,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGENAME at -dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
 msgid ""
 "Even if you use a simple DNS setup, you can still use separate machines as "
 "project servers; it just assumes that all the project web directories are on "
@@ -202,22 +203,23 @@
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGENAME at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 msgid "Do you want mail to ${noreply} to be discarded?"
 msgstr "Faut-il supprimer les courriers pour ${noreply} ?"
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGENAME at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 msgid ""
-"@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}\" "
-"address."
+"@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}"
+"\" address."
 msgstr ""
-"@FORGENAME@ envoie fréquemment des courriers de et vers l'adresse « ${noreply} »."
+"@FORGENAME@ envoie fréquemment des courriers de et vers l'adresse "
+"« ${noreply} »."
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGENAME at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 msgid ""
 "E-mail to that address should be directed to a black hole (/dev/null), "
 "unless you have another use for that address."
@@ -252,28 +254,29 @@
 #. Description
 #: ../dsf-helper/common-variables.templates:3001
 msgid ""
-"Please enter the e-mail address of the @FORGENAME@ administrator of this site. It "
-"will be used when problems occur."
+"Please enter the e-mail address of the @FORGENAME@ administrator of this "
+"site. It will be used when problems occur."
 msgstr ""
-"Veuillez indiquer l'adresse de l'administrateur de @FORGENAME at . Elle est utilisée "
-"quand un problème se produit."
+"Veuillez indiquer l'adresse de l'administrateur de @FORGENAME at . Elle est "
+"utilisée quand un problème se produit."
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:4001
-#| msgid "@FORGENAME@ system name:"
-msgid "@FORGENAME@/FusionForge system name:"
+#, 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."
+"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."
+"Veuillez indiquer le nom du système @FORGENAME at . Il est utilisé dans "
+"plusieurs parties du serveur."
 
 #. Type: string
 #. Description
@@ -301,7 +304,8 @@
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:3001
 msgid ""
-"Please enter the name of the database that will host the @FORGENAME@ database."
+"Please enter the name of the database that will host the @FORGENAME@ "
+"database."
 msgstr "Veuillez indiquer le nom de la base de données pour @FORGENAME at ."
 
 #. Type: string
@@ -344,7 +348,8 @@
 #. Description
 #: ../dsf-helper/downloadhost-variables.templates:2001
 msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ packages."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"packages."
 msgstr ""
 "Veuillez indiquer le nom du serveur qui hébergera les paquets de @FORGENAME at ."
 
@@ -358,13 +363,13 @@
 #. Description
 #: ../dsf-helper/groupid-variables.templates:2001
 msgid ""
-"The members of the news admin group can approve news for the @FORGENAME@ main "
-"page. This group's ID must not be 1. This should be changed only if you "
+"The members of the news admin group can approve news for the @FORGENAME@ "
+"main page. This group's ID must not be 1. This should be changed only if you "
 "upgrade from a previous version and want to keep the data."
 msgstr ""
 "Les membres du groupe d'administration des nouvelles peuvent approuver des "
-"nouvelles pour les publier sur la page d'accueil de @FORGENAME at . Le numéro de ce "
-"groupe ne doit pas être 1. Cette information n'est requise que si vous "
+"nouvelles pour les publier sur la page d'accueil de @FORGENAME at . Le numéro "
+"de ce groupe ne doit pas être 1. Cette information n'est requise que si vous "
 "mettez à jour une installation précédente et que vous voulez garder vos "
 "données."
 
@@ -390,8 +395,8 @@
 #. Description
 #: ../dsf-helper/lists-variables.templates:2001
 msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ mailing "
-"lists."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"mailing lists."
 msgstr ""
 "Veuillez indiquer le nom d'hôte du serveur qui hébergera les listes de "
 "diffusion de @FORGENAME at ."
@@ -400,8 +405,8 @@
 #. Description
 #: ../dsf-helper/shellhost-variables.templates:2001
 msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ shell "
-"accounts."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"shell accounts."
 msgstr ""
 "Veuillez indiquer le nom d'hôte du serveur qui hébergera les comptes "
 "interactifs @FORGENAME at ."
@@ -416,8 +421,8 @@
 #. Description
 #: ../dsf-helper/users-variables.templates:2001
 msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ user mail "
-"redirector."
+"Please enter the host name of the server that will host the @FORGENAME@ user "
+"mail redirector."
 msgstr ""
 "Veuillez indiquer le nom du serveur qui hébergera le redirecteur du courriel "
 "utilisateurs de @FORGENAME at ."

Modified: trunk/src/debian/dsf-po/gl.po
===================================================================
--- trunk/src/debian/dsf-po/gl.po	2010-06-30 16:50:16 UTC (rev 10161)
+++ trunk/src/debian/dsf-po/gl.po	2010-06-30 16:50:26 UTC (rev 10162)
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
-"Report-Msgid-Bugs-To: @PACKAGENAME@@packages.debian.org\n"
+"Report-Msgid-Bugs-To: gforge at packages.debian.org\n"
 "POT-Creation-Date: 2009-06-12 23:23+0200\n"
 "PO-Revision-Date: 2008-03-25 03:47+0000\n"
 "Last-Translator: Jacobo Tarrio <jtarrio at debian.org>\n"
@@ -26,8 +26,8 @@
 #: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 #, fuzzy
 #| msgid ""
-#| "Please enter the hostname of the server that will host the @FORGENAME@ shell "
-#| "accounts."
+#| "Please enter the hostname of the server that will host the @FORGENAME@ "
+#| "shell accounts."
 msgid ""
 "Please enter the hostname of the server that will host the @FORGENAME@ shell "
 "accounts."
@@ -51,7 +51,8 @@
 msgid ""
 "Please enter the hostname of the server that will host the @FORGENAME@ "
 "packages."
-msgstr "Introduza o nome do servidor que ha hospedar os paquetes de @FORGENAME at ."
+msgstr ""
+"Introduza o nome do servidor que ha hospedar os paquetes de @FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -80,14 +81,14 @@
 #: ../dsf-in/db-postgresql.templates.dsfh-in:10001
 #, fuzzy
 #| msgid ""
-#| "The @FORGENAME@ administrator account will have full privileges on the system. "
-#| "It will be used to approve the creation of new projects."
+#| "The @FORGENAME@ administrator account will have full privileges on the "
+#| "system. It will be used to approve the creation of new projects."
 msgid ""
 "The @FORGENAME@ administrator account will have full privileges on the "
 "system. It will be used to approve the creation of new projects."
 msgstr ""
-"A conta de administrador de @FORGENAME@ ha ter tódolos privilexios no sistema. "
-"Hase empregar para aprobar a creación de novos proxectos."
+"A conta de administrador de @FORGENAME@ ha ter tódolos privilexios no "
+"sistema. Hase empregar para aprobar a creación de novos proxectos."
 
 #. Type: string
 #. Description
@@ -114,7 +115,8 @@
 "Please enter the IP address of the server that will host the @FORGENAME@ "
 "installation."
 msgstr ""
-"Introduza o enderezo IP do servidor que ha hospedar a instalación de @FORGENAME at ."
+"Introduza o enderezo IP do servidor que ha hospedar a instalación de "
+"@FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -162,17 +164,17 @@
 #: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 #, fuzzy
 #| msgid ""
-#| "@FORGENAME@ allows users to define a list of their skills, to be chosen from "
-#| "those present in the database. This list is the initial list of skills "
-#| "that will enter the database."
+#| "@FORGENAME@ allows users to define a list of their skills, to be chosen "
+#| "from those present in the database. This list is the initial list of "
+#| "skills that will enter the database."
 msgid ""
 "@FORGENAME@ allows users to define a list of their skills, to be chosen from "
 "those present in the database. This list is the initial list of skills that "
 "will enter the database."
 msgstr ""
-"@FORGENAME@ permítelle aos usuarios facer unha lista cos seus coñecementos, que "
-"poden escoller entre os que figuran na base de datos. Esta lista é a lista "
-"inicial de coñecementos que han entrar na base de datos."
+"@FORGENAME@ permítelle aos usuarios facer unha lista cos seus coñecementos, "
+"que poden escoller entre os que figuran na base de datos. Esta lista é a "
+"lista inicial de coñecementos que han entrar na base de datos."
 
 #. Type: string
 #. Description
@@ -233,13 +235,14 @@
 #: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 #, fuzzy
 #| msgid ""
-#| "@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}\" "
-#| "address."
+#| "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#| "\"${noreply}\" address."
 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}\"."
+"@FORGENAME@ envía e recibe moito email desde e para o enderezo \"${noreply}"
+"\"."
 
 #. Type: boolean
 #. Description
@@ -271,8 +274,9 @@
 "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."
+"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
@@ -287,14 +291,14 @@
 #: ../dsf-helper/common-variables.templates:3001
 #, fuzzy
 #| msgid ""
-#| "Please enter the e-mail address of the @FORGENAME@ administrator of this site. "
-#| "It will be used when problems occur."
+#| "Please enter the e-mail address of the @FORGENAME@ administrator of this "
+#| "site. It will be used when problems occur."
 msgid ""
 "Please enter the e-mail address of the @FORGENAME@ administrator of this "
 "site. It will be used when problems occur."
 msgstr ""
-"Introduza o enderezo de email do administrador de @FORGENAME@ deste sitio. Hase "
-"empregar se aparecen problemas."
+"Introduza o enderezo de email do administrador de @FORGENAME@ deste sitio. "
+"Hase empregar se aparecen problemas."
 
 #. Type: string
 #. Description
@@ -309,13 +313,14 @@
 #: ../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."
+#| "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."
+"Introduza o nome do sistema @FORGENAME at . Emprégase en varios lugares do "
+"sistema."
 
 #. Type: string
 #. Description
@@ -348,12 +353,14 @@
 #: ../dsf-helper/dbhost-variables.templates:3001
 #, fuzzy
 #| msgid ""
-#| "Please enter the name of the database that will host the @FORGENAME@ database."
+#| "Please enter the name of the database that will host the @FORGENAME@ "
+#| "database."
 msgid ""
 "Please enter the name of the database that will host the @FORGENAME@ "
 "database."
 msgstr ""
-"Introduza o nome da base de datos que ha hospedar as contas shell de @FORGENAME@"
+"Introduza o nome da base de datos que ha hospedar as contas shell de "
+"@FORGENAME@"
 
 #. Type: string
 #. Description
@@ -404,7 +411,8 @@
 msgid ""
 "Please enter the host name of the server that will host the @FORGENAME@ "
 "packages."
-msgstr "Introduza o nome do servidor que ha hospedar os paquetes de @FORGENAME at ."
+msgstr ""
+"Introduza o nome do servidor que ha hospedar os paquetes de @FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -417,18 +425,18 @@
 #: ../dsf-helper/groupid-variables.templates:2001
 #, fuzzy
 #| msgid ""
-#| "The members of the news admin group can approve news for the @FORGENAME@ main "
-#| "page. This group's ID must not be 1. This should be changed only if you "
-#| "upgrade from a previous version and want to keep the data."
+#| "The members of the news admin group can approve news for the @FORGENAME@ "
+#| "main page. This group's ID must not be 1. This should be changed only if "
+#| "you upgrade from a previous version and want to keep the data."
 msgid ""
 "The members of the news admin group can approve news for the @FORGENAME@ "
 "main page. This group's ID must not be 1. This should be changed only if you "
 "upgrade from a previous version and want to keep the data."
 msgstr ""
 "Os membros do grupo de administradores de novas poden aprobar as novas da "
-"páxina principal de @FORGENAME at . Este ID de grupo non debe ser 1. Só se debería "
-"cambiar se está a se actualizar dunha versión anterior e quere conservar os "
-"datos."
+"páxina principal de @FORGENAME at . Este ID de grupo non debe ser 1. Só se "
+"debería cambiar se está a se actualizar dunha versión anterior e quere "
+"conservar os datos."
 
 #. Type: string
 #. Description
@@ -459,15 +467,16 @@
 "Please enter the host name of the server that will host the @FORGENAME@ "
 "mailing lists."
 msgstr ""
-"Introduza o nome do servidor que ha hospedar as listas de correo de @FORGENAME at ."
+"Introduza o nome do servidor que ha hospedar as listas de correo de "
+"@FORGENAME at ."
 
 #. Type: string
 #. Description
 #: ../dsf-helper/shellhost-variables.templates:2001
 #, fuzzy
 #| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ shell "
-#| "accounts."
+#| "Please enter the host name of the server that will host the @FORGENAME@ "
+#| "shell accounts."
 msgid ""
 "Please enter the host name of the server that will host the @FORGENAME@ "
 "shell accounts."
@@ -485,8 +494,8 @@
 #: ../dsf-helper/users-variables.templates:2001
 #, fuzzy
 #| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ user "
-#| "mail redirector."
+#| "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."

Modified: trunk/src/debian/dsf-po/nl.po
===================================================================
--- trunk/src/debian/dsf-po/nl.po	2010-06-30 16:50:16 UTC (rev 10161)
+++ trunk/src/debian/dsf-po/nl.po	2010-06-30 16:50:26 UTC (rev 10162)
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
-"Report-Msgid-Bugs-To: @PACKAGENAME@@packages.debian.org\n"
+"Report-Msgid-Bugs-To: gforge at packages.debian.org\n"
 "POT-Creation-Date: 2009-06-12 23:23+0200\n"
 "PO-Revision-Date: 2008-03-28 14:19+0100\n"
 "Last-Translator: Bart Cornelis <cobaco at skolelinux.no>\n"
@@ -40,8 +40,8 @@
 #: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 #, fuzzy
 #| msgid ""
-#| "Please enter the hostname of the server that will host the @FORGENAME@ shell "
-#| "accounts."
+#| "Please enter the hostname of the server that will host the @FORGENAME@ "
+#| "shell accounts."
 msgid ""
 "Please enter the hostname of the server that will host the @FORGENAME@ shell "
 "accounts."
@@ -71,8 +71,8 @@
 "Please enter the hostname of the server that will host the @FORGENAME@ "
 "packages."
 msgstr ""
-"Wat is de computernaam van de server waarop de @FORGENAME at -pakketten gehost gaan "
-"worden?"
+"Wat is de computernaam van de server waarop de @FORGENAME at -pakketten gehost "
+"gaan worden?"
 
 #. Type: string
 #. Description
@@ -105,14 +105,14 @@
 #: ../dsf-in/db-postgresql.templates.dsfh-in:10001
 #, fuzzy
 #| msgid ""
-#| "The @FORGENAME@ administrator account will have full privileges on the system. "
-#| "It will be used to approve the creation of new projects."
+#| "The @FORGENAME@ administrator account will have full privileges on the "
+#| "system. It will be used to approve the creation of new projects."
 msgid ""
 "The @FORGENAME@ administrator account will have full privileges on the "
 "system. It will be used to approve the creation of new projects."
 msgstr ""
-"De @FORGENAME at -beheerdersaccount krijgt volledige rechten binnen @FORGENAME at -systeem, "
-"en wordt gebruikt om nieuwe projecten goed te keuren."
+"De @FORGENAME at -beheerdersaccount krijgt volledige rechten binnen @FORGENAME at -"
+"systeem, en wordt gebruikt om nieuwe projecten goed te keuren."
 
 #. Type: string
 #. Description
@@ -143,7 +143,8 @@
 "Please enter the IP address of the server that will host the @FORGENAME@ "
 "installation."
 msgstr ""
-"Wat is de computernaam van de server die de @FORGENAME at -installatie gaat hosten?"
+"Wat is de computernaam van de server die de @FORGENAME at -installatie gaat "
+"hosten?"
 
 #. Type: string
 #. Description
@@ -203,17 +204,17 @@
 #: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 #, fuzzy
 #| msgid ""
-#| "@FORGENAME@ allows users to define a list of their skills, to be chosen from "
-#| "those present in the database. This list is the initial list of skills "
-#| "that will enter the database."
+#| "@FORGENAME@ allows users to define a list of their skills, to be chosen "
+#| "from those present in the database. This list is the initial list of "
+#| "skills that will enter the database."
 msgid ""
 "@FORGENAME@ allows users to define a list of their skills, to be chosen from "
 "those present in the database. This list is the initial list of skills that "
 "will enter the database."
 msgstr ""
-"@FORGENAME@ geeft gebruikers de mogelijkheid om een lijst met hun vaardigheden op "
-"te geven, gekozen uit deze aanwezig in de database. Dit is de de initiële "
-"lijst van vaardigheden voor de database."
+"@FORGENAME@ geeft gebruikers de mogelijkheid om een lijst met hun "
+"vaardigheden op te geven, gekozen uit deze aanwezig in de database. Dit is "
+"de de initiële lijst van vaardigheden voor de database."
 
 #. Type: string
 #. Description
@@ -286,14 +287,14 @@
 #: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 #, fuzzy
 #| msgid ""
-#| "@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}\" "
-#| "address."
+#| "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#| "\"${noreply}\" address."
 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}'."
+"@FORGENAME@ verstuurt en ontvangt een heleboel e-mails van en naar  het "
+"adres '${noreply}'."
 
 #  Type: boolean
 #  Description
@@ -352,8 +353,8 @@
 #: ../dsf-helper/common-variables.templates:3001
 #, fuzzy
 #| msgid ""
-#| "Please enter the e-mail address of the @FORGENAME@ administrator of this site. "
-#| "It will be used when problems occur."
+#| "Please enter the e-mail address of the @FORGENAME@ administrator of this "
+#| "site. It will be used when problems occur."
 msgid ""
 "Please enter the e-mail address of the @FORGENAME@ administrator of this "
 "site. It will be used when problems occur."
@@ -378,8 +379,8 @@
 #: ../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."
+#| "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."
@@ -426,7 +427,8 @@
 #: ../dsf-helper/dbhost-variables.templates:3001
 #, fuzzy
 #| msgid ""
-#| "Please enter the name of the database that will host the @FORGENAME@ database."
+#| "Please enter the name of the database that will host the @FORGENAME@ "
+#| "database."
 msgid ""
 "Please enter the name of the database that will host the @FORGENAME@ "
 "database."
@@ -491,7 +493,8 @@
 "Please enter the host name of the server that will host the @FORGENAME@ "
 "packages."
 msgstr ""
-"Wat is de computernaam van de server die de @FORGENAME at -pakketten gaat hosten?"
+"Wat is de computernaam van de server die de @FORGENAME at -pakketten gaat "
+"hosten?"
 
 #. Type: string
 #. Description
@@ -506,9 +509,9 @@
 #: ../dsf-helper/groupid-variables.templates:2001
 #, fuzzy
 #| msgid ""
-#| "The members of the news admin group can approve news for the @FORGENAME@ main "
-#| "page. This group's ID must not be 1. This should be changed only if you "
-#| "upgrade from a previous version and want to keep the data."
+#| "The members of the news admin group can approve news for the @FORGENAME@ "
+#| "main page. This group's ID must not be 1. This should be changed only if "
+#| "you upgrade from a previous version and want to keep the data."
 msgid ""
 "The members of the news admin group can approve news for the @FORGENAME@ "
 "main page. This group's ID must not be 1. This should be changed only if you "
@@ -552,7 +555,8 @@
 "Please enter the host name of the server that will host the @FORGENAME@ "
 "mailing lists."
 msgstr ""
-"Wat is de computernaam van de server die de @FORGENAME at -e-maillijsten gaat hosten?"
+"Wat is de computernaam van de server die de @FORGENAME at -e-maillijsten gaat "
+"hosten?"
 
 #  Type: string
 #  Description
@@ -561,8 +565,8 @@
 #: ../dsf-helper/shellhost-variables.templates:2001
 #, fuzzy
 #| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ shell "
-#| "accounts."
+#| "Please enter the host name of the server that will host the @FORGENAME@ "
+#| "shell accounts."
 msgid ""
 "Please enter the host name of the server that will host the @FORGENAME@ "
 "shell accounts."
@@ -585,8 +589,8 @@
 #: ../dsf-helper/users-variables.templates:2001
 #, fuzzy
 #| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ user "
-#| "mail redirector."
+#| "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."

Modified: trunk/src/debian/dsf-po/pt.po
===================================================================
--- trunk/src/debian/dsf-po/pt.po	2010-06-30 16:50:16 UTC (rev 10161)
+++ trunk/src/debian/dsf-po/pt.po	2010-06-30 16:50:26 UTC (rev 10162)
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: @PACKAGE@ 4.6.99+svn6387-1\n"
-"Report-Msgid-Bugs-To: @PACKAGENAME@@packages.debian.org\n"
+"Report-Msgid-Bugs-To: gforge at packages.debian.org\n"
 "POT-Creation-Date: 2009-06-12 23:23+0200\n"
 "PO-Revision-Date: 2008-04-12 21:30+0100\n"
 "Last-Translator: Ricardo Silva <ardoric at gmail.com>\n"
@@ -27,8 +27,8 @@
 #: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 #, fuzzy
 #| msgid ""
-#| "Please enter the hostname of the server that will host the @FORGENAME@ shell "
-#| "accounts."
+#| "Please enter the hostname of the server that will host the @FORGENAME@ "
+#| "shell accounts."
 msgid ""
 "Please enter the hostname of the server that will host the @FORGENAME@ shell "
 "accounts."
@@ -54,7 +54,8 @@
 "Please enter the hostname of the server that will host the @FORGENAME@ "
 "packages."
 msgstr ""
-"Por favor introduza o nome do servidor que irá guardar os pacotes @FORGENAME at ."
+"Por favor introduza o nome do servidor que irá guardar os pacotes "
+"@FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -83,14 +84,14 @@
 #: ../dsf-in/db-postgresql.templates.dsfh-in:10001
 #, fuzzy
 #| msgid ""
-#| "The @FORGENAME@ administrator account will have full privileges on the system. "
-#| "It will be used to approve the creation of new projects."
+#| "The @FORGENAME@ administrator account will have full privileges on the "
+#| "system. It will be used to approve the creation of new projects."
 msgid ""
 "The @FORGENAME@ administrator account will have full privileges on the "
 "system. It will be used to approve the creation of new projects."
 msgstr ""
-"A conta de administrador do @FORGENAME@ terá privilégios totais sobre o sistema. "
-"Será usada para aprovar a criação de novos projectos."
+"A conta de administrador do @FORGENAME@ terá privilégios totais sobre o "
+"sistema. Será usada para aprovar a criação de novos projectos."
 
 #. Type: string
 #. Description
@@ -166,9 +167,9 @@
 #: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 #, fuzzy
 #| msgid ""
-#| "@FORGENAME@ allows users to define a list of their skills, to be chosen from "
-#| "those present in the database. This list is the initial list of skills "
-#| "that will enter the database."
+#| "@FORGENAME@ allows users to define a list of their skills, to be chosen "
+#| "from those present in the database. This list is the initial list of "
+#| "skills that will enter the database."
 msgid ""
 "@FORGENAME@ allows users to define a list of their skills, to be chosen from "
 "those present in the database. This list is the initial list of skills that "
@@ -240,8 +241,8 @@
 #: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 #, fuzzy
 #| msgid ""
-#| "@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}\" "
-#| "address."
+#| "@FORGENAME@ sends and receives plenty of e-mail to and from the "
+#| "\"${noreply}\" address."
 msgid ""
 "@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}"
 "\" address."
@@ -279,9 +280,9 @@
 "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."
+"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
@@ -296,14 +297,14 @@
 #: ../dsf-helper/common-variables.templates:3001
 #, fuzzy
 #| msgid ""
-#| "Please enter the e-mail address of the @FORGENAME@ administrator of this site. "
-#| "It will be used when problems occur."
+#| "Please enter the e-mail address of the @FORGENAME@ administrator of this "
+#| "site. It will be used when problems occur."
 msgid ""
 "Please enter the e-mail address of the @FORGENAME@ administrator of this "
 "site. It will be used when problems occur."
 msgstr ""
-"Por favor introduza o endereço de email do administrador @FORGENAME@ neste site. "
-"Será usado quando houverem problemas."
+"Por favor introduza o endereço de email do administrador @FORGENAME@ neste "
+"site. Será usado quando houverem problemas."
 
 #. Type: string
 #. Description
@@ -318,8 +319,8 @@
 #: ../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."
+#| "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."
@@ -358,7 +359,8 @@
 #: ../dsf-helper/dbhost-variables.templates:3001
 #, fuzzy
 #| msgid ""
-#| "Please enter the name of the database that will host the @FORGENAME@ database."
+#| "Please enter the name of the database that will host the @FORGENAME@ "
+#| "database."
 msgid ""
 "Please enter the name of the database that will host the @FORGENAME@ "
 "database."
@@ -415,7 +417,8 @@
 "Please enter the host name of the server that will host the @FORGENAME@ "
 "packages."
 msgstr ""
-"Por favor introduza o nome do servidor que irá guardar os pacotes do @FORGENAME at ."
+"Por favor introduza o nome do servidor que irá guardar os pacotes do "
+"@FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -428,17 +431,17 @@
 #: ../dsf-helper/groupid-variables.templates:2001
 #, fuzzy
 #| msgid ""
-#| "The members of the news admin group can approve news for the @FORGENAME@ main "
-#| "page. This group's ID must not be 1. This should be changed only if you "
-#| "upgrade from a previous version and want to keep the data."
+#| "The members of the news admin group can approve news for the @FORGENAME@ "
+#| "main page. This group's ID must not be 1. This should be changed only if "
+#| "you upgrade from a previous version and want to keep the data."
 msgid ""
 "The members of the news admin group can approve news for the @FORGENAME@ "
 "main page. This group's ID must not be 1. This should be changed only if you "
 "upgrade from a previous version and want to keep the data."
 msgstr ""
 "Os membros do grupo de administradores de notícias podem aprovar notícias "
-"afixadas na página principal do @FORGENAME at . Este identificador de grupo não pode "
-"ser 1. Isto deve ser mudado apenas se actualizar a partir de uma versão "
+"afixadas na página principal do @FORGENAME at . Este identificador de grupo não "
+"pode ser 1. Isto deve ser mudado apenas se actualizar a partir de uma versão "
 "antiga e quiser manter os seus dados."
 
 #. Type: string
@@ -478,8 +481,8 @@
 #: ../dsf-helper/shellhost-variables.templates:2001
 #, fuzzy
 #| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ shell "
-#| "accounts."
+#| "Please enter the host name of the server that will host the @FORGENAME@ "
+#| "shell accounts."
 msgid ""
 "Please enter the host name of the server that will host the @FORGENAME@ "
 "shell accounts."
@@ -498,8 +501,8 @@
 #: ../dsf-helper/users-variables.templates:2001
 #, fuzzy
 #| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ user "
-#| "mail redirector."
+#| "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."

Modified: trunk/src/debian/dsf-po/ru.po
===================================================================
--- trunk/src/debian/dsf-po/ru.po	2010-06-30 16:50:16 UTC (rev 10161)
+++ trunk/src/debian/dsf-po/ru.po	2010-06-30 16:50:26 UTC (rev 10162)
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: @PACKAGENAME@ 4.8.2-1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-29 12:49+0100\n"
+"Report-Msgid-Bugs-To: gforge at packages.debian.org\n"
+"POT-Creation-Date: 2009-06-12 23:23+0200\n"
 "PO-Revision-Date: 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"
@@ -16,18 +16,19 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 #: ../dsf-helper/shellhost-variables.templates:2001
 msgid "Shell server:"
 msgstr "Сервер оболочек:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 msgid ""
 "Please enter the hostname of the server that will host the @FORGENAME@ shell "
 "accounts."
@@ -37,20 +38,22 @@
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 msgid "Download server:"
 msgstr "Сервер загрузок:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:6001
-msgid "Please enter the hostname of the server that will host the @FORGENAME@ packages."
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
+msgid ""
+"Please enter the hostname of the server that will host the @FORGENAME@ "
+"packages."
 msgstr "Введите имя сервера, на котором будут расположены пакеты @FORGENAME at ."
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 #: ../dsf-helper/lists-variables.templates:2001
 #: ../dsf-helper/users-variables.templates:2001
@@ -59,7 +62,7 @@
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 msgid "@FORGENAME@ administrator login:"
 msgstr "Учётная запись администратора @FORGENAME@:"
 
@@ -67,91 +70,93 @@
 #. Description
 #. Type: password
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:8001
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
 msgid ""
-"The @FORGENAME@ administrator account will have full privileges on the system. It "
-"will be used to approve the creation of new projects."
+"The @FORGENAME@ administrator account will have full privileges on the "
+"system. It will be used to approve the creation of new projects."
 msgstr ""
-"Учётная запись администратора @FORGENAME@ будет иметь все привилегии в системе. "
-"Она будет использована для подтверждения создания новых проектов."
+"Учётная запись администратора @FORGENAME@ будет иметь все привилегии в "
+"системе. Она будет использована для подтверждения создания новых проектов."
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 msgid "Please choose the username for this account."
 msgstr "Введите имя пользователя учётной записи для этого."
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
 msgid "IP address:"
 msgstr "IP-адрес:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
 msgid ""
 "Please enter the IP address of the server that will host the @FORGENAME@ "
 "installation."
-msgstr "Введите IP-адрес сервера, на котором будет располагаться установка @FORGENAME at ."
+msgstr ""
+"Введите IP-адрес сервера, на котором будет располагаться установка "
+"@FORGENAME at ."
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
 msgid "This is needed for the configuration of Apache virtual hosting."
 msgstr "Это нужно для настройки виртуального хостинга Apache."
 
 #. Type: password
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
 msgid "@FORGENAME@ administrator password:"
 msgstr "Пароль администратора @FORGENAME@:"
 
 #. Type: password
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
 msgid "Please choose the password for this account."
 msgstr "Введите пароль для этой учётной записи."
 
 #. Type: password
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:11001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:11001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Password confirmation:"
 msgstr "Подтверждение пароля:"
 
 #. Type: password
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:11001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:11001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Введите пароль ещё раз для подтверждения."
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 msgid "Initial list of skills:"
 msgstr "Начальный список навыков:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 msgid ""
 "@FORGENAME@ allows users to define a list of their skills, to be chosen from "
 "those present in the database. This list is the initial list of skills that "
 "will enter the database."
 msgstr ""
-"@FORGENAME@ позволяет пользователям составить список своих навыков из имеющихся в "
-"базе данных. Запрашиваемый сейчас начальный список навыков будет введён в "
-"базу данных."
+"@FORGENAME@ позволяет пользователям составить список своих навыков из "
+"имеющихся в базе данных. Запрашиваемый сейчас начальный список навыков будет "
+"введён в базу данных."
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 msgid "Please enter a semicolon-separated list of skill names."
 msgstr "Введите названия навыков, разделяя их точкой с запятой."
 
@@ -159,7 +164,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGENAME at -dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
 msgid "Do you want a simple DNS setup for @FORGENAME@?"
 msgstr "Выполнить простую настройку DNS для @FORGENAME@?"
 
@@ -167,7 +172,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGENAME at -dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
 msgid ""
 "You can use a simple DNS setup with wildcards to map all project web-hosts "
 "to a single IP address, and direct all the scm-hosts to a single SCM server, "
@@ -183,7 +188,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGENAME at -dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
 msgid ""
 "Even if you use a simple DNS setup, you can still use separate machines as "
 "project servers; it just assumes that all the project web directories are on "
@@ -196,23 +201,23 @@
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGENAME at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 msgid "Do you want mail to ${noreply} to be discarded?"
 msgstr "Удалять почту, присланную на адрес ${noreply}?"
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGENAME at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 msgid ""
-"@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}\" "
-"address."
+"@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}"
+"\" address."
 msgstr ""
-"@FORGENAME@ посылает и принимает множество электронных писем на адрес \"${noreply}"
-"\"."
+"@FORGENAME@ посылает и принимает множество электронных писем на адрес "
+"\"${noreply}\"."
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGENAME at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 msgid ""
 "E-mail to that address should be directed to a black hole (/dev/null), "
 "unless you have another use for that address."
@@ -233,9 +238,9 @@
 "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 и т.д.) будут присвоены свои собственные "
-"поддомены."
+"Введите домен, который будет обслуживать установку @FORGENAME at . В этом "
+"домене некоторым сервисам (scm, lists и т.д.) будут присвоены свои "
+"собственные поддомены."
 
 #. Type: string
 #. Description
@@ -247,8 +252,8 @@
 #. Description
 #: ../dsf-helper/common-variables.templates:3001
 msgid ""
-"Please enter the e-mail address of the @FORGENAME@ administrator of this site. It "
-"will be used when problems occur."
+"Please enter the e-mail address of the @FORGENAME@ administrator of this "
+"site. It will be used when problems occur."
 msgstr ""
 "Введите e-mail адрес администратора @FORGENAME@ для этого сайта. Он будет "
 "использован при возникновении проблем."
@@ -256,17 +261,20 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:4001
-#| msgid "@FORGENAME@ system name:"
-msgid "@FORGENAME@/FusionForge system name:"
+#, 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 . Оно используется в разных местах по всей системе."
+"Please enter the name of the @FORGENAME@ system. It is used in various "
+"places throughout the system."
+msgstr ""
+"Введите имя системы @FORGENAME at . Оно используется в разных местах по всей "
+"системе."
 
 #. Type: string
 #. Description
@@ -293,8 +301,11 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:3001
-msgid "Please enter the name of the database that will host the @FORGENAME@ database."
-msgstr "Введите имя базы данных, которая будет содержать базу данных @FORGENAME at ."
+msgid ""
+"Please enter the name of the database that will host the @FORGENAME@ "
+"database."
+msgstr ""
+"Введите имя базы данных, которая будет содержать базу данных @FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -333,8 +344,11 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/downloadhost-variables.templates:2001
-msgid "Please enter the host name of the server that will host the @FORGENAME@ packages."
-msgstr "Введите имя хоста сервера, на котором будут располагаться пакеты @FORGENAME at ."
+msgid ""
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"packages."
+msgstr ""
+"Введите имя хоста сервера, на котором будут располагаться пакеты @FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -346,13 +360,14 @@
 #. Description
 #: ../dsf-helper/groupid-variables.templates:2001
 msgid ""
-"The members of the news admin group can approve news for the @FORGENAME@ main "
-"page. This group's ID must not be 1. This should be changed only if you "
+"The members of the news admin group can approve news for the @FORGENAME@ "
+"main page. This group's ID must not be 1. This should be changed only if you "
 "upgrade from a previous version and want to keep the data."
 msgstr ""
 "Члены административной группы новостей могут утверждать новости для главной "
-"страницы @FORGENAME at . Данный ID не должен быть равен 1. Он должен быть изменён, "
-"только если вы обновляетесь с предыдущей версии и хотите сохранить данные."
+"страницы @FORGENAME at . Данный ID не должен быть равен 1. Он должен быть "
+"изменён, только если вы обновляетесь с предыдущей версии и хотите сохранить "
+"данные."
 
 #. Type: string
 #. Description
@@ -376,8 +391,8 @@
 #. Description
 #: ../dsf-helper/lists-variables.templates:2001
 msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ mailing "
-"lists."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"mailing lists."
 msgstr ""
 "Введите имя хоста сервера, который будет обслуживать списки почтовых "
 "рассылок @FORGENAME at ."
@@ -386,8 +401,8 @@
 #. Description
 #: ../dsf-helper/shellhost-variables.templates:2001
 msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ shell "
-"accounts."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"shell accounts."
 msgstr ""
 "Введите имя сервера, на котором будут расположены учётные записи оболочек "
 "для @FORGENAME at ."
@@ -402,9 +417,11 @@
 #. 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 ."
+"Please enter the host name of the server that will host the @FORGENAME@ user "
+"mail redirector."
+msgstr ""
+"Введите имя сервера, который будет перенаправлять почту пользователей "
+"@FORGENAME at ."
 
 #. Type: select
 #. Choices
@@ -577,8 +594,8 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/web-variables.templates:3001
-msgid "Please choose the default theme for web pages. This must be a valid name."
+msgid ""
+"Please choose the default theme for web pages. This must be a valid name."
 msgstr ""
 "Выберите тему по умолчанию для веб-страниц. Должно быть указано допустимое "
 "имя."
-

Modified: trunk/src/debian/dsf-po/sv.po
===================================================================
--- trunk/src/debian/dsf-po/sv.po	2010-06-30 16:50:16 UTC (rev 10161)
+++ trunk/src/debian/dsf-po/sv.po	2010-06-30 16:50:26 UTC (rev 10162)
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: @PACKAGENAME at _4.6.99+svn6580-1_sv\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-25 20:40+0100\n"
+"Report-Msgid-Bugs-To: gforge at packages.debian.org\n"
+"POT-Creation-Date: 2009-06-12 23:23+0200\n"
 "PO-Revision-Date: 2008-07-29 18:44+0200\n"
 "Last-Translator: Martin Ågren <martin.agren at gmail.com>\n"
 "Language-Team: Swedish <debian-l10n-swedish at lists.debian.org>\n"
@@ -22,37 +22,40 @@
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 #: ../dsf-helper/shellhost-variables.templates:2001
 msgid "Shell server:"
 msgstr "Skalserver:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:3001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:3001
 msgid ""
 "Please enter the hostname of the server that will host the @FORGENAME@ shell "
 "accounts."
 msgstr ""
-"Ange värdnamnet för servern som kommer tillhandahålla skalkonton för @FORGENAME at ."
+"Ange värdnamnet för servern som kommer tillhandahålla skalkonton för "
+"@FORGENAME at ."
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 msgid "Download server:"
 msgstr "Hämtningsserver:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 msgid ""
-"Please enter the hostname of the server that will host the @FORGENAME@ packages."
-msgstr "Ange värdnamnet för servern som kommer tillhandahålla @FORGENAME at -paketen."
+"Please enter the hostname of the server that will host the @FORGENAME@ "
+"packages."
+msgstr ""
+"Ange värdnamnet för servern som kommer tillhandahålla @FORGENAME at -paketen."
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:6001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:6001
 #: ../dsf-helper/downloadhost-variables.templates:2001
 #: ../dsf-helper/lists-variables.templates:2001
 #: ../dsf-helper/users-variables.templates:2001
@@ -61,7 +64,7 @@
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 msgid "@FORGENAME@ administrator login:"
 msgstr "@FORGENAME at -administratörens användarnamn:"
 
@@ -69,92 +72,93 @@
 #. Description
 #. Type: password
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:8001
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
 msgid ""
-"The @FORGENAME@ administrator account will have full privileges on the system. It "
-"will be used to approve the creation of new projects."
+"The @FORGENAME@ administrator account will have full privileges on the "
+"system. It will be used to approve the creation of new projects."
 msgstr ""
-"Administratörskontot för @FORGENAME@ kommer att ha alla rättigheter i @FORGENAME at -"
-"systemet. Det behövs för att godkänna skapandet av projekten."
+"Administratörskontot för @FORGENAME@ kommer att ha alla rättigheter i "
+"@FORGENAME at -systemet. Det behövs för att godkänna skapandet av projekten."
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:8001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 msgid "Please choose the username for this account."
 msgstr "Ange användarnamnet för detta konto."
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
 msgid "IP address:"
 msgstr "IP-adress:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
 msgid ""
 "Please enter the IP address of the server that will host the @FORGENAME@ "
 "installation."
 msgstr ""
-"Ange IP-adressen för servern som kommer tillhandahålla @FORGENAME at -installationen."
+"Ange IP-adressen för servern som kommer tillhandahålla @FORGENAME at -"
+"installationen."
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:9001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
 msgid "This is needed for the configuration of Apache virtual hosting."
 msgstr "Detta krävs för att konfigurera Apaches virtuella värd."
 
 #. Type: password
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
 msgid "@FORGENAME@ administrator password:"
 msgstr "@FORGENAME at -administratörens lösenord:"
 
 #. Type: password
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:10001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:10001
 msgid "Please choose the password for this account."
 msgstr "Mata in lösenordet för detta konto."
 
 #. Type: password
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:11001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:11001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Password confirmation:"
 msgstr "Lösenordsbekräftelse:"
 
 #. Type: password
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:11001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:11001
 #: ../dsf-helper/dbpasswd-variables.templates:3001
 msgid "Please re-type the password for confirmation."
 msgstr "Mata in lösenordet igen för bekräftelse."
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 msgid "Initial list of skills:"
 msgstr "Initiala listan över färdigheter:"
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 msgid ""
 "@FORGENAME@ allows users to define a list of their skills, to be chosen from "
 "those present in the database. This list is the initial list of skills that "
 "will enter the database."
 msgstr ""
-"@FORGENAME@ låter användarna definiera en lista över sina färdigheter, som kan "
-"väljas av de som finns i databasen.  Denna lista är den initiala listan som "
-"kommer att läggas in i databasen."
+"@FORGENAME@ låter användarna definiera en lista över sina färdigheter, som "
+"kan väljas av de som finns i databasen.  Denna lista är den initiala listan "
+"som kommer att läggas in i databasen."
 
 #. Type: string
 #. Description
-#: ../@PACKAGENAME at -db-postgresql.templates.dsfh-in:12001
+#: ../dsf-in/db-postgresql.templates.dsfh-in:12001
 msgid "Please enter a semicolon-separated list of skill names."
 msgstr "Mata in namn på färdigheter, separerade med semikolon."
 
@@ -162,7 +166,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGENAME at -dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
 msgid "Do you want a simple DNS setup for @FORGENAME@?"
 msgstr "Vill du ha en enkel DNS-konfiguration för @FORGENAME@?"
 
@@ -170,7 +174,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGENAME at -dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
 msgid ""
 "You can use a simple DNS setup with wildcards to map all project web-hosts "
 "to a single IP address, and direct all the scm-hosts to a single SCM server, "
@@ -187,7 +191,7 @@
 #. Description
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
-#: ../@PACKAGENAME at -dns-bind9.templates.dsfh-in:3001
+#: ../dsf-in/dns-bind9.templates.dsfh-in:3001
 msgid ""
 "Even if you use a simple DNS setup, you can still use separate machines as "
 "project servers; it just assumes that all the project web directories are on "
@@ -199,23 +203,23 @@
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGENAME at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 msgid "Do you want mail to ${noreply} to be discarded?"
 msgstr "Vill du att e-post till ${noreply} ska tas bort?"
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGENAME at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 msgid ""
-"@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}\" "
-"address."
+"@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}"
+"\" address."
 msgstr ""
 "@FORGENAME@ skickar och tar emot en mängd e-postmeddelanden till och från "
 "adressen \"${noreply}\"."
 
 #. Type: boolean
 #. Description
-#: ../@PACKAGENAME at -mta-postfix.templates.dsfh-in:3001
+#: ../dsf-in/mta-postfix.templates.dsfh-in:3001
 msgid ""
 "E-mail to that address should be directed to a black hole (/dev/null), "
 "unless you have another use for that address."
@@ -236,9 +240,9 @@
 "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."
+"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
@@ -250,8 +254,8 @@
 #. Description
 #: ../dsf-helper/common-variables.templates:3001
 msgid ""
-"Please enter the e-mail address of the @FORGENAME@ administrator of this site. It "
-"will be used when problems occur."
+"Please enter the e-mail address of the @FORGENAME@ administrator of this "
+"site. It will be used when problems occur."
 msgstr ""
 "Ange e-postadressen för @FORGENAME at -administratören på systemet. Den kommer "
 "användas ifall problem uppstår."
@@ -259,15 +263,17 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:4001
-msgid "@FORGENAME@/FusionForge system name:"
+#, 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."
+"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."
 
@@ -284,8 +290,8 @@
 "Please enter the IP address (or hostname) of the server that will host the "
 "@FORGENAME@ database."
 msgstr ""
-"IP-adressen (eller värdnamnet) för servern som kommer tillhandahålla @FORGENAME at -"
-"databasen."
+"IP-adressen (eller värdnamnet) för servern som kommer tillhandahålla "
+"@FORGENAME at -databasen."
 
 #. Type: string
 #. Description
@@ -297,8 +303,10 @@
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:3001
 msgid ""
-"Please enter the name of the database that will host the @FORGENAME@ database."
-msgstr "Ange namnet på databasen som kommer tillhandahålla @FORGENAME at -databasen."
+"Please enter the name of the database that will host the @FORGENAME@ "
+"database."
+msgstr ""
+"Ange namnet på databasen som kommer tillhandahålla @FORGENAME at -databasen."
 
 #. Type: string
 #. Description
@@ -338,8 +346,10 @@
 #. Description
 #: ../dsf-helper/downloadhost-variables.templates:2001
 msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ packages."
-msgstr "Ange värdnamnet för servern som kommer tillhandahålla @FORGENAME at -paketen."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"packages."
+msgstr ""
+"Ange värdnamnet för servern som kommer tillhandahålla @FORGENAME at -paketen."
 
 #. Type: string
 #. Description
@@ -351,13 +361,14 @@
 #. Description
 #: ../dsf-helper/groupid-variables.templates:2001
 msgid ""
-"The members of the news admin group can approve news for the @FORGENAME@ main "
-"page. This group's ID must not be 1. This should be changed only if you "
+"The members of the news admin group can approve news for the @FORGENAME@ "
+"main page. This group's ID must not be 1. This should be changed only if you "
 "upgrade from a previous version and want to keep the data."
 msgstr ""
-"Medlemmar i nyhetsadministrationsgruppen kan godkänna nyheter för @FORGENAME at s "
-"förstasida.  Detta grupp-id får inte vara 1. Du behöver bara ändra detta "
-"värde om du uppgraderar från en tidigare version och vill behålla ditt data."
+"Medlemmar i nyhetsadministrationsgruppen kan godkänna nyheter för "
+"@FORGENAME at s förstasida.  Detta grupp-id får inte vara 1. Du behöver bara "
+"ändra detta värde om du uppgraderar från en tidigare version och vill "
+"behålla ditt data."
 
 #. Type: string
 #. Description
@@ -381,8 +392,8 @@
 #. Description
 #: ../dsf-helper/lists-variables.templates:2001
 msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ mailing "
-"lists."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"mailing lists."
 msgstr ""
 "Ange värdnamnet för servern som kommer tillhandahålla sändlistorna för "
 "@FORGENAME at ."
@@ -391,10 +402,11 @@
 #. Description
 #: ../dsf-helper/shellhost-variables.templates:2001
 msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ shell "
-"accounts."
+"Please enter the host name of the server that will host the @FORGENAME@ "
+"shell accounts."
 msgstr ""
-"Ange värdnamnet för servern som kommer tillhandahålla skalkonton för @FORGENAME at ."
+"Ange värdnamnet för servern som kommer tillhandahålla skalkonton för "
+"@FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -406,8 +418,8 @@
 #. Description
 #: ../dsf-helper/users-variables.templates:2001
 msgid ""
-"Please enter the host name of the server that will host the @FORGENAME@ user mail "
-"redirector."
+"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 ."

Modified: trunk/src/debian/dsf-po/vi.po
===================================================================
--- trunk/src/debian/dsf-po/vi.po	2010-06-30 16:50:16 UTC (rev 10161)
+++ trunk/src/debian/dsf-po/vi.po	2010-06-30 16:50:26 UTC (rev 10162)
@@ -6,15 +6,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: @PACKAGE@ 4.6.99+svn6387-1\n"
-"Report-Msgid-Bugs-To: @PACKAGENAME@@packages.debian.org\n"
+"Report-Msgid-Bugs-To: gforge at packages.debian.org\n"
 "POT-Creation-Date: 2009-06-12 23:23+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"
-"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 1.2.1\n"
 
@@ -28,15 +28,11 @@
 #. Type: string
 #. Description
 #: ../dsf-in/db-postgresql.templates.dsfh-in:3001
-#| msgid ""
-#| "Please enter the hostname of the server that will host the @FORGENAME@ shell "
-#| "accounts."
 msgid ""
 "Please enter the hostname of the server that will host the @FORGENAME@ shell "
 "accounts."
 msgstr ""
-"Hãy gõ tên máy của máy phục vụ sẽ hỗ trợ các tài khoản trình bao "
-"@FORGENAME at ."
+"Hãy gõ tên máy của máy phục vụ sẽ hỗ trợ các tài khoản trình bao @FORGENAME at ."
 
 #. Type: string
 #. Description
@@ -48,9 +44,6 @@
 #. Type: string
 #. Description
 #: ../dsf-in/db-postgresql.templates.dsfh-in:6001
-#| msgid ""
-#| "Please enter the hostname of the server that will host the @FORGENAME@ "
-#| "packages."
 msgid ""
 "Please enter the hostname of the server that will host the @FORGENAME@ "
 "packages."
@@ -62,14 +55,12 @@
 #: ../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."
 msgid "It should not be the same as the main @FORGENAME@ host."
 msgstr "Không nên trùng với máy chủ @FORGENAME@ chính."
 
 #. Type: string
 #. Description
 #: ../dsf-in/db-postgresql.templates.dsfh-in:8001
-#| msgid "@FORGENAME@ administrator login:"
 msgid "@FORGENAME@ administrator login:"
 msgstr "Tên đăng nhập quản trị @FORGENAME@:"
 
@@ -79,9 +70,6 @@
 #. Description
 #: ../dsf-in/db-postgresql.templates.dsfh-in:8001
 #: ../dsf-in/db-postgresql.templates.dsfh-in:10001
-#| msgid ""
-#| "The @FORGENAME@ administrator account will have full privileges on the system. "
-#| "It will be used to approve the creation of new projects."
 msgid ""
 "The @FORGENAME@ administrator account will have full privileges on the "
 "system. It will be used to approve the creation of new projects."
@@ -106,9 +94,6 @@
 #. Description
 #: ../dsf-in/db-postgresql.templates.dsfh-in:9001
 #: ../dsf-helper/host-variables.templates:2001
-#| msgid ""
-#| "Please enter the IP address of the server that will host the @FORGENAME@ "
-#| "installation."
 msgid ""
 "Please enter the IP address of the server that will host the @FORGENAME@ "
 "installation."
@@ -124,7 +109,6 @@
 #. Type: password
 #. Description
 #: ../dsf-in/db-postgresql.templates.dsfh-in:10001
-#| msgid "@FORGENAME@ administrator password:"
 msgid "@FORGENAME@ administrator password:"
 msgstr "Mật khẩu quản trị @FORGENAME@:"
 
@@ -157,10 +141,6 @@
 #. Type: string
 #. Description
 #: ../dsf-in/db-postgresql.templates.dsfh-in:12001
-#| msgid ""
-#| "@FORGENAME@ allows users to define a list of their skills, to be chosen from "
-#| "those present in the database. This list is the initial list of skills "
-#| "that will enter the database."
 msgid ""
 "@FORGENAME@ allows users to define a list of their skills, to be chosen from "
 "those present in the database. This list is the initial list of skills that "
@@ -181,7 +161,6 @@
 #. Translators: SCM here means "Source Control Management"
 #. (cvs, svn, etc.)
 #: ../dsf-in/dns-bind9.templates.dsfh-in:3001
-#| msgid "Do you want a simple DNS setup for @FORGENAME@?"
 msgid "Do you want a simple DNS setup for @FORGENAME@?"
 msgstr "Bạn có muốn tạo một thiết lập DNS đơn giản cho @FORGENAME@ không?"
 
@@ -225,9 +204,6 @@
 #. 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."
 msgid ""
 "@FORGENAME@ sends and receives plenty of e-mail to and from the \"${noreply}"
 "\" address."
@@ -247,37 +223,28 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:2001
-#| msgid "@FORGENAME@ domain or subdomain name:"
 msgid "@FORGENAME@ domain or subdomain name:"
 msgstr "Tên miền hay miền con @FORGENAME@:"
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:2001
-#| 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 ""
-"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 đó."
+"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:"
 msgid "@FORGENAME@ administrator e-mail address:"
 msgstr "Địa chỉ thư của quản trị @FORGENAME@:"
 
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:3001
-#| msgid ""
-#| "Please enter the e-mail address of the @FORGENAME@ administrator of this site. "
-#| "It will be used when problems occur."
 msgid ""
 "Please enter the e-mail address of the @FORGENAME@ administrator of this "
 "site. It will be used when problems occur."
@@ -288,16 +255,12 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/common-variables.templates:4001
-#| msgid "@FORGENAME@ system name:"
 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."
 msgid ""
 "Please enter the name of the @FORGENAME@ system. It is used in various "
 "places throughout the system."
@@ -314,9 +277,6 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:2001
-#| msgid ""
-#| "Please enter the IP address (or hostname) of the server that will host "
-#| "the @FORGENAME@ database."
 msgid ""
 "Please enter the IP address (or hostname) of the server that will host the "
 "@FORGENAME@ database."
@@ -333,8 +293,6 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:3001
-#| msgid ""
-#| "Please enter the name of the database that will host the @FORGENAME@ database."
 msgid ""
 "Please enter the name of the database that will host the @FORGENAME@ "
 "database."
@@ -349,9 +307,6 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/dbhost-variables.templates:4001
-#| msgid ""
-#| "Please enter the username of the database administrator for the server "
-#| "that will host the @FORGENAME@ database."
 msgid ""
 "Please enter the username of the database administrator for the server that "
 "will host the @FORGENAME@ database."
@@ -380,9 +335,6 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/downloadhost-variables.templates:2001
-#| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ "
-#| "packages."
 msgid ""
 "Please enter the host name of the server that will host the @FORGENAME@ "
 "packages."
@@ -397,10 +349,6 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/groupid-variables.templates:2001
-#| msgid ""
-#| "The members of the news admin group can approve news for the @FORGENAME@ main "
-#| "page. This group's ID must not be 1. This should be changed only if you "
-#| "upgrade from a previous version and want to keep the data."
 msgid ""
 "The members of the news admin group can approve news for the @FORGENAME@ "
 "main page. This group's ID must not be 1. This should be changed only if you "
@@ -432,9 +380,6 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/lists-variables.templates:2001
-#| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ "
-#| "mailing lists."
 msgid ""
 "Please enter the host name of the server that will host the @FORGENAME@ "
 "mailing lists."
@@ -443,9 +388,6 @@
 #. Type: string
 #. Description
 #: ../dsf-helper/shellhost-variables.templates:2001
-#| msgid ""
-#| "Please enter the host name of the server that will host the @FORGENAME@ shell "
-#| "accounts."
 msgid ""
 "Please enter the host name of the server that will host the @FORGENAME@ "
 "shell accounts."
@@ -461,9 +403,6 @@
 #. 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."
 msgid ""
 "Please enter the host name of the server that will host the @FORGENAME@ user "
 "mail redirector."




More information about the Fusionforge-commits mailing list