[Pkg-mailman-hackers] Pkg-mailman commit - rev 353 - in trunk/debian: . po

Lionel Elie Mamane lmamane at costa.debian.org
Sun Sep 17 11:53:03 UTC 2006


Author: lmamane
Date: 2006-09-17 11:53:02 +0000 (Sun, 17 Sep 2006)
New Revision: 353

Modified:
   trunk/debian/changelog
   trunk/debian/mailman.examples
   trunk/debian/po/ca.po
   trunk/debian/po/cs.po
   trunk/debian/po/de.po
   trunk/debian/po/es.po
   trunk/debian/po/fr.po
   trunk/debian/po/hu.po
   trunk/debian/po/it.po
   trunk/debian/po/ja.po
   trunk/debian/po/nl.po
   trunk/debian/po/pt_BR.po
   trunk/debian/po/ru.po
   trunk/debian/po/sv.po
   trunk/debian/po/templates.pot
   trunk/debian/po/vi.po
   trunk/debian/rules
Log:
Reverse commit 351: apache.conf not deemed an example, but default configuration.
Correct wording in changelog accordingly.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-09-17 10:33:02 UTC (rev 352)
+++ trunk/debian/changelog	2006-09-17 11:53:02 UTC (rev 353)
@@ -21,14 +21,13 @@
   * Use Mailman's fork of the Python email package instead of the one from
     Python; Mailman is incompatible with the one in Python 2.4
     (closes: #384016)
-  * Install example apache.conf in /usr/share/doc/${PKG}/examples/ .
 
- -- Lionel Elie Mamane <lmamane at debian.org>  Sun, 17 Sep 2006 12:19:59 +0200
+ --
 
 mailman (1:2.1.8-2) unstable; urgency=low
 
   [ Thijs Kinkhorst ]
-  * Add example apache.conf under /etc/mailman
+  * Add default apache.conf under /etc/mailman
     (Closes: #282460, #135148, #178543, #179253).
   * Update all man pages to be in line with current mailman functionality
     (Closes: #286607, #276952).

Modified: trunk/debian/mailman.examples
===================================================================
--- trunk/debian/mailman.examples	2006-09-17 10:33:02 UTC (rev 352)
+++ trunk/debian/mailman.examples	2006-09-17 11:53:02 UTC (rev 353)
@@ -1 +0,0 @@
-debian/contrib/apache.conf

Modified: trunk/debian/po/ca.po
===================================================================
--- trunk/debian/po/ca.po	2006-09-17 10:33:02 UTC (rev 352)
+++ trunk/debian/po/ca.po	2006-09-17 11:53:02 UTC (rev 353)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: mailman_2.1.2-7_templates\n"
 "Report-Msgid-Bugs-To: pkg-mailman-hackers at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-09-17 12:28+0200\n"
+"POT-Creation-Date: 2006-08-22 02:17+0200\n"
 "PO-Revision-Date: 2004-01-31 17:56GMT\n"
 "Last-Translator: Aleix Badia i Bosch <abadia at ica.es>\n"
 "Language-Team: Debian L10n Catalan <debian-l10n-catalan at lists.debian.org>\n"
@@ -214,7 +214,7 @@
 "For each supported language, Mailman stores default language specific texts "
 "in /etc/mailman/LANG/ giving them conffile like treatment with the help of "
 "ucf.  This means approximately 150kB for each supported language on the root "
-"file system."
+"FS."
 msgstr ""
 
 #. Type: multiselect
@@ -245,8 +245,8 @@
 #: ../templates:3001
 #, fuzzy
 msgid ""
-"Mailman allows to gate news to mail, that is, send all the messages which "
-"appear in a Usenet newsgroup to a mailing list."
+"Do you want to gate news to mail, that is, send all the messages which "
+"appear in a newsgroup to a mailing list?"
 msgstr ""
 "Voleu que s'enviïn les notícies al correu, és a dir, que s'enviïn tots els "
 "missatges d'un grup de discussió a una llista de correu."
@@ -312,8 +312,12 @@
 #: ../templates:6001
 msgid ""
 "The directory /var/lib/mailman/qfiles contains files. It needs to be empty "
-"for the upgrade to work properly. You can try to handle them by:\n"
-" - Stop new messages from coming in (at the MTA level).\n"
+"for the upgrade to work properly. If these files contain unprocessed "
+"messages that are otherwise fine, then you can try to handle them by:\n"
+" - Stopping new messages from coming in the queue (at the MTA level:\n"
+"   queue them in the MTA's queue or refuse them with a 4xx code). If\n"
+"   your site has a relatively low mailman traffic, you can skip this\n"
+"   step.\n"
 " - Start a mailman queue runner: /etc/init.d/mailman start\n"
 " - Let it run until all messages are handled.\n"
 "   If they don't all get handled in a timely manner, look at the logs\n"
@@ -322,7 +326,7 @@
 " - Retry the upgrade.\n"
 " - Let messages come in again.\n"
 "You can also decide to simply remove the files, which will make Mailman "
-"forget about (and lose) the corresponding emails."
+"forget about (and lose) the corresponding emails; expect angry users."
 msgstr ""
 
 #. Type: note
@@ -332,6 +336,8 @@
 "If these files correspond to shunted messages, you have to either delete "
 "them or unshunt them (with /var/lib/mailman/bin/unshunt). Shunted messages "
 "are messages on which Mailman has already abandoned any further processing "
-"because of an error condition, but that are kept for admin review. You can "
-"use /var/lib/mailman/bin/show_qfiles to examine the contents of the queues."
+"because of an error condition, but that are kept for admin review, as they "
+"usually originate from Mailman bugs or other abnormal situations that need "
+"human inspection. You can use /var/lib/mailman/bin/show_qfiles to examine "
+"the contents of the queues."
 msgstr ""

Modified: trunk/debian/po/cs.po
===================================================================
--- trunk/debian/po/cs.po	2006-09-17 10:33:02 UTC (rev 352)
+++ trunk/debian/po/cs.po	2006-09-17 11:53:02 UTC (rev 353)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: mailman\n"
 "Report-Msgid-Bugs-To: pkg-mailman-hackers at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-09-17 12:28+0200\n"
+"POT-Creation-Date: 2006-08-22 02:17+0200\n"
 "PO-Revision-Date: 2004-12-31 12:42+0100\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <provoz at debian.cz>\n"
@@ -224,7 +224,7 @@
 "For each supported language, Mailman stores default language specific texts "
 "in /etc/mailman/LANG/ giving them conffile like treatment with the help of "
 "ucf.  This means approximately 150kB for each supported language on the root "
-"file system."
+"FS."
 msgstr ""
 "Pro ka¾dý podporovaný jazyk uchovává Mailman texty v /etc/mailman/JAZYK/, "
 "co¾ znamená zhruba 150kB zabraného místa na koøenovém souborovém systému pro "
@@ -264,8 +264,8 @@
 #: ../templates:3001
 #, fuzzy
 msgid ""
-"Mailman allows to gate news to mail, that is, send all the messages which "
-"appear in a Usenet newsgroup to a mailing list."
+"Do you want to gate news to mail, that is, send all the messages which "
+"appear in a newsgroup to a mailing list?"
 msgstr ""
 "Pøejete-li si posítat v¹echny pøíspìvky, které se objeví v newsové skupinì "
 "do po¹tovní konference."
@@ -332,8 +332,12 @@
 #: ../templates:6001
 msgid ""
 "The directory /var/lib/mailman/qfiles contains files. It needs to be empty "
-"for the upgrade to work properly. You can try to handle them by:\n"
-" - Stop new messages from coming in (at the MTA level).\n"
+"for the upgrade to work properly. If these files contain unprocessed "
+"messages that are otherwise fine, then you can try to handle them by:\n"
+" - Stopping new messages from coming in the queue (at the MTA level:\n"
+"   queue them in the MTA's queue or refuse them with a 4xx code). If\n"
+"   your site has a relatively low mailman traffic, you can skip this\n"
+"   step.\n"
 " - Start a mailman queue runner: /etc/init.d/mailman start\n"
 " - Let it run until all messages are handled.\n"
 "   If they don't all get handled in a timely manner, look at the logs\n"
@@ -342,7 +346,7 @@
 " - Retry the upgrade.\n"
 " - Let messages come in again.\n"
 "You can also decide to simply remove the files, which will make Mailman "
-"forget about (and lose) the corresponding emails."
+"forget about (and lose) the corresponding emails; expect angry users."
 msgstr ""
 
 #. Type: note
@@ -352,8 +356,10 @@
 "If these files correspond to shunted messages, you have to either delete "
 "them or unshunt them (with /var/lib/mailman/bin/unshunt). Shunted messages "
 "are messages on which Mailman has already abandoned any further processing "
-"because of an error condition, but that are kept for admin review. You can "
-"use /var/lib/mailman/bin/show_qfiles to examine the contents of the queues."
+"because of an error condition, but that are kept for admin review, as they "
+"usually originate from Mailman bugs or other abnormal situations that need "
+"human inspection. You can use /var/lib/mailman/bin/show_qfiles to examine "
+"the contents of the queues."
 msgstr ""
 
 #~ msgid "Which language should be the default for Mailman?"

Modified: trunk/debian/po/de.po
===================================================================
--- trunk/debian/po/de.po	2006-09-17 10:33:02 UTC (rev 352)
+++ trunk/debian/po/de.po	2006-09-17 11:53:02 UTC (rev 353)
@@ -17,7 +17,7 @@
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: pkg-mailman-hackers at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-09-17 12:28+0200\n"
+"POT-Creation-Date: 2006-08-22 02:17+0200\n"
 "PO-Revision-Date: 2006-02-21 11:48+0100\n"
 "Last-Translator: Jens Nachtigall <nachtigall at web.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -228,7 +228,7 @@
 "For each supported language, Mailman stores default language specific texts "
 "in /etc/mailman/LANG/ giving them conffile like treatment with the help of "
 "ucf.  This means approximately 150kB for each supported language on the root "
-"file system."
+"FS."
 msgstr ""
 "Für jede unterstützte Sprache speichert Debian-Mailman sprachspezifische "
 "Standardtexte in /etc/mailmain/LANG/, wobei jedem Text mit Hilfe von ucf das "
@@ -269,8 +269,8 @@
 #: ../templates:3001
 #, fuzzy
 msgid ""
-"Mailman allows to gate news to mail, that is, send all the messages which "
-"appear in a Usenet newsgroup to a mailing list."
+"Do you want to gate news to mail, that is, send all the messages which "
+"appear in a newsgroup to a mailing list?"
 msgstr ""
 "Wollen Sie Newsgroup-Nachrichten an Mailinglisten weiterleiten, das heißt "
 "alle Nachrichten, die in einer Newsgroup erscheinen, zu einer Mailingliste "
@@ -340,8 +340,12 @@
 #, fuzzy
 msgid ""
 "The directory /var/lib/mailman/qfiles contains files. It needs to be empty "
-"for the upgrade to work properly. You can try to handle them by:\n"
-" - Stop new messages from coming in (at the MTA level).\n"
+"for the upgrade to work properly. If these files contain unprocessed "
+"messages that are otherwise fine, then you can try to handle them by:\n"
+" - Stopping new messages from coming in the queue (at the MTA level:\n"
+"   queue them in the MTA's queue or refuse them with a 4xx code). If\n"
+"   your site has a relatively low mailman traffic, you can skip this\n"
+"   step.\n"
 " - Start a mailman queue runner: /etc/init.d/mailman start\n"
 " - Let it run until all messages are handled.\n"
 "   If they don't all get handled in a timely manner, look at the logs\n"
@@ -350,7 +354,7 @@
 " - Retry the upgrade.\n"
 " - Let messages come in again.\n"
 "You can also decide to simply remove the files, which will make Mailman "
-"forget about (and lose) the corresponding emails."
+"forget about (and lose) the corresponding emails; expect angry users."
 msgstr ""
 "Das Verzeichnis /var/lib/mailman/qfiles enthält Dateien. Damit das Upgrade "
 "sauber funktioniert, sollte es leer sein. Wenn diese Dateien noch nicht "
@@ -381,8 +385,10 @@
 "If these files correspond to shunted messages, you have to either delete "
 "them or unshunt them (with /var/lib/mailman/bin/unshunt). Shunted messages "
 "are messages on which Mailman has already abandoned any further processing "
-"because of an error condition, but that are kept for admin review. You can "
-"use /var/lib/mailman/bin/show_qfiles to examine the contents of the queues."
+"because of an error condition, but that are kept for admin review, as they "
+"usually originate from Mailman bugs or other abnormal situations that need "
+"human inspection. You can use /var/lib/mailman/bin/show_qfiles to examine "
+"the contents of the queues."
 msgstr ""
 "Falls diese Dateien zu »zwischengeparkten« Nachrichten gehören, dann müssen "
 "Sie die Dateien entweder löschen oder das Problem, weshalb sie "

Modified: trunk/debian/po/es.po
===================================================================
--- trunk/debian/po/es.po	2006-09-17 10:33:02 UTC (rev 352)
+++ trunk/debian/po/es.po	2006-09-17 11:53:02 UTC (rev 353)
@@ -23,7 +23,7 @@
 msgstr ""
 "Project-Id-Version: maiman 2.1.4-3\n"
 "Report-Msgid-Bugs-To: pkg-mailman-hackers at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-09-17 12:28+0200\n"
+"POT-Creation-Date: 2006-08-22 02:17+0200\n"
 "PO-Revision-Date: 2004-04-09 22:10+0200\n"
 "Last-Translator: Carlos Valdivia Yagüe <valyag at dat.etsit.upm.es>\n"
 "Language-Team: Debian L10n Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -230,7 +230,7 @@
 "For each supported language, Mailman stores default language specific texts "
 "in /etc/mailman/LANG/ giving them conffile like treatment with the help of "
 "ucf.  This means approximately 150kB for each supported language on the root "
-"file system."
+"FS."
 msgstr ""
 
 #. Type: multiselect
@@ -261,8 +261,8 @@
 #: ../templates:3001
 #, fuzzy
 msgid ""
-"Mailman allows to gate news to mail, that is, send all the messages which "
-"appear in a Usenet newsgroup to a mailing list."
+"Do you want to gate news to mail, that is, send all the messages which "
+"appear in a newsgroup to a mailing list?"
 msgstr ""
 "¿Quiere conectar las noticias con el correo? Consiste en enviar todos los "
 "mensajes que aparecen en un grupo de noticias a una lista de correo."
@@ -328,8 +328,12 @@
 #: ../templates:6001
 msgid ""
 "The directory /var/lib/mailman/qfiles contains files. It needs to be empty "
-"for the upgrade to work properly. You can try to handle them by:\n"
-" - Stop new messages from coming in (at the MTA level).\n"
+"for the upgrade to work properly. If these files contain unprocessed "
+"messages that are otherwise fine, then you can try to handle them by:\n"
+" - Stopping new messages from coming in the queue (at the MTA level:\n"
+"   queue them in the MTA's queue or refuse them with a 4xx code). If\n"
+"   your site has a relatively low mailman traffic, you can skip this\n"
+"   step.\n"
 " - Start a mailman queue runner: /etc/init.d/mailman start\n"
 " - Let it run until all messages are handled.\n"
 "   If they don't all get handled in a timely manner, look at the logs\n"
@@ -338,7 +342,7 @@
 " - Retry the upgrade.\n"
 " - Let messages come in again.\n"
 "You can also decide to simply remove the files, which will make Mailman "
-"forget about (and lose) the corresponding emails."
+"forget about (and lose) the corresponding emails; expect angry users."
 msgstr ""
 
 #. Type: note
@@ -348,6 +352,8 @@
 "If these files correspond to shunted messages, you have to either delete "
 "them or unshunt them (with /var/lib/mailman/bin/unshunt). Shunted messages "
 "are messages on which Mailman has already abandoned any further processing "
-"because of an error condition, but that are kept for admin review. You can "
-"use /var/lib/mailman/bin/show_qfiles to examine the contents of the queues."
+"because of an error condition, but that are kept for admin review, as they "
+"usually originate from Mailman bugs or other abnormal situations that need "
+"human inspection. You can use /var/lib/mailman/bin/show_qfiles to examine "
+"the contents of the queues."
 msgstr ""

Modified: trunk/debian/po/fr.po
===================================================================
--- trunk/debian/po/fr.po	2006-09-17 10:33:02 UTC (rev 352)
+++ trunk/debian/po/fr.po	2006-09-17 11:53:02 UTC (rev 353)
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: mailman\n"
 "Report-Msgid-Bugs-To: pkg-mailman-hackers at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-09-17 12:28+0200\n"
+"POT-Creation-Date: 2006-08-22 02:17+0200\n"
 "PO-Revision-Date: 2006-03-07 09:21+0100\n"
 "Last-Translator: Philippe Batailler <philippe.batailler at free.fr>\n"
 "Language-Team: french <debian-l10n-french at lists.debian.org>\n"
@@ -223,7 +223,7 @@
 "For each supported language, Mailman stores default language specific texts "
 "in /etc/mailman/LANG/ giving them conffile like treatment with the help of "
 "ucf.  This means approximately 150kB for each supported language on the root "
-"file system."
+"FS."
 msgstr ""
 "Mailman garde les textes de chaque langue reconnue dans /etc/mailman/LANG/. "
 "Ces fichiers sont alors gérés comme des fichiers de configuration grâce "
@@ -263,8 +263,8 @@
 #: ../templates:3001
 #, fuzzy
 msgid ""
-"Mailman allows to gate news to mail, that is, send all the messages which "
-"appear in a Usenet newsgroup to a mailing list."
+"Do you want to gate news to mail, that is, send all the messages which "
+"appear in a newsgroup to a mailing list?"
 msgstr ""
 "Il est possible de transformer des nouvelles en courriers, c'est-à-dire "
 "envoyer tous les messages qui apparaissent dans un forum vers une liste de "
@@ -331,11 +331,14 @@
 #. Type: note
 #. Description
 #: ../templates:6001
-#, fuzzy
 msgid ""
 "The directory /var/lib/mailman/qfiles contains files. It needs to be empty "
-"for the upgrade to work properly. You can try to handle them by:\n"
-" - Stop new messages from coming in (at the MTA level).\n"
+"for the upgrade to work properly. If these files contain unprocessed "
+"messages that are otherwise fine, then you can try to handle them by:\n"
+" - Stopping new messages from coming in the queue (at the MTA level:\n"
+"   queue them in the MTA's queue or refuse them with a 4xx code). If\n"
+"   your site has a relatively low mailman traffic, you can skip this\n"
+"   step.\n"
 " - Start a mailman queue runner: /etc/init.d/mailman start\n"
 " - Let it run until all messages are handled.\n"
 "   If they don't all get handled in a timely manner, look at the logs\n"
@@ -344,7 +347,7 @@
 " - Retry the upgrade.\n"
 " - Let messages come in again.\n"
 "You can also decide to simply remove the files, which will make Mailman "
-"forget about (and lose) the corresponding emails."
+"forget about (and lose) the corresponding emails; expect angry users."
 msgstr ""
 "Le répertoire /var/lib/mailman/qfiles contient des fichiers. Il doit être "
 "vide pour que la mise à jour se passe correctement. Si ces fichiers sont "
@@ -369,13 +372,14 @@
 #. Type: note
 #. Description
 #: ../templates:6001
-#, fuzzy
 msgid ""
 "If these files correspond to shunted messages, you have to either delete "
 "them or unshunt them (with /var/lib/mailman/bin/unshunt). Shunted messages "
 "are messages on which Mailman has already abandoned any further processing "
-"because of an error condition, but that are kept for admin review. You can "
-"use /var/lib/mailman/bin/show_qfiles to examine the contents of the queues."
+"because of an error condition, but that are kept for admin review, as they "
+"usually originate from Mailman bugs or other abnormal situations that need "
+"human inspection. You can use /var/lib/mailman/bin/show_qfiles to examine "
+"the contents of the queues."
 msgstr ""
 "Si ces fichiers correspondent à des messages mis de côté, vous devez les "
 "détruire ou bien les traiter à nouveau (avec /var/lib/mailman/bin/"

Modified: trunk/debian/po/hu.po
===================================================================
--- trunk/debian/po/hu.po	2006-09-17 10:33:02 UTC (rev 352)
+++ trunk/debian/po/hu.po	2006-09-17 11:53:02 UTC (rev 353)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: mailman 2.1.4-1\n"
 "Report-Msgid-Bugs-To: pkg-mailman-hackers at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-09-17 12:28+0200\n"
+"POT-Creation-Date: 2006-08-22 02:17+0200\n"
 "PO-Revision-Date: 2004-02-20 20:06+0100\n"
 "Last-Translator: László 'GCS' Böszörményi <gcs at lsc.hu>\n"
 "Language-Team: \n"
@@ -222,7 +222,7 @@
 "For each supported language, Mailman stores default language specific texts "
 "in /etc/mailman/LANG/ giving them conffile like treatment with the help of "
 "ucf.  This means approximately 150kB for each supported language on the root "
-"file system."
+"FS."
 msgstr ""
 
 #. Type: multiselect
@@ -252,8 +252,8 @@
 #. Description
 #: ../templates:3001
 msgid ""
-"Mailman allows to gate news to mail, that is, send all the messages which "
-"appear in a Usenet newsgroup to a mailing list."
+"Do you want to gate news to mail, that is, send all the messages which "
+"appear in a newsgroup to a mailing list?"
 msgstr ""
 
 #. Type: boolean
@@ -323,8 +323,12 @@
 #: ../templates:6001
 msgid ""
 "The directory /var/lib/mailman/qfiles contains files. It needs to be empty "
-"for the upgrade to work properly. You can try to handle them by:\n"
-" - Stop new messages from coming in (at the MTA level).\n"
+"for the upgrade to work properly. If these files contain unprocessed "
+"messages that are otherwise fine, then you can try to handle them by:\n"
+" - Stopping new messages from coming in the queue (at the MTA level:\n"
+"   queue them in the MTA's queue or refuse them with a 4xx code). If\n"
+"   your site has a relatively low mailman traffic, you can skip this\n"
+"   step.\n"
 " - Start a mailman queue runner: /etc/init.d/mailman start\n"
 " - Let it run until all messages are handled.\n"
 "   If they don't all get handled in a timely manner, look at the logs\n"
@@ -333,7 +337,7 @@
 " - Retry the upgrade.\n"
 " - Let messages come in again.\n"
 "You can also decide to simply remove the files, which will make Mailman "
-"forget about (and lose) the corresponding emails."
+"forget about (and lose) the corresponding emails; expect angry users."
 msgstr ""
 
 #. Type: note
@@ -343,6 +347,8 @@
 "If these files correspond to shunted messages, you have to either delete "
 "them or unshunt them (with /var/lib/mailman/bin/unshunt). Shunted messages "
 "are messages on which Mailman has already abandoned any further processing "
-"because of an error condition, but that are kept for admin review. You can "
-"use /var/lib/mailman/bin/show_qfiles to examine the contents of the queues."
+"because of an error condition, but that are kept for admin review, as they "
+"usually originate from Mailman bugs or other abnormal situations that need "
+"human inspection. You can use /var/lib/mailman/bin/show_qfiles to examine "
+"the contents of the queues."
 msgstr ""

Modified: trunk/debian/po/it.po
===================================================================
--- trunk/debian/po/it.po	2006-09-17 10:33:02 UTC (rev 352)
+++ trunk/debian/po/it.po	2006-09-17 11:53:02 UTC (rev 353)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: mailman debconf templates\n"
 "Report-Msgid-Bugs-To: pkg-mailman-hackers at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-09-17 12:28+0200\n"
+"POT-Creation-Date: 2006-08-22 02:17+0200\n"
 "PO-Revision-Date: 2006-02-12 14:39+0100\n"
 "Last-Translator: Luca Monducci <luca.mo at tiscali.it>\n"
 "Language-Team: Italian <debian-l10n-italian at lists.debian.org>\n"
@@ -216,7 +216,7 @@
 "For each supported language, Mailman stores default language specific texts "
 "in /etc/mailman/LANG/ giving them conffile like treatment with the help of "
 "ucf.  This means approximately 150kB for each supported language on the root "
-"file system."
+"FS."
 msgstr ""
 "Per ciascuna lingua supportata Debian Mailman memorizza i messaggi "
 "predefiniti in /etc/mailman/LANG/ trattandoli, con l'aiuto di ucf, come "
@@ -257,8 +257,8 @@
 #: ../templates:3001
 #, fuzzy
 msgid ""
-"Mailman allows to gate news to mail, that is, send all the messages which "
-"appear in a Usenet newsgroup to a mailing list."
+"Do you want to gate news to mail, that is, send all the messages which "
+"appear in a newsgroup to a mailing list?"
 msgstr ""
 "Si vuole trasformare news in email, cioè inviare tutti i messaggi che "
 "appaiono in un newsgroup a una lista di messaggi."
@@ -327,8 +327,12 @@
 #, fuzzy
 msgid ""
 "The directory /var/lib/mailman/qfiles contains files. It needs to be empty "
-"for the upgrade to work properly. You can try to handle them by:\n"
-" - Stop new messages from coming in (at the MTA level).\n"
+"for the upgrade to work properly. If these files contain unprocessed "
+"messages that are otherwise fine, then you can try to handle them by:\n"
+" - Stopping new messages from coming in the queue (at the MTA level:\n"
+"   queue them in the MTA's queue or refuse them with a 4xx code). If\n"
+"   your site has a relatively low mailman traffic, you can skip this\n"
+"   step.\n"
 " - Start a mailman queue runner: /etc/init.d/mailman start\n"
 " - Let it run until all messages are handled.\n"
 "   If they don't all get handled in a timely manner, look at the logs\n"
@@ -337,7 +341,7 @@
 " - Retry the upgrade.\n"
 " - Let messages come in again.\n"
 "You can also decide to simply remove the files, which will make Mailman "
-"forget about (and lose) the corresponding emails."
+"forget about (and lose) the corresponding emails; expect angry users."
 msgstr ""
 "La directory /var/lib/mailman/qfiles contiene dei file, deve essere vuota "
 "altrimenti l'aggiornamento potrebbe non funzionare correttamente. Se questi "
@@ -364,8 +368,10 @@
 "If these files correspond to shunted messages, you have to either delete "
 "them or unshunt them (with /var/lib/mailman/bin/unshunt). Shunted messages "
 "are messages on which Mailman has already abandoned any further processing "
-"because of an error condition, but that are kept for admin review. You can "
-"use /var/lib/mailman/bin/show_qfiles to examine the contents of the queues."
+"because of an error condition, but that are kept for admin review, as they "
+"usually originate from Mailman bugs or other abnormal situations that need "
+"human inspection. You can use /var/lib/mailman/bin/show_qfiles to examine "
+"the contents of the queues."
 msgstr ""
 "Se i file corrispondono a messaggi sospesi è possibile rimuoverli oppure "
 "revocarne la sospensione. I messaggi sospesi sono messaggi la cui "

Modified: trunk/debian/po/ja.po
===================================================================
--- trunk/debian/po/ja.po	2006-09-17 10:33:02 UTC (rev 352)
+++ trunk/debian/po/ja.po	2006-09-17 11:53:02 UTC (rev 353)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: mailman\n"
 "Report-Msgid-Bugs-To: pkg-mailman-hackers at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-09-17 12:28+0200\n"
+"POT-Creation-Date: 2006-08-22 02:17+0200\n"
 "PO-Revision-Date: 2006-02-07 18:12+0900\n"
 "Last-Translator: Kenshi Muto <kmuto at debian.org>\n"
 "Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -224,7 +224,7 @@
 "For each supported language, Mailman stores default language specific texts "
 "in /etc/mailman/LANG/ giving them conffile like treatment with the help of "
 "ucf.  This means approximately 150kB for each supported language on the root "
-"file system."
+"FS."
 msgstr ""
 "サポートされている各言語のために、Debian Mailman はデフォルト言語固有のテキス"
 "トを /etc/mailman/言語/ に保有しています。このテキストは、ucf のヘルプなどに"
@@ -265,8 +265,8 @@
 #: ../templates:3001
 #, fuzzy
 msgid ""
-"Mailman allows to gate news to mail, that is, send all the messages which "
-"appear in a Usenet newsgroup to a mailing list."
+"Do you want to gate news to mail, that is, send all the messages which "
+"appear in a newsgroup to a mailing list?"
 msgstr ""
 "ニュースからメールにゲートしますか (つまり、ニュースグループに投稿されたすべ"
 "てのメッセージをメーリングリストに送ります)。"
@@ -335,8 +335,12 @@
 #, fuzzy
 msgid ""
 "The directory /var/lib/mailman/qfiles contains files. It needs to be empty "
-"for the upgrade to work properly. You can try to handle them by:\n"
-" - Stop new messages from coming in (at the MTA level).\n"
+"for the upgrade to work properly. If these files contain unprocessed "
+"messages that are otherwise fine, then you can try to handle them by:\n"
+" - Stopping new messages from coming in the queue (at the MTA level:\n"
+"   queue them in the MTA's queue or refuse them with a 4xx code). If\n"
+"   your site has a relatively low mailman traffic, you can skip this\n"
+"   step.\n"
 " - Start a mailman queue runner: /etc/init.d/mailman start\n"
 " - Let it run until all messages are handled.\n"
 "   If they don't all get handled in a timely manner, look at the logs\n"
@@ -345,7 +349,7 @@
 " - Retry the upgrade.\n"
 " - Let messages come in again.\n"
 "You can also decide to simply remove the files, which will make Mailman "
-"forget about (and lose) the corresponding emails."
+"forget about (and lose) the corresponding emails; expect angry users."
 msgstr ""
 "ディレクトリ /var/lib/mailman/qfiles がファイルを含んでいます。更新作業を正し"
 "く行うために、この中を空にする必要があります。これらのファイルがまだ処理され"
@@ -371,8 +375,10 @@
 "If these files correspond to shunted messages, you have to either delete "
 "them or unshunt them (with /var/lib/mailman/bin/unshunt). Shunted messages "
 "are messages on which Mailman has already abandoned any further processing "
-"because of an error condition, but that are kept for admin review. You can "
-"use /var/lib/mailman/bin/show_qfiles to examine the contents of the queues."
+"because of an error condition, but that are kept for admin review, as they "
+"usually originate from Mailman bugs or other abnormal situations that need "
+"human inspection. You can use /var/lib/mailman/bin/show_qfiles to examine "
+"the contents of the queues."
 msgstr ""
 "これらのファイルが分路されたメッセージに関連付けられている場合、両方を削除す"
 "るかあるいは主路に戻すかする必要があります。分路されたメッセージは、Mailman "

Modified: trunk/debian/po/nl.po
===================================================================
--- trunk/debian/po/nl.po	2006-09-17 10:33:02 UTC (rev 352)
+++ trunk/debian/po/nl.po	2006-09-17 11:53:02 UTC (rev 353)
@@ -21,7 +21,7 @@
 msgstr ""
 "Project-Id-Version: mailman 0:2.1.8-1\n"
 "Report-Msgid-Bugs-To: pkg-mailman-hackers at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-09-17 12:28+0200\n"
+"POT-Creation-Date: 2006-08-22 02:17+0200\n"
 "PO-Revision-Date: 2006-07-05 13:05+0100\n"
 "Last-Translator: Kurt De Bree <kdebree(AT)telenet(DOT)be>\n"
 "Language-Team: Debian l10n Dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -230,7 +230,7 @@
 "For each supported language, Mailman stores default language specific texts "
 "in /etc/mailman/LANG/ giving them conffile like treatment with the help of "
 "ucf.  This means approximately 150kB for each supported language on the root "
-"file system."
+"FS."
 msgstr ""
 "Voor elke ondersteunde taal bewaart Debian Mailman standaard "
 "taalafhankelijke teksten in /etc/mailman/LANG/, wat hen een soort conffile-"
@@ -270,8 +270,8 @@
 #: ../templates:3001
 #, fuzzy
 msgid ""
-"Mailman allows to gate news to mail, that is, send all the messages which "
-"appear in a Usenet newsgroup to a mailing list."
+"Do you want to gate news to mail, that is, send all the messages which "
+"appear in a newsgroup to a mailing list?"
 msgstr ""
 "Wilt u nieuws doorsluizen naar e-mail, d.w.z. alle boodschappen die "
 "verschijnen in een nieuwsgroep verzenden naar een mailinglijst."
@@ -337,11 +337,14 @@
 #. Type: note
 #. Description
 #: ../templates:6001
-#, fuzzy
 msgid ""
 "The directory /var/lib/mailman/qfiles contains files. It needs to be empty "
-"for the upgrade to work properly. You can try to handle them by:\n"
-" - Stop new messages from coming in (at the MTA level).\n"
+"for the upgrade to work properly. If these files contain unprocessed "
+"messages that are otherwise fine, then you can try to handle them by:\n"
+" - Stopping new messages from coming in the queue (at the MTA level:\n"
+"   queue them in the MTA's queue or refuse them with a 4xx code). If\n"
+"   your site has a relatively low mailman traffic, you can skip this\n"
+"   step.\n"
 " - Start a mailman queue runner: /etc/init.d/mailman start\n"
 " - Let it run until all messages are handled.\n"
 "   If they don't all get handled in a timely manner, look at the logs\n"
@@ -350,7 +353,7 @@
 " - Retry the upgrade.\n"
 " - Let messages come in again.\n"
 "You can also decide to simply remove the files, which will make Mailman "
-"forget about (and lose) the corresponding emails."
+"forget about (and lose) the corresponding emails; expect angry users."
 msgstr ""
 "De map /var/lib/mailman/qfiles bevat bestanden. Ze moet leeg zijn om de "
 "opwaardering goed te laten werken. Als deze bestanden nog niet zijn "
@@ -374,13 +377,14 @@
 #. Type: note
 #. Description
 #: ../templates:6001
-#, fuzzy
 msgid ""
 "If these files correspond to shunted messages, you have to either delete "
 "them or unshunt them (with /var/lib/mailman/bin/unshunt). Shunted messages "
 "are messages on which Mailman has already abandoned any further processing "
-"because of an error condition, but that are kept for admin review. You can "
-"use /var/lib/mailman/bin/show_qfiles to examine the contents of the queues."
+"because of an error condition, but that are kept for admin review, as they "
+"usually originate from Mailman bugs or other abnormal situations that need "
+"human inspection. You can use /var/lib/mailman/bin/show_qfiles to examine "
+"the contents of the queues."
 msgstr ""
 "Als deze bestanden overeenkomen met shunted boodschappen, dan moet u ze "
 "ofwel verwijderen ofwel unshunten (met /var/lib/mailman/bin/unshunt). "

Modified: trunk/debian/po/pt_BR.po
===================================================================
--- trunk/debian/po/pt_BR.po	2006-09-17 10:33:02 UTC (rev 352)
+++ trunk/debian/po/pt_BR.po	2006-09-17 11:53:02 UTC (rev 353)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: mailman_2.1.3-2\n"
 "Report-Msgid-Bugs-To: pkg-mailman-hackers at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-09-17 12:28+0200\n"
+"POT-Creation-Date: 2006-08-22 02:17+0200\n"
 "PO-Revision-Date: 2004-01-16 15:54-0300\n"
 "Last-Translator: André Luís Lopes <andrelop at debian.org>\n"
 "Language-Team: Debian-BR Project <debian-l10n-portuguese at lists.debian.org>\n"
@@ -222,7 +222,7 @@
 "For each supported language, Mailman stores default language specific texts "
 "in /etc/mailman/LANG/ giving them conffile like treatment with the help of "
 "ucf.  This means approximately 150kB for each supported language on the root "
-"file system."
+"FS."
 msgstr ""
 
 #. Type: multiselect
@@ -253,8 +253,8 @@
 #: ../templates:3001
 #, fuzzy
 msgid ""
-"Mailman allows to gate news to mail, that is, send all the messages which "
-"appear in a Usenet newsgroup to a mailing list."
+"Do you want to gate news to mail, that is, send all the messages which "
+"appear in a newsgroup to a mailing list?"
 msgstr ""
 "Você deseja criar uma ligação de notícias para mensagens, isto é, enviar "
 "todas as mensagens que aparecerem em um grupo de notícias para uma lista de "
@@ -321,8 +321,12 @@
 #: ../templates:6001
 msgid ""
 "The directory /var/lib/mailman/qfiles contains files. It needs to be empty "
-"for the upgrade to work properly. You can try to handle them by:\n"
-" - Stop new messages from coming in (at the MTA level).\n"
+"for the upgrade to work properly. If these files contain unprocessed "
+"messages that are otherwise fine, then you can try to handle them by:\n"
+" - Stopping new messages from coming in the queue (at the MTA level:\n"
+"   queue them in the MTA's queue or refuse them with a 4xx code). If\n"
+"   your site has a relatively low mailman traffic, you can skip this\n"
+"   step.\n"
 " - Start a mailman queue runner: /etc/init.d/mailman start\n"
 " - Let it run until all messages are handled.\n"
 "   If they don't all get handled in a timely manner, look at the logs\n"
@@ -331,7 +335,7 @@
 " - Retry the upgrade.\n"
 " - Let messages come in again.\n"
 "You can also decide to simply remove the files, which will make Mailman "
-"forget about (and lose) the corresponding emails."
+"forget about (and lose) the corresponding emails; expect angry users."
 msgstr ""
 
 #. Type: note
@@ -341,6 +345,8 @@
 "If these files correspond to shunted messages, you have to either delete "
 "them or unshunt them (with /var/lib/mailman/bin/unshunt). Shunted messages "
 "are messages on which Mailman has already abandoned any further processing "
-"because of an error condition, but that are kept for admin review. You can "
-"use /var/lib/mailman/bin/show_qfiles to examine the contents of the queues."
+"because of an error condition, but that are kept for admin review, as they "
+"usually originate from Mailman bugs or other abnormal situations that need "
+"human inspection. You can use /var/lib/mailman/bin/show_qfiles to examine "
+"the contents of the queues."
 msgstr ""

Modified: trunk/debian/po/ru.po
===================================================================
--- trunk/debian/po/ru.po	2006-09-17 10:33:02 UTC (rev 352)
+++ trunk/debian/po/ru.po	2006-09-17 11:53:02 UTC (rev 353)
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: mailman_2.1.7-1\n"
 "Report-Msgid-Bugs-To: pkg-mailman-hackers at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-09-17 12:28+0200\n"
+"POT-Creation-Date: 2006-08-22 02:17+0200\n"
 "PO-Revision-Date: 2006-08-10 19:55+0300\n"
 "Last-Translator: Yuri Kozlov <kozlov.y at gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -226,7 +226,7 @@
 "For each supported language, Mailman stores default language specific texts "
 "in /etc/mailman/LANG/ giving them conffile like treatment with the help of "
 "ucf.  This means approximately 150kB for each supported language on the root "
-"file system."
+"FS."
 msgstr ""
 "Для каждого поддерживаемого языка Debian Mailman хранит текст с заданным "
 "языком по умолчанию в каталоге /etc/mailman/LANG/, давая настроить "
@@ -268,8 +268,8 @@
 #: ../templates:3001
 #, fuzzy
 msgid ""
-"Mailman allows to gate news to mail, that is, send all the messages which "
-"appear in a Usenet newsgroup to a mailing list."
+"Do you want to gate news to mail, that is, send all the messages which "
+"appear in a newsgroup to a mailing list?"
 msgstr ""
 "Нужно ли шлюзовать новости в почту, то есть отправлять все сообщения, "
 "которые приходят в группу новостей в список почтовой рассылки?"
@@ -338,8 +338,12 @@
 #, fuzzy
 msgid ""
 "The directory /var/lib/mailman/qfiles contains files. It needs to be empty "
-"for the upgrade to work properly. You can try to handle them by:\n"
-" - Stop new messages from coming in (at the MTA level).\n"
+"for the upgrade to work properly. If these files contain unprocessed "
+"messages that are otherwise fine, then you can try to handle them by:\n"
+" - Stopping new messages from coming in the queue (at the MTA level:\n"
+"   queue them in the MTA's queue or refuse them with a 4xx code). If\n"
+"   your site has a relatively low mailman traffic, you can skip this\n"
+"   step.\n"
 " - Start a mailman queue runner: /etc/init.d/mailman start\n"
 " - Let it run until all messages are handled.\n"
 "   If they don't all get handled in a timely manner, look at the logs\n"
@@ -348,7 +352,7 @@
 " - Retry the upgrade.\n"
 " - Let messages come in again.\n"
 "You can also decide to simply remove the files, which will make Mailman "
-"forget about (and lose) the corresponding emails."
+"forget about (and lose) the corresponding emails; expect angry users."
 msgstr ""
 "Найдены файлы в каталоге /var/lib/mailman/qfiles. Для правильного выполнения "
 "процедуры обновления он должен быть пуст. Если это пока не обработанные "
@@ -374,8 +378,10 @@
 "If these files correspond to shunted messages, you have to either delete "
 "them or unshunt them (with /var/lib/mailman/bin/unshunt). Shunted messages "
 "are messages on which Mailman has already abandoned any further processing "
-"because of an error condition, but that are kept for admin review. You can "
-"use /var/lib/mailman/bin/show_qfiles to examine the contents of the queues."
+"because of an error condition, but that are kept for admin review, as they "
+"usually originate from Mailman bugs or other abnormal situations that need "
+"human inspection. You can use /var/lib/mailman/bin/show_qfiles to examine "
+"the contents of the queues."
 msgstr ""
 "Если эти файлы соответствуют отложенным сообщениям, вы можете удалить их или "
 "сделать их обычными сообщениями. Отложенные сообщения -- это сообщения, для "

Modified: trunk/debian/po/sv.po
===================================================================
--- trunk/debian/po/sv.po	2006-09-17 10:33:02 UTC (rev 352)
+++ trunk/debian/po/sv.po	2006-09-17 11:53:02 UTC (rev 353)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: mailman\n"
 "Report-Msgid-Bugs-To: pkg-mailman-hackers at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-09-17 12:28+0200\n"
+"POT-Creation-Date: 2006-08-22 02:17+0200\n"
 "PO-Revision-Date: 2006-01-29 23:24+0100\n"
 "Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -224,7 +224,7 @@
 "For each supported language, Mailman stores default language specific texts "
 "in /etc/mailman/LANG/ giving them conffile like treatment with the help of "
 "ucf.  This means approximately 150kB for each supported language on the root "
-"file system."
+"FS."
 msgstr ""
 "För varje språk som stöds av Debian lagrar Mailman specifik text för "
 "standardspråket i /etc/mailman/LANG/ och ger dem konfigurationsfilsliknande "
@@ -265,8 +265,8 @@
 #: ../templates:3001
 #, fuzzy
 msgid ""
-"Mailman allows to gate news to mail, that is, send all the messages which "
-"appear in a Usenet newsgroup to a mailing list."
+"Do you want to gate news to mail, that is, send all the messages which "
+"appear in a newsgroup to a mailing list?"
 msgstr ""
 "Vill du hantera nyhetsgrupper till sändlistor, alltså, skicka alla "
 "meddelanden som dyker upp i en nyhetsgrupp till en sändlista."
@@ -335,8 +335,12 @@
 #, fuzzy
 msgid ""
 "The directory /var/lib/mailman/qfiles contains files. It needs to be empty "
-"for the upgrade to work properly. You can try to handle them by:\n"
-" - Stop new messages from coming in (at the MTA level).\n"
+"for the upgrade to work properly. If these files contain unprocessed "
+"messages that are otherwise fine, then you can try to handle them by:\n"
+" - Stopping new messages from coming in the queue (at the MTA level:\n"
+"   queue them in the MTA's queue or refuse them with a 4xx code). If\n"
+"   your site has a relatively low mailman traffic, you can skip this\n"
+"   step.\n"
 " - Start a mailman queue runner: /etc/init.d/mailman start\n"
 " - Let it run until all messages are handled.\n"
 "   If they don't all get handled in a timely manner, look at the logs\n"
@@ -345,7 +349,7 @@
 " - Retry the upgrade.\n"
 " - Let messages come in again.\n"
 "You can also decide to simply remove the files, which will make Mailman "
-"forget about (and lose) the corresponding emails."
+"forget about (and lose) the corresponding emails; expect angry users."
 msgstr ""
 "Katalogen /var/lib/mailman/qfiles innehåller filer.  Den behöver tömmas för "
 "att uppgraderingen ska fungera korrekt. Om dessa filer ännu inte är "
@@ -371,8 +375,10 @@
 "If these files correspond to shunted messages, you have to either delete "
 "them or unshunt them (with /var/lib/mailman/bin/unshunt). Shunted messages "
 "are messages on which Mailman has already abandoned any further processing "
-"because of an error condition, but that are kept for admin review. You can "
-"use /var/lib/mailman/bin/show_qfiles to examine the contents of the queues."
+"because of an error condition, but that are kept for admin review, as they "
+"usually originate from Mailman bugs or other abnormal situations that need "
+"human inspection. You can use /var/lib/mailman/bin/show_qfiles to examine "
+"the contents of the queues."
 msgstr ""
 "Om dessa filer korresponderar med undanskyfflade meddelanden, behöver du "
 "antingen ta bort dem eller skyffla tillbaka dem. Undanskyfflade meddelanden "

Modified: trunk/debian/po/templates.pot
===================================================================
--- trunk/debian/po/templates.pot	2006-09-17 10:33:02 UTC (rev 352)
+++ trunk/debian/po/templates.pot	2006-09-17 11:53:02 UTC (rev 353)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: pkg-mailman-hackers at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-09-17 12:28+0200\n"
+"POT-Creation-Date: 2006-08-22 02:17+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -215,7 +215,7 @@
 "For each supported language, Mailman stores default language specific texts "
 "in /etc/mailman/LANG/ giving them conffile like treatment with the help of "
 "ucf.  This means approximately 150kB for each supported language on the root "
-"file system."
+"FS."
 msgstr ""
 
 #. Type: multiselect
@@ -245,8 +245,8 @@
 #. Description
 #: ../templates:3001
 msgid ""
-"Mailman allows to gate news to mail, that is, send all the messages which "
-"appear in a Usenet newsgroup to a mailing list."
+"Do you want to gate news to mail, that is, send all the messages which "
+"appear in a newsgroup to a mailing list?"
 msgstr ""
 
 #. Type: boolean
@@ -304,8 +304,12 @@
 #: ../templates:6001
 msgid ""
 "The directory /var/lib/mailman/qfiles contains files. It needs to be empty "
-"for the upgrade to work properly. You can try to handle them by:\n"
-" - Stop new messages from coming in (at the MTA level).\n"
+"for the upgrade to work properly. If these files contain unprocessed "
+"messages that are otherwise fine, then you can try to handle them by:\n"
+" - Stopping new messages from coming in the queue (at the MTA level:\n"
+"   queue them in the MTA's queue or refuse them with a 4xx code). If\n"
+"   your site has a relatively low mailman traffic, you can skip this\n"
+"   step.\n"
 " - Start a mailman queue runner: /etc/init.d/mailman start\n"
 " - Let it run until all messages are handled.\n"
 "   If they don't all get handled in a timely manner, look at the logs\n"
@@ -314,7 +318,7 @@
 " - Retry the upgrade.\n"
 " - Let messages come in again.\n"
 "You can also decide to simply remove the files, which will make Mailman "
-"forget about (and lose) the corresponding emails."
+"forget about (and lose) the corresponding emails; expect angry users."
 msgstr ""
 
 #. Type: note
@@ -324,6 +328,8 @@
 "If these files correspond to shunted messages, you have to either delete "
 "them or unshunt them (with /var/lib/mailman/bin/unshunt). Shunted messages "
 "are messages on which Mailman has already abandoned any further processing "
-"because of an error condition, but that are kept for admin review. You can "
-"use /var/lib/mailman/bin/show_qfiles to examine the contents of the queues."
+"because of an error condition, but that are kept for admin review, as they "
+"usually originate from Mailman bugs or other abnormal situations that need "
+"human inspection. You can use /var/lib/mailman/bin/show_qfiles to examine "
+"the contents of the queues."
 msgstr ""

Modified: trunk/debian/po/vi.po
===================================================================
--- trunk/debian/po/vi.po	2006-09-17 10:33:02 UTC (rev 352)
+++ trunk/debian/po/vi.po	2006-09-17 11:53:02 UTC (rev 353)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: mailman 2.1.5-9\n"
 "Report-Msgid-Bugs-To: pkg-mailman-hackers at lists.alioth.debian.org\n"
-"POT-Creation-Date: 2006-09-17 12:28+0200\n"
+"POT-Creation-Date: 2006-08-22 02:17+0200\n"
 "PO-Revision-Date: 2006-01-30 16:11+1030\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list at lists.sourceforge.net>\n"
@@ -217,7 +217,7 @@
 "For each supported language, Mailman stores default language specific texts "
 "in /etc/mailman/LANG/ giving them conffile like treatment with the help of "
 "ucf.  This means approximately 150kB for each supported language on the root "
-"file system."
+"FS."
 msgstr ""
 "Với mỗi ngôn ngữ được hỗ trợ, trình Mailman của Debian lưu các văn bản mặc "
 "định đặc trưng cho một ngôn ngữ nào đó vào </etc/mailman/MÃ/> (mã này là mã "
@@ -259,8 +259,8 @@
 #: ../templates:3001
 #, fuzzy
 msgid ""
-"Mailman allows to gate news to mail, that is, send all the messages which "
-"appear in a Usenet newsgroup to a mailing list."
+"Do you want to gate news to mail, that is, send all the messages which "
+"appear in a newsgroup to a mailing list?"
 msgstr ""
 "Bạn có muốn chuyển tiếp tin tới hộp, tức là gửi mọi thông điệp mà xuất hiện "
 "trong nhóm tin nào, tới một hộp thư chung không?"
@@ -329,8 +329,12 @@
 #, fuzzy
 msgid ""
 "The directory /var/lib/mailman/qfiles contains files. It needs to be empty "
-"for the upgrade to work properly. You can try to handle them by:\n"
-" - Stop new messages from coming in (at the MTA level).\n"
+"for the upgrade to work properly. If these files contain unprocessed "
+"messages that are otherwise fine, then you can try to handle them by:\n"
+" - Stopping new messages from coming in the queue (at the MTA level:\n"
+"   queue them in the MTA's queue or refuse them with a 4xx code). If\n"
+"   your site has a relatively low mailman traffic, you can skip this\n"
+"   step.\n"
 " - Start a mailman queue runner: /etc/init.d/mailman start\n"
 " - Let it run until all messages are handled.\n"
 "   If they don't all get handled in a timely manner, look at the logs\n"
@@ -339,7 +343,7 @@
 " - Retry the upgrade.\n"
 " - Let messages come in again.\n"
 "You can also decide to simply remove the files, which will make Mailman "
-"forget about (and lose) the corresponding emails."
+"forget about (and lose) the corresponding emails; expect angry users."
 msgstr ""
 "Thư mục </var/lib/mailman/qfiles> chứa một số tập tin. Nó cần phải là rỗng "
 "để cho phép việc cập nhật hoạt động cho đúng. Nếu những tập tin này chứa "
@@ -367,8 +371,10 @@
 "If these files correspond to shunted messages, you have to either delete "
 "them or unshunt them (with /var/lib/mailman/bin/unshunt). Shunted messages "
 "are messages on which Mailman has already abandoned any further processing "
-"because of an error condition, but that are kept for admin review. You can "
-"use /var/lib/mailman/bin/show_qfiles to examine the contents of the queues."
+"because of an error condition, but that are kept for admin review, as they "
+"usually originate from Mailman bugs or other abnormal situations that need "
+"human inspection. You can use /var/lib/mailman/bin/show_qfiles to examine "
+"the contents of the queues."
 msgstr ""
 "Nếu những tập tin này tương ứng với thông điệp đã giữ riêng cho người kiểm "
 "tra, bạn phải hoặc xoá bỏ hết hoặc gỡ bỏ hết ra nhóm giữ riêng đó. (Thông "

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2006-09-17 10:33:02 UTC (rev 352)
+++ trunk/debian/rules	2006-09-17 11:53:02 UTC (rev 353)
@@ -62,7 +62,6 @@
 	dh_install
 	dh_installdirs
 	dh_installdocs ACKNOWLEDGMENTS README* TODO FAQ
-	dh_installexamples
 	dh_installchangelogs NEWS
 	$(MAKE) doinstall prefix=$$(pwd)/debian/mailman/var/lib/$(package) \
 		var_prefix=$$(pwd)/debian/mailman/var/lib/$(package) \
@@ -153,6 +152,9 @@
 	install -m 0755 debian/contrib/postfix-to-mailman.py debian/mailman/usr/share/mailman
 	dh_link etc/mailman/postfix-to-mailman.py usr/lib/mailman/bin/postfix-to-mailman.py
 
+# apache default config
+	install -m 0644 debian/contrib/apache.conf debian/mailman/etc/mailman
+
 # Move templates
 	mv `find debian/mailman/etc/mailman -mindepth 1 -maxdepth 1 -type d` debian/mailman/usr/share/mailman
 	cp build/contrib/qmail-to-mailman.py debian/mailman/usr/share/mailman




More information about the Pkg-mailman-hackers mailing list