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

Sat Oct 8 15:30:38 UTC 2011

Author: thijs
Date: 2011-10-08 15:30:38 +0000 (Sat, 08 Oct 2011)
New Revision: 693

Added:
   trunk/debian/mailman.cron.d
Modified:
   trunk/debian/changelog
   trunk/debian/config
   trunk/debian/mailman.dirs
   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/gl.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.po
   trunk/debian/po/pt_BR.po
   trunk/debian/po/ru.po
   trunk/debian/po/sk.po
   trunk/debian/po/sv.po
   trunk/debian/po/templates.pot
   trunk/debian/po/vi.po
   trunk/debian/postinst
   trunk/debian/rules
   trunk/debian/templates
Log:
move cronjob handling from postinst into a regular conffile with all the
benefits of the latter, including a prompt for adding of the
cull_bad_shunt job.

Also remove the gate_news debconf question; this is used only in very
few cases, not warranting the debconf infrastructure for this feature.


Modified: trunk/debian/changelog
===================================================================

--- trunk/debian/changelog	2011-10-08 14:58:55 UTC (rev 692)
+++ trunk/debian/changelog	2011-10-08 15:30:38 UTC (rev 693)
@@ -1,10 +1,12 @@
 mailman (1:2.1.14-3) unstable; urgency=low
 
   * Make man page descruptions match more keywords (closes: #597112).
-  * Add cull_bad_shunt command to default cron job (closes: #615204).
-  * Import dpkg buildflags, also enabling hardening flags.
+  * Add cull_bad_shunt command to default cron job (closes: #615204)
+    and improve cron job handling in the package.
+  * Import dpkg buildflags, also enabling hardening features.
+  * Remove gate_news debconf question.
 
- -- Thijs Kinkhorst <thijs at debian.org>  Sat, 08 Oct 2011 16:56:00 +0200
+ -- Thijs Kinkhorst <thijs at debian.org>  Sat, 08 Oct 2011 17:27:51 +0200
 
 mailman (1:2.1.14-2) unstable; urgency=low
 

Modified: trunk/debian/config
===================================================================
--- trunk/debian/config	2011-10-08 14:58:55 UTC (rev 692)
+++ trunk/debian/config	2011-10-08 15:30:38 UTC (rev 693)
@@ -86,17 +86,6 @@
 db_subst mailman/default_server_language site_languages "${site_languages}"
 db_input high mailman/default_server_language || true
 
-if [ -f "${crontab}" ]; then
-  COMMENT=`awk '/^.*gate_news/ { print substr($1,1,1) } ' < ${crontab}`
-  if [ "$COMMENT" = "#" ]; then
-    db_set mailman/gate_news false
-  else
-    db_set mailman/gate_news true
-  fi
-fi
-
-db_input low mailman/gate_news || true
-
 if [ ! -e /etc/mailman/mm_cfg.py ] || [ ! -x /var/lib/mailman/bin/list_lists ] || \
     [ "$(/var/lib/mailman/bin/list_lists -b | grep ^mailman$ )" = "" ]; then
     db_input critical mailman/create_site_list || true

Added: trunk/debian/mailman.cron.d
===================================================================
--- trunk/debian/mailman.cron.d	                        (rev 0)
+++ trunk/debian/mailman.cron.d	2011-10-08 15:30:38 UTC (rev 693)
@@ -0,0 +1,27 @@
+# At 8AM every day, mail reminders to admins as to pending requests.
+# They are less likely to ignore these reminders if they're mailed
+# early in the morning, but of course, this is local time... ;)
+0 8 * * * list [ -x /usr/lib/mailman/cron/checkdbs ] && /usr/lib/mailman/cron/checkdbs
+#
+# At 9AM, send notifications to disabled members that are due to be
+# reminded to re-enable their accounts.
+0 9 * * * list [ -x /usr/lib/mailman/cron/disabled ] && /usr/lib/mailman/cron/disabled
+#
+# Noon, mail digests for lists that do periodic as well as threshold delivery.
+0 12 * * * list [ -x /usr/lib/mailman/cron/senddigests ] && /usr/lib/mailman/cron/senddigests
+#
+# 5 AM on the first of each month, mail out password reminders.
+0 5 1 * * list [ -x /usr/lib/mailman/cron/mailpasswds ] && /usr/lib/mailman/cron/mailpasswds
+#
+# Every 5 mins, try to gate news to mail.  You can comment this one out
+# if you don't want to allow gating, or don't have any going on right now,
+# or want to exclusively use a callback strategy instead of polling.
+# */5 * * * * list [ -x /usr/lib/mailman/cron/gate_news ] && /usr/lib/mailman/cron/gate_news
+#
+# At 3:27am every night, regenerate the gzip'd archive file.  Only
+# turn this on if the internal archiver is used and
+# GZIP_ARCHIVE_TXT_FILES is false in mm_cfg.py
+27 3 * * * list [ -x /usr/lib/mailman/cron/nightly_gzip ] && /usr/lib/mailman/cron/nightly_gzip
+#
+# At 4:30AM daily, cull old entries from the 'bad' and 'shunt' queues.
+30 4 * * * list [ -x /usr/lib/mailman/cron/cull_bad_shunt ] && /usr/lib/mailman/cron/cull_bad_shunt

Modified: trunk/debian/mailman.dirs
===================================================================
--- trunk/debian/mailman.dirs	2011-10-08 14:58:55 UTC (rev 692)
+++ trunk/debian/mailman.dirs	2011-10-08 15:30:38 UTC (rev 693)
@@ -7,3 +7,4 @@
 var/log/mailman
 var/lib/mailman/templates
 etc/logrotate.d
+etc/cron.d

Modified: trunk/debian/po/ca.po
===================================================================
--- trunk/debian/po/ca.po	2011-10-08 14:58:55 UTC (rev 692)
+++ trunk/debian/po/ca.po	2011-10-08 15:30:38 UTC (rev 693)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: mailman_2.1.2-7_templates\n"
 "Report-Msgid-Bugs-To: mailman at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-02 22:08+0100\n"
+"POT-Creation-Date: 2011-10-08 15:13+0000\n"
 "PO-Revision-Date: 2009-01-06 17:15+0100\n"
 "Last-Translator: David Planella Molas <david.planella at gmail.com>\n"
 "Language-Team: Debian L10n Catalan <debian-l10n-catalan at lists.debian.org>\n"
@@ -229,7 +229,7 @@
 #. from the one in the Choices list; you do not have to worry about
 #. them, and have to simply choose a msgstr among the English values
 #. listed in the Choices field above, e.g. msgstr "nl (Dutch)".
-#: ../templates:1002 ../templates:5001
+#: ../templates:1002 ../templates:4001
 msgid "en (English)[ default language ]"
 msgstr "ca (Catalan)"
 
@@ -276,38 +276,15 @@
 "habilitar quan no estiguin seleccionades i en cas que el Mailman requereixi "
 "almenys una llengua per a mostrar els seus missatges."
 
-#. Type: boolean
-#. Description
-#: ../templates:3001
-msgid "Gate news to mail?"
-msgstr "Voleu establir una pasarelÂ·la de notÃcies a correu?"
-
-#. Type: boolean
-#. 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."
-msgstr ""
-"El Mailman permet fer de passarelÂ·la de notÃcies a correu, Ã©s a dir, enviar "
-"tots aquells missatges que apareixen en un grup de notÃcies de l'Usenet a "
-"una llista de correu."
-
-#. Type: boolean
-#. Description
-#: ../templates:3001
-msgid "Most people won't need this."
-msgstr "En la majoria de casos no Ã©s necessari."
-
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid "Missing site list"
 msgstr "Manca la llista del lloc"
 
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid ""
 "Mailman needs a so-called \"site list\", which is the list from which "
 "password reminders and such are sent out from.  This list needs to be "
@@ -319,7 +296,7 @@
 
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid ""
 "To create the list, run \"newlist mailman\" and follow the instructions on-"
 "screen.  Note that you also need to start mailman after that, using /etc/"
@@ -331,13 +308,13 @@
 
 #. Type: select
 #. Description
-#: ../templates:5002
+#: ../templates:4002
 msgid "Default language for Mailman:"
 msgstr "Llengua per defecte del Mailman:"
 
 #. Type: select
 #. Description
-#: ../templates:5002
+#: ../templates:4002
 msgid ""
 "The web page will be shown in this language, and in general, Mailman will "
 "use this language to communicate with the user."
@@ -347,25 +324,25 @@
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:5001
 msgid "abort installation"
 msgstr "cancelÂ·la la instalÂ·laciÃ³"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:5001
 msgid "continue regardless"
 msgstr "continua de totes maneres"
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 msgid "Old queue files present"
 msgstr "Hi ha fitxers de cua antics"
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 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"
@@ -397,7 +374,7 @@
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 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 "
@@ -414,7 +391,7 @@
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 msgid ""
 "You have the option to continue installation regardless of this problem, at "
 "the risk of losing the messages in question or breaking your Mailman setup."
@@ -422,3 +399,17 @@
 "Teniu la opciÃ³ de continuar la instalÂ·laciÃ³ tot i aquest problema, perÃ² "
 "tingueu en compte que hi ha el risc de perdre els missatges en qÃ¼estiÃ³ o bÃ© "
 "de malmetre la instalÂ·laciÃ³ del Mailman."
+
+#~ msgid "Gate news to mail?"
+#~ msgstr "Voleu establir una pasarelÂ·la de notÃcies a correu?"
+
+#~ msgid ""
+#~ "Mailman allows to gate news to mail, that is, send all the messages which "
+#~ "appear in a Usenet newsgroup to a mailing list."
+#~ msgstr ""
+#~ "El Mailman permet fer de passarelÂ·la de notÃcies a correu, Ã©s a dir, "
+#~ "enviar tots aquells missatges que apareixen en un grup de notÃcies de "
+#~ "l'Usenet a una llista de correu."
+
+#~ msgid "Most people won't need this."
+#~ msgstr "En la majoria de casos no Ã©s necessari."

Modified: trunk/debian/po/cs.po
===================================================================
--- trunk/debian/po/cs.po	2011-10-08 14:58:55 UTC (rev 692)
+++ trunk/debian/po/cs.po	2011-10-08 15:30:38 UTC (rev 693)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: mailman\n"
 "Report-Msgid-Bugs-To: mailman at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-02 22:08+0100\n"
+"POT-Creation-Date: 2011-10-08 15:13+0000\n"
 "PO-Revision-Date: 2008-12-30 18:54+0100\n"
 "Last-Translator: Miroslav Kure <kurem at debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech at lists.debian.org>\n"
@@ -236,7 +236,7 @@
 #. from the one in the Choices list; you do not have to worry about
 #. them, and have to simply choose a msgstr among the English values
 #. listed in the Choices field above, e.g. msgstr "nl (Dutch)".
-#: ../templates:1002 ../templates:5001
+#: ../templates:1002 ../templates:4001
 msgid "en (English)[ default language ]"
 msgstr "cs (Czech)"
 
@@ -283,38 +283,15 @@
 "pÅ™idÃ¡ny. Mailman totiÅ¾ potÅ™ebuje mÃt povolen alespoÅˆ jeden jazyk, ve kterÃ©m "
 "mÃ¡ zobrazovat hlÃ¡Å¡ky."
 
-#. Type: boolean
-#. Description
-#: ../templates:3001
-msgid "Gate news to mail?"
-msgstr "BrÃ¡na z news do poÅ¡ty?"
-
-#. Type: boolean
-#. 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."
-msgstr ""
-"Mailman mÅ¯Å¾e slouÅ¾it jako brÃ¡na mezi news a poÅ¡tou. To znamenÃ¡, Å¾e mÅ¯Å¾e "
-"posÃlat vÅ¡echny pÅ™ÃspÄ›vky, kterÃ© se objevÃ v newsovÃ© skupinÄ›, do poÅ¡tovnÃ "
-"konference."
-
-#. Type: boolean
-#. Description
-#: ../templates:3001
-msgid "Most people won't need this."
-msgstr "VÄ›tÅ¡ina lidÃ toto nepotÅ™ebuje."
-
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid "Missing site list"
 msgstr "ChybÄ›jÃcÃ administrativnÃ konference"
 
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid ""
 "Mailman needs a so-called \"site list\", which is the list from which "
 "password reminders and such are sent out from.  This list needs to be "
@@ -326,7 +303,7 @@
 
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid ""
 "To create the list, run \"newlist mailman\" and follow the instructions on-"
 "screen.  Note that you also need to start mailman after that, using /etc/"
@@ -337,13 +314,13 @@
 
 #. Type: select
 #. Description
-#: ../templates:5002
+#: ../templates:4002
 msgid "Default language for Mailman:"
 msgstr "VÃ½chozÃ jazyk pro Mailman:"
 
 #. Type: select
 #. Description
-#: ../templates:5002
+#: ../templates:4002
 msgid ""
 "The web page will be shown in this language, and in general, Mailman will "
 "use this language to communicate with the user."
@@ -353,25 +330,25 @@
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:5001
 msgid "abort installation"
 msgstr "pÅ™eruÅ¡it instalaci"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:5001
 msgid "continue regardless"
 msgstr "pokraÄovat"
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 msgid "Old queue files present"
 msgstr "Ve frontÄ› jsou pÅ™Ãtomny starÃ© soubory"
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 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"
@@ -403,7 +380,7 @@
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 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 "
@@ -420,10 +397,24 @@
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 msgid ""
 "You have the option to continue installation regardless of this problem, at "
 "the risk of losing the messages in question or breaking your Mailman setup."
 msgstr ""
 "I pÅ™es tento problÃ©m mÅ¯Å¾ete v instalaci pokraÄovat, nicmÃ©nÄ› riskujete ztrÃ¡tu "
 "zmÃnÄ›nÃ½ch zprÃ¡v, pÅ™ÃpadnÄ› nefunkÄnÃ nastavenÃ Mailmanu."
+
+#~ msgid "Gate news to mail?"
+#~ msgstr "BrÃ¡na z news do poÅ¡ty?"
+
+#~ msgid ""
+#~ "Mailman allows to gate news to mail, that is, send all the messages which "
+#~ "appear in a Usenet newsgroup to a mailing list."
+#~ msgstr ""
+#~ "Mailman mÅ¯Å¾e slouÅ¾it jako brÃ¡na mezi news a poÅ¡tou. To znamenÃ¡, Å¾e mÅ¯Å¾e "
+#~ "posÃlat vÅ¡echny pÅ™ÃspÄ›vky, kterÃ© se objevÃ v newsovÃ© skupinÄ›, do poÅ¡tovnÃ "
+#~ "konference."
+
+#~ msgid "Most people won't need this."
+#~ msgstr "VÄ›tÅ¡ina lidÃ toto nepotÅ™ebuje."

Modified: trunk/debian/po/de.po
===================================================================
--- trunk/debian/po/de.po	2011-10-08 14:58:55 UTC (rev 692)
+++ trunk/debian/po/de.po	2011-10-08 15:30:38 UTC (rev 693)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: mailman 1:2.1.11-8\n"
 "Report-Msgid-Bugs-To: mailman at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-02 22:08+0100\n"
+"POT-Creation-Date: 2011-10-08 15:13+0000\n"
 "PO-Revision-Date: 2008-12-31 23:06+0100\n"
 "Last-Translator: Holger Wansing <linux at wansing-online.de>\n"
 "Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -229,7 +229,7 @@
 #. from the one in the Choices list; you do not have to worry about
 #. them, and have to simply choose a msgstr among the English values
 #. listed in the Choices field above, e.g. msgstr "nl (Dutch)".
-#: ../templates:1002 ../templates:5001
+#: ../templates:1002 ../templates:4001
 msgid "en (English)[ default language ]"
 msgstr "de (German)"
 
@@ -275,38 +275,15 @@
 "genutzt werden, so werden diese zwangsweise wieder aktiviert. AuÃŸerdem "
 "benÃ¶tigt mailman wenigstens eine Sprache, um seine Meldungen anzuzeigen."
 
-#. Type: boolean
-#. Description
-#: ../templates:3001
-msgid "Gate news to mail?"
-msgstr "Nachrichten aus Newsgroups an Mailinglisten weiterleiten?"
-
-#. Type: boolean
-#. 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."
-msgstr ""
-"Mailman erlaubt Newsgroup-Nachrichten an Mailinglisten weiterzuleiten, das "
-"heiÃŸt, alle Nachrichten, die in einer Usetnet-Newsgroup erscheinen, zu einer "
-"Mailingliste zu senden."
-
-#. Type: boolean
-#. Description
-#: ../templates:3001
-msgid "Most people won't need this."
-msgstr "Die meisten Leute werden das nicht benÃ¶tigen."
-
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid "Missing site list"
 msgstr "Fehlende Site-Liste"
 
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid ""
 "Mailman needs a so-called \"site list\", which is the list from which "
 "password reminders and such are sent out from.  This list needs to be "
@@ -318,7 +295,7 @@
 
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid ""
 "To create the list, run \"newlist mailman\" and follow the instructions on-"
 "screen.  Note that you also need to start mailman after that, using /etc/"
@@ -330,13 +307,13 @@
 
 #. Type: select
 #. Description
-#: ../templates:5002
+#: ../templates:4002
 msgid "Default language for Mailman:"
 msgstr "Standardsprache fÃ¼r Mailman:"
 
 #. Type: select
 #. Description
-#: ../templates:5002
+#: ../templates:4002
 msgid ""
 "The web page will be shown in this language, and in general, Mailman will "
 "use this language to communicate with the user."
@@ -346,25 +323,25 @@
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:5001
 msgid "abort installation"
 msgstr "Installation abbrechen"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:5001
 msgid "continue regardless"
 msgstr "Installation trotzdem fortsetzen"
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 msgid "Old queue files present"
 msgstr "Alte Dateien befinden sich in der Warteschlange"
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 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"
@@ -399,7 +376,7 @@
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 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 "
@@ -417,7 +394,7 @@
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 msgid ""
 "You have the option to continue installation regardless of this problem, at "
 "the risk of losing the messages in question or breaking your Mailman setup."
@@ -425,3 +402,17 @@
 "Sie haben die MÃ¶glichkeit, die Installation trotz dieses Problems "
 "fortzusetzen, riskieren aber, dadurch die fraglichen Nachrichten zu "
 "verlieren oder Ihre Mailman-Konfiguration zu beschÃ¤digen."
+
+#~ msgid "Gate news to mail?"
+#~ msgstr "Nachrichten aus Newsgroups an Mailinglisten weiterleiten?"
+
+#~ msgid ""
+#~ "Mailman allows to gate news to mail, that is, send all the messages which "
+#~ "appear in a Usenet newsgroup to a mailing list."
+#~ msgstr ""
+#~ "Mailman erlaubt Newsgroup-Nachrichten an Mailinglisten weiterzuleiten, "
+#~ "das heiÃŸt, alle Nachrichten, die in einer Usetnet-Newsgroup erscheinen, "
+#~ "zu einer Mailingliste zu senden."
+
+#~ msgid "Most people won't need this."
+#~ msgstr "Die meisten Leute werden das nicht benÃ¶tigen."

Modified: trunk/debian/po/es.po
===================================================================
--- trunk/debian/po/es.po	2011-10-08 14:58:55 UTC (rev 692)
+++ trunk/debian/po/es.po	2011-10-08 15:30:38 UTC (rev 693)
@@ -25,7 +25,7 @@
 msgstr ""
 "Project-Id-Version: maiman 2.1.4-3\n"
 "Report-Msgid-Bugs-To: mailman at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-02 22:08+0100\n"
+"POT-Creation-Date: 2011-10-08 15:13+0000\n"
 "PO-Revision-Date: 2008-12-28 18:43+0100\n"
 "Last-Translator: Javier Fernandez-Sanguino <jfs at debian.org>\n"
 "Language-Team: Debian L10n Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -246,7 +246,7 @@
 #. from the one in the Choices list; you do not have to worry about
 #. them, and have to simply choose a msgstr among the English values
 #. listed in the Choices field above, e.g. msgstr "nl (Dutch)".
-#: ../templates:1002 ../templates:5001
+#: ../templates:1002 ../templates:4001
 msgid "en (English)[ default language ]"
 msgstr "es (Spanish)"
 
@@ -292,38 +292,15 @@
 "listas de correo existentes y mailman necesita al menos un idioma para poder "
 "mostrar sus mensajes."
 
-#. Type: boolean
-#. Description
-#: ../templates:3001
-msgid "Gate news to mail?"
-msgstr "¿Conectar las noticias con el correo?"
-
-#. Type: boolean
-#. 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."
-msgstr ""
-"Mailman puede actuar como pasarela de noticias a correo, es decir, enviar "
-"todos los mensajes que llegan a un grupo de noticias de Usenet a una lista "
-"de correo."
-
-#. Type: boolean
-#. Description
-#: ../templates:3001
-msgid "Most people won't need this."
-msgstr "Prácticamente nadie necesita esto."
-
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid "Missing site list"
 msgstr "Falta la lista del sitio"
 
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid ""
 "Mailman needs a so-called \"site list\", which is the list from which "
 "password reminders and such are sent out from.  This list needs to be "
@@ -335,7 +312,7 @@
 
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid ""
 "To create the list, run \"newlist mailman\" and follow the instructions on-"
 "screen.  Note that you also need to start mailman after that, using /etc/"
@@ -347,13 +324,13 @@
 
 #. Type: select
 #. Description
-#: ../templates:5002
+#: ../templates:4002
 msgid "Default language for Mailman:"
 msgstr "Idioma por omisión para Mailman:"
 
 #. Type: select
 #. Description
-#: ../templates:5002
+#: ../templates:4002
 msgid ""
 "The web page will be shown in this language, and in general, Mailman will "
 "use this language to communicate with the user."
@@ -363,25 +340,25 @@
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:5001
 msgid "abort installation"
 msgstr "abortar la instalación"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:5001
 msgid "continue regardless"
 msgstr "continuar en cualquier caso"
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 msgid "Old queue files present"
 msgstr "Se han encontrado ficheros de colas antigüos"
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 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"
@@ -413,7 +390,7 @@
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 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 "
@@ -429,7 +406,7 @@
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 msgid ""
 "You have the option to continue installation regardless of this problem, at "
 "the risk of losing the messages in question or breaking your Mailman setup."
@@ -437,3 +414,17 @@
 "Puede elegir continuar la instalación sin tener en cuenta este problema pero "
 "corre el riesgo de perder los mensajes antes descritos o romper su "
 "instalación de Mailman."
+
+#~ msgid "Gate news to mail?"
+#~ msgstr "¿Conectar las noticias con el correo?"
+
+#~ msgid ""
+#~ "Mailman allows to gate news to mail, that is, send all the messages which "
+#~ "appear in a Usenet newsgroup to a mailing list."
+#~ msgstr ""
+#~ "Mailman puede actuar como pasarela de noticias a correo, es decir, enviar "
+#~ "todos los mensajes que llegan a un grupo de noticias de Usenet a una "
+#~ "lista de correo."
+
+#~ msgid "Most people won't need this."
+#~ msgstr "Prácticamente nadie necesita esto."

Modified: trunk/debian/po/fr.po
===================================================================
--- trunk/debian/po/fr.po	2011-10-08 14:58:55 UTC (rev 692)
+++ trunk/debian/po/fr.po	2011-10-08 15:30:38 UTC (rev 693)
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: fr-new\n"
 "Report-Msgid-Bugs-To: mailman at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-02 22:08+0100\n"
+"POT-Creation-Date: 2011-10-08 15:13+0000\n"
 "PO-Revision-Date: 2008-12-28 17:18+0100\n"
 "Last-Translator: Florentin Duneau <fduneau at gmail.com>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -232,7 +232,7 @@
 #. from the one in the Choices list; you do not have to worry about
 #. them, and have to simply choose a msgstr among the English values
 #. listed in the Choices field above, e.g. msgstr "nl (Dutch)".
-#: ../templates:1002 ../templates:5001
+#: ../templates:1002 ../templates:4001
 msgid "en (English)[ default language ]"
 msgstr "fr (French)"
 
@@ -278,38 +278,15 @@
 "automatiquement rÃ©activÃ©es mÃªme si vous les dÃ©sactivez ici. Mailman a besoin "
 "d'au moins une langue activÃ©e pour afficher ses messages."
 
-#. Type: boolean
-#. Description
-#: ../templates:3001
-msgid "Gate news to mail?"
-msgstr "Faut-il transformer les nouvelles en courriers Ã©lectroniquesÂ ?"
-
-#. Type: boolean
-#. 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."
-msgstr ""
-"Il est possible de transformer les nouvelles (les Â«Â newsÂ Â») en courriers, "
-"c'est-Ã -dire envoyer tous les messages qui apparaissent dans un forum Usenet "
-"vers une liste de diffusion."
-
-#. Type: boolean
-#. Description
-#: ../templates:3001
-msgid "Most people won't need this."
-msgstr "La plupart des utilisateurs n'ont pas besoin de cette fonctionnalitÃ©."
-
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid "Missing site list"
 msgstr "Pas de liste du site"
 
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid ""
 "Mailman needs a so-called \"site list\", which is the list from which "
 "password reminders and such are sent out from.  This list needs to be "
@@ -321,7 +298,7 @@
 
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid ""
 "To create the list, run \"newlist mailman\" and follow the instructions on-"
 "screen.  Note that you also need to start mailman after that, using /etc/"
@@ -333,13 +310,13 @@
 
 #. Type: select
 #. Description
-#: ../templates:5002
+#: ../templates:4002
 msgid "Default language for Mailman:"
 msgstr "Langue par dÃ©faut de MailmanÂ :"
 
 #. Type: select
 #. Description
-#: ../templates:5002
+#: ../templates:4002
 msgid ""
 "The web page will be shown in this language, and in general, Mailman will "
 "use this language to communicate with the user."
@@ -349,25 +326,25 @@
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:5001
 msgid "abort installation"
 msgstr "Interrompre l'installation"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:5001
 msgid "continue regardless"
 msgstr "Continuer malgrÃ© tout"
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 msgid "Old queue files present"
 msgstr "Fichiers anciens dans la file d'attente"
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 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"
@@ -401,7 +378,7 @@
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 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 "
@@ -418,7 +395,7 @@
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 msgid ""
 "You have the option to continue installation regardless of this problem, at "
 "the risk of losing the messages in question or breaking your Mailman setup."
@@ -426,3 +403,18 @@
 "Vous pouvez continuer l'installation en ignorant ce problÃ¨me ce qui pourrait "
 "provoquer la perte de ces messages ou dÃ©stabiliser cette installation de "
 "Mailman."
+
+#~ msgid "Gate news to mail?"
+#~ msgstr "Faut-il transformer les nouvelles en courriers Ã©lectroniquesÂ ?"
+
+#~ msgid ""
+#~ "Mailman allows to gate news to mail, that is, send all the messages which "
+#~ "appear in a Usenet newsgroup to a mailing list."
+#~ msgstr ""
+#~ "Il est possible de transformer les nouvelles (les Â«Â newsÂ Â») en courriers, "
+#~ "c'est-Ã -dire envoyer tous les messages qui apparaissent dans un forum "
+#~ "Usenet vers une liste de diffusion."
+
+#~ msgid "Most people won't need this."
+#~ msgstr ""
+#~ "La plupart des utilisateurs n'ont pas besoin de cette fonctionnalitÃ©."

Modified: trunk/debian/po/gl.po
===================================================================
--- trunk/debian/po/gl.po	2011-10-08 14:58:55 UTC (rev 692)
+++ trunk/debian/po/gl.po	2011-10-08 15:30:38 UTC (rev 693)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: mailman\n"
 "Report-Msgid-Bugs-To: mailman at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-02 22:08+0100\n"
+"POT-Creation-Date: 2011-10-08 15:13+0000\n"
 "PO-Revision-Date: 2008-12-28 14:33+0100\n"
 "Last-Translator: Marce Villarino <mvillarino at users.sourceforge.net>\n"
 "Language-Team: galician <proxecto at trasno.net>\n"
@@ -231,7 +231,7 @@
 #. from the one in the Choices list; you do not have to worry about
 #. them, and have to simply choose a msgstr among the English values
 #. listed in the Choices field above, e.g. msgstr "nl (Dutch)".
-#: ../templates:1002 ../templates:5001
+#: ../templates:1002 ../templates:4001
 msgid "en (English)[ default language ]"
 msgstr "es (espaÃ±ol)"
 
@@ -278,37 +278,15 @@
 "obrigatoriamente se se deseleccionan, e ademÃ¡is mailman precisa de alomenos "
 "un idioma no que mostrar as mensaxes."
 
-#. Type: boolean
-#. Description
-#: ../templates:3001
-msgid "Gate news to mail?"
-msgstr "Desexa facer unha pasarela de novas a correo?"
-
-#. Type: boolean
-#. 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."
-msgstr ""
-"Mailman permite crear unha pasarela de novas a correo, Ã© dicir, enviar todas "
-"as mensaxes que aparecen nun grupo de novas de Usenet a unha lista de correo."
-
-#. Type: boolean
-#. Description
-#: ../templates:3001
-msgid "Most people won't need this."
-msgstr "A maiorÃa da xente non precisa disto."
-
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid "Missing site list"
 msgstr "Falla a lista do sitio"
 
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid ""
 "Mailman needs a so-called \"site list\", which is the list from which "
 "password reminders and such are sent out from.  This list needs to be "
@@ -320,7 +298,7 @@
 
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid ""
 "To create the list, run \"newlist mailman\" and follow the instructions on-"
 "screen.  Note that you also need to start mailman after that, using /etc/"
@@ -332,13 +310,13 @@
 
 #. Type: select
 #. Description
-#: ../templates:5002
+#: ../templates:4002
 msgid "Default language for Mailman:"
 msgstr "Idioma predeterminado para Mailman:"
 
 #. Type: select
 #. Description
-#: ../templates:5002
+#: ../templates:4002
 msgid ""
 "The web page will be shown in this language, and in general, Mailman will "
 "use this language to communicate with the user."
@@ -348,25 +326,25 @@
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:5001
 msgid "abort installation"
 msgstr "cancelar a instalaciÃ³n"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:5001
 msgid "continue regardless"
 msgstr "continuar de calquera maneira"
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 msgid "Old queue files present"
 msgstr "Existen ficheiros de fila antigos"
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 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"
@@ -396,7 +374,7 @@
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 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 "
@@ -412,10 +390,24 @@
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 msgid ""
 "You have the option to continue installation regardless of this problem, at "
 "the risk of losing the messages in question or breaking your Mailman setup."
 msgstr ""
 "Pode continuar coa instalaciÃ³n malia este problema, co risco de perder as "
 "mensaxes en cuestiÃ³n ou estragar a configuraciÃ³n de Mailman."
+
+#~ msgid "Gate news to mail?"
+#~ msgstr "Desexa facer unha pasarela de novas a correo?"
+
+#~ msgid ""
+#~ "Mailman allows to gate news to mail, that is, send all the messages which "
+#~ "appear in a Usenet newsgroup to a mailing list."
+#~ msgstr ""
+#~ "Mailman permite crear unha pasarela de novas a correo, Ã© dicir, enviar "
+#~ "todas as mensaxes que aparecen nun grupo de novas de Usenet a unha lista "
+#~ "de correo."
+
+#~ msgid "Most people won't need this."
+#~ msgstr "A maiorÃa da xente non precisa disto."

Modified: trunk/debian/po/hu.po
===================================================================
--- trunk/debian/po/hu.po	2011-10-08 14:58:55 UTC (rev 692)
+++ trunk/debian/po/hu.po	2011-10-08 15:30:38 UTC (rev 693)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: mailman 2.1.4-1\n"
 "Report-Msgid-Bugs-To: mailman at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-02 22:08+0100\n"
+"POT-Creation-Date: 2011-10-08 15:13+0000\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"
@@ -238,7 +238,7 @@
 #. from the one in the Choices list; you do not have to worry about
 #. them, and have to simply choose a msgstr among the English values
 #. listed in the Choices field above, e.g. msgstr "nl (Dutch)".
-#: ../templates:1002 ../templates:5001
+#: ../templates:1002 ../templates:4001
 msgid "en (English)[ default language ]"
 msgstr "en (Angol)[ alapértelmezett nyelv ]"
 
@@ -277,31 +277,11 @@
 "messages."
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../templates:3001
-msgid "Gate news to mail?"
-msgstr ""
-
-#. Type: boolean
-#. 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."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates:3001
-msgid "Most people won't need this."
-msgstr "A legtöbb felhasználónak nincs szüksége erre."
-
 #  Type: note
 #  Description
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid "Missing site list"
 msgstr "Hiányzó site lista"
 
@@ -309,7 +289,7 @@
 #  Description
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid ""
 "Mailman needs a so-called \"site list\", which is the list from which "
 "password reminders and such are sent out from.  This list needs to be "
@@ -323,7 +303,7 @@
 #  Description
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid ""
 "To create the list, run \"newlist mailman\" and follow the instructions on-"
 "screen.  Note that you also need to start mailman after that, using /etc/"
@@ -335,13 +315,13 @@
 
 #. Type: select
 #. Description
-#: ../templates:5002
+#: ../templates:4002
 msgid "Default language for Mailman:"
 msgstr "Alapértelmezett nyelv a Mailman-ben:"
 
 #. Type: select
 #. Description
-#: ../templates:5002
+#: ../templates:4002
 msgid ""
 "The web page will be shown in this language, and in general, Mailman will "
 "use this language to communicate with the user."
@@ -351,25 +331,25 @@
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:5001
 msgid "abort installation"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:5001
 msgid "continue regardless"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 msgid "Old queue files present"
 msgstr "Régi queue állományok vannak"
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 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"
@@ -387,7 +367,7 @@
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 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 "
@@ -398,11 +378,14 @@
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 msgid ""
 "You have the option to continue installation regardless of this problem, at "
 "the risk of losing the messages in question or breaking your Mailman setup."
 msgstr ""
 
+#~ msgid "Most people won't need this."
+#~ msgstr "A legtöbb felhasználónak nincs szüksége erre."
+
 #~ msgid "big5 (Chinese big5)"
 #~ msgstr "big5 (Kínai big5)"

Modified: trunk/debian/po/it.po
===================================================================
--- trunk/debian/po/it.po	2011-10-08 14:58:55 UTC (rev 692)
+++ trunk/debian/po/it.po	2011-10-08 15:30:38 UTC (rev 693)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: mailman 2.1.11 italian debconf templates\n"
 "Report-Msgid-Bugs-To: mailman at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-02 22:08+0100\n"
+"POT-Creation-Date: 2011-10-08 15:13+0000\n"
 "PO-Revision-Date: 2008-12-29 11:17+0100\n"
 "Last-Translator: Luca Monducci <luca.mo at tiscali.it>\n"
 "Language-Team: Italian <debian-l10n-italian at lists.debian.org>\n"
@@ -228,7 +228,7 @@
 #. from the one in the Choices list; you do not have to worry about
 #. them, and have to simply choose a msgstr among the English values
 #. listed in the Choices field above, e.g. msgstr "nl (Dutch)".
-#: ../templates:1002 ../templates:5001
+#: ../templates:1002 ../templates:4001
 msgid "en (English)[ default language ]"
 msgstr "it (Italian)"
 
@@ -273,37 +273,15 @@
 "riattivate se deselezionate, mailman necessita almeno una lingua in cui "
 "mostrare i propri messaggi."
 
-#. Type: boolean
-#. Description
-#: ../templates:3001
-msgid "Gate news to mail?"
-msgstr "Trasformare news in email?"
-
-#. Type: boolean
-#. 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."
-msgstr ""
-"Mailman Ã¨ in grado di fare da ponte fra news ed email, cioÃ¨ inviare tutti i "
-"messaggi che appaiono in un newsgroup Usenet a una mailing list."
-
-#. Type: boolean
-#. Description
-#: ../templates:3001
-msgid "Most people won't need this."
-msgstr "Non serve alla maggior parte delle persone."
-
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid "Missing site list"
 msgstr "\"Site list\" mancante"
 
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid ""
 "Mailman needs a so-called \"site list\", which is the list from which "
 "password reminders and such are sent out from.  This list needs to be "
@@ -315,7 +293,7 @@
 
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid ""
 "To create the list, run \"newlist mailman\" and follow the instructions on-"
 "screen.  Note that you also need to start mailman after that, using /etc/"
@@ -327,13 +305,13 @@
 
 #. Type: select
 #. Description
-#: ../templates:5002
+#: ../templates:4002
 msgid "Default language for Mailman:"
 msgstr "Lingua predefinita per Mailman:"
 
 #. Type: select
 #. Description
-#: ../templates:5002
+#: ../templates:4002
 msgid ""
 "The web page will be shown in this language, and in general, Mailman will "
 "use this language to communicate with the user."
@@ -343,25 +321,25 @@
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:5001
 msgid "abort installation"
 msgstr "interrompi l'installazione"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:5001
 msgid "continue regardless"
 msgstr "continua ugualmente"
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 msgid "Old queue files present"
 msgstr "Vecchi file nella coda"
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 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"
@@ -392,7 +370,7 @@
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 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 "
@@ -409,7 +387,7 @@
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 msgid ""
 "You have the option to continue installation regardless of this problem, at "
 "the risk of losing the messages in question or breaking your Mailman setup."
@@ -417,3 +395,16 @@
 "Ãˆ possibile continuare l'installazione senza preoccuparsi di questo problema "
 "col rischio di perdere i messaggi in questione oppure interrompere la "
 "configurazione di Mailman."
+
+#~ msgid "Gate news to mail?"
+#~ msgstr "Trasformare news in email?"
+
+#~ msgid ""
+#~ "Mailman allows to gate news to mail, that is, send all the messages which "
+#~ "appear in a Usenet newsgroup to a mailing list."
+#~ msgstr ""
+#~ "Mailman Ã¨ in grado di fare da ponte fra news ed email, cioÃ¨ inviare tutti "
+#~ "i messaggi che appaiono in un newsgroup Usenet a una mailing list."
+
+#~ msgid "Most people won't need this."
+#~ msgstr "Non serve alla maggior parte delle persone."

Modified: trunk/debian/po/ja.po
===================================================================
--- trunk/debian/po/ja.po	2011-10-08 14:58:55 UTC (rev 692)
+++ trunk/debian/po/ja.po	2011-10-08 15:30:38 UTC (rev 693)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: mailman\n"
 "Report-Msgid-Bugs-To: mailman at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-02 22:08+0100\n"
+"POT-Creation-Date: 2011-10-08 15:13+0000\n"
 "PO-Revision-Date: 2008-12-28 21:29+0900\n"
 "Last-Translator: Kenshi Muto <kmuto at debian.org>\n"
 "Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
@@ -236,7 +236,7 @@
 #. from the one in the Choices list; you do not have to worry about
 #. them, and have to simply choose a msgstr among the English values
 #. listed in the Choices field above, e.g. msgstr "nl (Dutch)".
-#: ../templates:1002 ../templates:5001
+#: ../templates:1002 ../templates:4001
 msgid "en (English)[ default language ]"
 msgstr "ja (Japanese)"
 
@@ -282,37 +282,15 @@
 "åˆ¶çš„ã«å†åº¦æœ‰åŠ¹ã«ã•ã‚Œã¾ã™ã€‚ã¾ãŸã€mailman ã¯ã€ãã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’è¡¨ç¤ºã™ã‚‹ãŸã‚ã«å°‘"
 "ãªãã¨ã‚‚ 1 ã¤ã®è¨€èªžã‚’å¿…è¦ã¨ã—ã¾ã™ã€‚"
 
-#. Type: boolean
-#. Description
-#: ../templates:3001
-msgid "Gate news to mail?"
-msgstr "ãƒ‹ãƒ¥ãƒ¼ã‚¹ã‹ã‚‰ãƒ¡ãƒ¼ãƒ«ã¸ã‚²ãƒ¼ãƒˆã—ã¾ã™ã‹?"
-
-#. Type: boolean
-#. 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."
-msgstr ""
-"Mailman ã¯ãƒ‹ãƒ¥ãƒ¼ã‚¹ã‚’ãƒ¡ãƒ¼ãƒ«ã«ã‚²ãƒ¼ãƒˆã€ã¤ã¾ã‚Šã€Usenet ãƒ‹ãƒ¥ãƒ¼ã‚¹ã‚°ãƒ«ãƒ¼ãƒ—ã«æŠ•ç¨¿ã•ã‚Œ"
-"ãŸã™ã¹ã¦ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’ãƒ¡ãƒ¼ãƒªãƒ³ã‚°ãƒªã‚¹ãƒˆã«é€ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"
-
-#. Type: boolean
-#. Description
-#: ../templates:3001
-msgid "Most people won't need this."
-msgstr "ã»ã¨ã‚“ã©ã®äººã«ã¯ã“ã‚Œã¯å¿…è¦ã‚ã‚Šã¾ã›ã‚“ã€‚"
-
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid "Missing site list"
 msgstr "ã‚µã‚¤ãƒˆãƒªã‚¹ãƒˆãŒã‚ã‚Šã¾ã›ã‚“"
 
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid ""
 "Mailman needs a so-called \"site list\", which is the list from which "
 "password reminders and such are sent out from.  This list needs to be "
@@ -324,7 +302,7 @@
 
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid ""
 "To create the list, run \"newlist mailman\" and follow the instructions on-"
 "screen.  Note that you also need to start mailman after that, using /etc/"
@@ -336,13 +314,13 @@
 
 #. Type: select
 #. Description
-#: ../templates:5002
+#: ../templates:4002
 msgid "Default language for Mailman:"
 msgstr "Mailman ã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆè¨€èªž"
 
 #. Type: select
 #. Description
-#: ../templates:5002
+#: ../templates:4002
 msgid ""
 "The web page will be shown in this language, and in general, Mailman will "
 "use this language to communicate with the user."
@@ -352,25 +330,25 @@
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:5001
 msgid "abort installation"
 msgstr "ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ä¸æ¢"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:5001
 msgid "continue regardless"
 msgstr "ã‹ã¾ã‚ãšã«ç¶™ç¶š"
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 msgid "Old queue files present"
 msgstr "å¤ã„ã‚ãƒ¥ãƒ¼ãƒ•ã‚¡ã‚¤ãƒ«ãŒå˜åœ¨ã—ã¾ã™"
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 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"
@@ -401,7 +379,7 @@
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 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 "
@@ -417,10 +395,23 @@
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 msgid ""
 "You have the option to continue installation regardless of this problem, at "
 "the risk of losing the messages in question or breaking your Mailman setup."
 msgstr ""
 "è©²å½“ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’å¤±ã£ãŸã‚Š Mailman ã‚»ãƒƒãƒˆã‚¢ãƒƒãƒ—ã‚’å£Šã—ãŸã‚Šã¨ã„ã†ãƒªã‚¹ã‚¯ã¯ä»˜ãã¾ã™"
 "ãŒã€ã“ã®å•é¡Œã«ã‹ã¾ã‚ãšã«ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚’ç¶šã‘ã‚‹ã“ã¨ã‚’é¸æŠžå¯èƒ½ã§ã™ã€‚"
+
+#~ msgid "Gate news to mail?"
+#~ msgstr "ãƒ‹ãƒ¥ãƒ¼ã‚¹ã‹ã‚‰ãƒ¡ãƒ¼ãƒ«ã¸ã‚²ãƒ¼ãƒˆã—ã¾ã™ã‹?"
+
+#~ msgid ""
+#~ "Mailman allows to gate news to mail, that is, send all the messages which "
+#~ "appear in a Usenet newsgroup to a mailing list."
+#~ msgstr ""
+#~ "Mailman ã¯ãƒ‹ãƒ¥ãƒ¼ã‚¹ã‚’ãƒ¡ãƒ¼ãƒ«ã«ã‚²ãƒ¼ãƒˆã€ã¤ã¾ã‚Šã€Usenet ãƒ‹ãƒ¥ãƒ¼ã‚¹ã‚°ãƒ«ãƒ¼ãƒ—ã«æŠ•ç¨¿"
+#~ "ã•ã‚ŒãŸã™ã¹ã¦ã®ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’ãƒ¡ãƒ¼ãƒªãƒ³ã‚°ãƒªã‚¹ãƒˆã«é€ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚"
+
+#~ msgid "Most people won't need this."
+#~ msgstr "ã»ã¨ã‚“ã©ã®äººã«ã¯ã“ã‚Œã¯å¿…è¦ã‚ã‚Šã¾ã›ã‚“ã€‚"

Modified: trunk/debian/po/nl.po
===================================================================
--- trunk/debian/po/nl.po	2011-10-08 14:58:55 UTC (rev 692)
+++ trunk/debian/po/nl.po	2011-10-08 15:30:38 UTC (rev 693)
@@ -21,7 +21,7 @@
 msgstr ""
 "Project-Id-Version: mailman_1:2.1.9-0\n"
 "Report-Msgid-Bugs-To: mailman at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-02 22:08+0100\n"
+"POT-Creation-Date: 2011-10-08 15:13+0000\n"
 "PO-Revision-Date: 2008-12-27 15:16+0100\n"
 "Last-Translator: Thijs Kinkhorst <thijs at debian.org>\n"
 "Language-Team: Debian l10n Dutch <debian-l10n-dutch at lists.debian.org>\n"
@@ -242,7 +242,7 @@
 #. from the one in the Choices list; you do not have to worry about
 #. them, and have to simply choose a msgstr among the English values
 #. listed in the Choices field above, e.g. msgstr "nl (Dutch)".
-#: ../templates:1002 ../templates:5001
+#: ../templates:1002 ../templates:4001
 msgid "en (English)[ default language ]"
 msgstr "nl (Dutch)"
 
@@ -288,38 +288,15 @@
 "opnieuw geactiveerd indien u ze heeft uitgeschakeld; en mailman heeft ook "
 "ten minste Ã©Ã©n taal nodig om zijn boodschappen weer te geven."
 
-#. Type: boolean
-#. Description
-#: ../templates:3001
-msgid "Gate news to mail?"
-msgstr "Nieuws doorsluizen naar e-mail?"
-
-#. Type: boolean
-#. 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."
-msgstr ""
-"Mailman staat u toe nieuws door te sluizen naar e-mail, d.w.z. alle "
-"boodschappen die verschijnen in een nieuwsgroep verzenden naar een "
-"mailinglijst."
-
-#. Type: boolean
-#. Description
-#: ../templates:3001
-msgid "Most people won't need this."
-msgstr "De meeste mensen hebben dit niet nodig."
-
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid "Missing site list"
 msgstr "Ontbrekende site-lijst"
 
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid ""
 "Mailman needs a so-called \"site list\", which is the list from which "
 "password reminders and such are sent out from.  This list needs to be "
@@ -331,7 +308,7 @@
 
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid ""
 "To create the list, run \"newlist mailman\" and follow the instructions on-"
 "screen.  Note that you also need to start mailman after that, using /etc/"
@@ -343,13 +320,13 @@
 
 #. Type: select
 #. Description
-#: ../templates:5002
+#: ../templates:4002
 msgid "Default language for Mailman:"
 msgstr "Standaardtaal voor Mailman:"
 
 #. Type: select
 #. Description
-#: ../templates:5002
+#: ../templates:4002
 msgid ""
 "The web page will be shown in this language, and in general, Mailman will "
 "use this language to communicate with the user."
@@ -359,25 +336,25 @@
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:5001
 msgid "abort installation"
 msgstr "installatie afbreken"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:5001
 msgid "continue regardless"
 msgstr "desalniettemin doorgaan"
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 msgid "Old queue files present"
 msgstr "Oude wachtrij-bestanden zijn aanwezig"
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 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"
@@ -408,7 +385,7 @@
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 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 "
@@ -425,7 +402,7 @@
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 msgid ""
 "You have the option to continue installation regardless of this problem, at "
 "the risk of losing the messages in question or breaking your Mailman setup."
@@ -433,3 +410,17 @@
 "U kunt de installatie desalniettemin doorzetten. Hierbij loopt u het risico "
 "dat de betreffende berichten verloren gaan of dat uw Mailman-installatie "
 "stopt met werken."
+
+#~ msgid "Gate news to mail?"
+#~ msgstr "Nieuws doorsluizen naar e-mail?"
+
+#~ msgid ""
+#~ "Mailman allows to gate news to mail, that is, send all the messages which "
+#~ "appear in a Usenet newsgroup to a mailing list."
+#~ msgstr ""
+#~ "Mailman staat u toe nieuws door te sluizen naar e-mail, d.w.z. alle "
+#~ "boodschappen die verschijnen in een nieuwsgroep verzenden naar een "
+#~ "mailinglijst."
+
+#~ msgid "Most people won't need this."
+#~ msgstr "De meeste mensen hebben dit niet nodig."

Modified: trunk/debian/po/pt.po
===================================================================
--- trunk/debian/po/pt.po	2011-10-08 14:58:55 UTC (rev 692)
+++ trunk/debian/po/pt.po	2011-10-08 15:30:38 UTC (rev 693)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: mailman 2.1.9-5\n"
 "Report-Msgid-Bugs-To: mailman at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-02 22:08+0100\n"
+"POT-Creation-Date: 2011-10-08 15:13+0000\n"
 "PO-Revision-Date: 2008-12-28 10:31+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig at debianpt.org>\n"
 "Language-Team: Portuguese <traduz at debianpt.org>\n"
@@ -228,7 +228,7 @@
 #. from the one in the Choices list; you do not have to worry about
 #. them, and have to simply choose a msgstr among the English values
 #. listed in the Choices field above, e.g. msgstr "nl (Dutch)".
-#: ../templates:1002 ../templates:5001
+#: ../templates:1002 ../templates:4001
 msgid "en (English)[ default language ]"
 msgstr "pt (Portuguese)"
 
@@ -274,37 +274,15 @@
 "forÃ§adamente re-habilitados quando os deseleccionar e o mailman necessita de "
 "pelo menos um idioma para mostrar estas mensagens."
 
-#. Type: boolean
-#. Description
-#: ../templates:3001
-msgid "Gate news to mail?"
-msgstr "Redireccionar as news para o e-mail?"
-
-#. Type: boolean
-#. 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."
-msgstr ""
-"O Mailman permite redireccionar as news para o e-mail, isto Ã©, enviar todas "
-"as mensagens que aparecem num newsgroup Usenet para a lista de correio."
-
-#. Type: boolean
-#. Description
-#: ../templates:3001
-msgid "Most people won't need this."
-msgstr "A maioria das pessoas nÃ£o necessitarÃ¡ disto."
-
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid "Missing site list"
 msgstr "Falta lista de site"
 
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid ""
 "Mailman needs a so-called \"site list\", which is the list from which "
 "password reminders and such are sent out from.  This list needs to be "
@@ -316,7 +294,7 @@
 
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid ""
 "To create the list, run \"newlist mailman\" and follow the instructions on-"
 "screen.  Note that you also need to start mailman after that, using /etc/"
@@ -328,13 +306,13 @@
 
 #. Type: select
 #. Description
-#: ../templates:5002
+#: ../templates:4002
 msgid "Default language for Mailman:"
 msgstr "Idioma por omissÃ£o para o Mailman:"
 
 #. Type: select
 #. Description
-#: ../templates:5002
+#: ../templates:4002
 msgid ""
 "The web page will be shown in this language, and in general, Mailman will "
 "use this language to communicate with the user."
@@ -344,25 +322,25 @@
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:5001
 msgid "abort installation"
 msgstr "abortar a instalaÃ§Ã£o"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:5001
 msgid "continue regardless"
 msgstr "continuar de qualquer forma"
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 msgid "Old queue files present"
 msgstr "EstÃ£o presentes ficheiros da fila antiga"
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 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"
@@ -393,7 +371,7 @@
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 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 "
@@ -410,7 +388,7 @@
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 msgid ""
 "You have the option to continue installation regardless of this problem, at "
 "the risk of losing the messages in question or breaking your Mailman setup."
@@ -418,3 +396,17 @@
 "Tem a opÃ§Ã£o de continuar a instalaÃ§Ã£o independentemente deste problema, com "
 "o risco de perder as mensagens em questÃ£o ou estragar a configuraÃ§Ã£o do seu "
 "Mailman."
+
+#~ msgid "Gate news to mail?"
+#~ msgstr "Redireccionar as news para o e-mail?"
+
+#~ msgid ""
+#~ "Mailman allows to gate news to mail, that is, send all the messages which "
+#~ "appear in a Usenet newsgroup to a mailing list."
+#~ msgstr ""
+#~ "O Mailman permite redireccionar as news para o e-mail, isto Ã©, enviar "
+#~ "todas as mensagens que aparecem num newsgroup Usenet para a lista de "
+#~ "correio."
+
+#~ msgid "Most people won't need this."
+#~ msgstr "A maioria das pessoas nÃ£o necessitarÃ¡ disto."

Modified: trunk/debian/po/pt_BR.po
===================================================================
--- trunk/debian/po/pt_BR.po	2011-10-08 14:58:55 UTC (rev 692)
+++ trunk/debian/po/pt_BR.po	2011-10-08 15:30:38 UTC (rev 693)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: mailman_2.1.3-2\n"
 "Report-Msgid-Bugs-To: mailman at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-02 22:08+0100\n"
+"POT-Creation-Date: 2011-10-08 15:13+0000\n"
 "PO-Revision-Date: 2006-10-16 00:53-0200\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"
@@ -236,7 +236,7 @@
 #. from the one in the Choices list; you do not have to worry about
 #. them, and have to simply choose a msgstr among the English values
 #. listed in the Choices field above, e.g. msgstr "nl (Dutch)".
-#: ../templates:1002 ../templates:5001
+#: ../templates:1002 ../templates:4001
 msgid "en (English)[ default language ]"
 msgstr "pt_BR (PortuguÃªs Brasileiro):"
 
@@ -282,38 +282,15 @@
 "forÃ§adamente reabilitados quando deselecionados e o mailman precisa de pelo "
 "menos um idioma para exibir suas mensagens."
 
-#. Type: boolean
-#. Description
-#: ../templates:3001
-msgid "Gate news to mail?"
-msgstr "LigaÃ§Ã£o notÃcias para mensagens ?"
-
-#. Type: boolean
-#. 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."
-msgstr ""
-"O Mailman permite uma ligaÃ§Ã£o notÃcias (news) para mensagens, ou seja. envia "
-"todas as mensagens que aparecerem em um grupo de notÃcias Usenet para uma "
-"lista de discussÃ£o."
-
-#. Type: boolean
-#. Description
-#: ../templates:3001
-msgid "Most people won't need this."
-msgstr "A maioria das pessoas nÃ£o precisarÃ¡ disso."
-
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid "Missing site list"
 msgstr "Site list faltando"
 
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid ""
 "Mailman needs a so-called \"site list\", which is the list from which "
 "password reminders and such are sent out from.  This list needs to be "
@@ -325,7 +302,7 @@
 
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid ""
 "To create the list, run \"newlist mailman\" and follow the instructions on-"
 "screen.  Note that you also need to start mailman after that, using /etc/"
@@ -337,13 +314,13 @@
 
 #. Type: select
 #. Description
-#: ../templates:5002
+#: ../templates:4002
 msgid "Default language for Mailman:"
 msgstr "Idioma padrÃ£o para o Mailman:"
 
 #. Type: select
 #. Description
-#: ../templates:5002
+#: ../templates:4002
 msgid ""
 "The web page will be shown in this language, and in general, Mailman will "
 "use this language to communicate with the user."
@@ -353,25 +330,25 @@
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:5001
 msgid "abort installation"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:5001
 msgid "continue regardless"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 msgid "Old queue files present"
 msgstr "Arquivos de fila antigos presentes"
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 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"
@@ -402,7 +379,7 @@
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 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 "
@@ -419,8 +396,22 @@
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 msgid ""
 "You have the option to continue installation regardless of this problem, at "
 "the risk of losing the messages in question or breaking your Mailman setup."
 msgstr ""
+
+#~ msgid "Gate news to mail?"
+#~ msgstr "LigaÃ§Ã£o notÃcias para mensagens ?"
+
+#~ msgid ""
+#~ "Mailman allows to gate news to mail, that is, send all the messages which "
+#~ "appear in a Usenet newsgroup to a mailing list."
+#~ msgstr ""
+#~ "O Mailman permite uma ligaÃ§Ã£o notÃcias (news) para mensagens, ou seja. "
+#~ "envia todas as mensagens que aparecerem em um grupo de notÃcias Usenet "
+#~ "para uma lista de discussÃ£o."
+
+#~ msgid "Most people won't need this."
+#~ msgstr "A maioria das pessoas nÃ£o precisarÃ¡ disso."

Modified: trunk/debian/po/ru.po
===================================================================
--- trunk/debian/po/ru.po	2011-10-08 14:58:55 UTC (rev 692)
+++ trunk/debian/po/ru.po	2011-10-08 15:30:38 UTC (rev 693)
@@ -17,7 +17,7 @@
 msgstr ""
 "Project-Id-Version: mailman_1:2.1.11-8\n"
 "Report-Msgid-Bugs-To: mailman at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-02 22:08+0100\n"
+"POT-Creation-Date: 2011-10-08 15:13+0000\n"
 "PO-Revision-Date: 2008-12-27 22:22+0300\n"
 "Last-Translator: Sergey Alyoshin <alyoshin.s at gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian at lists.debian.org>\n"
@@ -241,7 +241,7 @@
 #. from the one in the Choices list; you do not have to worry about
 #. them, and have to simply choose a msgstr among the English values
 #. listed in the Choices field above, e.g. msgstr "nl (Dutch)".
-#: ../templates:1002 ../templates:5001
+#: ../templates:1002 ../templates:4001
 msgid "en (English)[ default language ]"
 msgstr "ru (Russian)"
 
@@ -287,38 +287,15 @@
 "Ð¾Ñ‚Ð¼ÐµÑ‡ÐµÐ½Ñ‹ Ð² ÑÑƒÑ‰ÐµÑÑ‚Ð²ÑƒÑŽÑ‰Ð¸Ñ… ÑÐ¿Ð¸ÑÐºÐ°Ñ… Ñ€Ð°ÑÑÑ‹Ð»ÐºÐ¸, Ð¸ Mailman Ñ‚Ñ€ÐµÐ±ÑƒÐµÑ‚ Ð¿Ð¾ ÐºÑ€Ð°Ð¹Ð½ÐµÐ¹ Ð¼ÐµÑ€Ðµ "
 "Ð¾Ð´Ð¸Ð½ ÑÐ·Ñ‹Ðº Ð´Ð»Ñ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ ÑÐ²Ð¾Ð¸Ñ… ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ð¹."
 
-#. Type: boolean
-#. Description
-#: ../templates:3001
-msgid "Gate news to mail?"
-msgstr "Ð¨Ð»ÑŽÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð½Ð¾Ð²Ð¾ÑÑ‚Ð¸ Ð² Ð¿Ð¾Ñ‡Ñ‚Ñƒ?"
-
-#. Type: boolean
-#. 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."
-msgstr ""
-"Mailman Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÐµÑ‚ ÑˆÐ»ÑŽÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð½Ð¾Ð²Ð¾ÑÑ‚Ð¸ Ð² Ð¿Ð¾Ñ‡Ñ‚Ñƒ, Ñ‚Ð¾ ÐµÑÑ‚ÑŒ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð»ÑÑ‚ÑŒ Ð²ÑÐµ "
-"ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð¿Ñ€Ð¸Ñ…Ð¾Ð´ÑÑ‚ Ð¸Ð· Ð³Ñ€ÑƒÐ¿Ð¿ Ð½Ð¾Ð²Ð¾ÑÑ‚ÐµÐ¹ Usenet, Ð² ÑÐ¿Ð¸ÑÐ¾Ðº Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ð¾Ð¹ "
-"Ñ€Ð°ÑÑÑ‹Ð»ÐºÐ¸."
-
-#. Type: boolean
-#. Description
-#: ../templates:3001
-msgid "Most people won't need this."
-msgstr "Ð‘Ð¾Ð»ÑŒÑˆÐ¸Ð½ÑÑ‚Ð²Ñƒ Ð»ÑŽÐ´ÐµÐ¹ ÑÑ‚Ð¾ Ð½Ðµ Ð½ÑƒÐ¶Ð½Ð¾."
-
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid "Missing site list"
 msgstr "ÐžÑ‚ÑÑƒÑ‚ÑÑ‚Ð²ÑƒÐµÑ‚ ÑÐ¿Ð¸ÑÐ¾Ðº Ñ€Ð°ÑÑÑ‹Ð»ÐºÐ¸ ÑÐ°Ð¹Ñ‚Ð°"
 
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid ""
 "Mailman needs a so-called \"site list\", which is the list from which "
 "password reminders and such are sent out from.  This list needs to be "
@@ -330,7 +307,7 @@
 
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid ""
 "To create the list, run \"newlist mailman\" and follow the instructions on-"
 "screen.  Note that you also need to start mailman after that, using /etc/"
@@ -342,13 +319,13 @@
 
 #. Type: select
 #. Description
-#: ../templates:5002
+#: ../templates:4002
 msgid "Default language for Mailman:"
 msgstr "Ð¯Ð·Ñ‹Ðº Ð¿Ð¾ ÑƒÐ¼Ð¾Ð»Ñ‡Ð°Ð½Ð¸ÑŽ Ð´Ð»Ñ Mailman:"
 
 #. Type: select
 #. Description
-#: ../templates:5002
+#: ../templates:4002
 msgid ""
 "The web page will be shown in this language, and in general, Mailman will "
 "use this language to communicate with the user."
@@ -358,25 +335,25 @@
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:5001
 msgid "abort installation"
 msgstr "Ð¿Ñ€ÐµÑ€Ð²Ð°Ñ‚ÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÑƒ"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:5001
 msgid "continue regardless"
 msgstr "Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ"
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 msgid "Old queue files present"
 msgstr "ÐÐ°Ð¹Ð´ÐµÐ½Ñ‹ ÑÑ‚Ð°Ñ€Ñ‹Ðµ Ñ„Ð°Ð¹Ð»Ñ‹ Ð¾Ñ‡ÐµÑ€ÐµÐ´Ð¸"
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 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"
@@ -407,7 +384,7 @@
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 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 "
@@ -424,10 +401,24 @@
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 msgid ""
 "You have the option to continue installation regardless of this problem, at "
 "the risk of losing the messages in question or breaking your Mailman setup."
 msgstr ""
 "Ð£ Ð²Ð°Ñ ÐµÑÑ‚ÑŒ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑ‚ÑŒ, Ð½Ðµ ÑÐ¼Ð¾Ñ‚Ñ€Ñ Ð½Ð° ÑÑ‚Ñƒ Ð¿Ñ€Ð¾Ð±Ð»ÐµÐ¼Ñƒ, Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶Ð¸Ñ‚ÑŒ ÑƒÑÑ‚Ð°Ð½Ð¾Ð²ÐºÑƒ, "
 "Ñ€Ð¸ÑÐºÑƒÑ Ð¿Ð¾Ñ‚ÐµÑ€ÑÑ‚ÑŒ ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð² Ð²Ð¾Ð¿Ñ€Ð¾ÑÐ°Ñ… Ð¸Ð»Ð¸ ÑÐ»Ð¾Ð¼Ð°Ñ‚ÑŒ Ð²Ð°ÑˆÑƒ Ð½Ð°ÑÑ‚Ñ€Ð¾Ð¹ÐºÑƒ Mailman."
+
+#~ msgid "Gate news to mail?"
+#~ msgstr "Ð¨Ð»ÑŽÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð½Ð¾Ð²Ð¾ÑÑ‚Ð¸ Ð² Ð¿Ð¾Ñ‡Ñ‚Ñƒ?"
+
+#~ msgid ""
+#~ "Mailman allows to gate news to mail, that is, send all the messages which "
+#~ "appear in a Usenet newsgroup to a mailing list."
+#~ msgstr ""
+#~ "Mailman Ð¿Ð¾Ð·Ð²Ð¾Ð»ÑÐµÑ‚ ÑˆÐ»ÑŽÐ·Ð¾Ð²Ð°Ñ‚ÑŒ Ð½Ð¾Ð²Ð¾ÑÑ‚Ð¸ Ð² Ð¿Ð¾Ñ‡Ñ‚Ñƒ, Ñ‚Ð¾ ÐµÑÑ‚ÑŒ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²Ð»ÑÑ‚ÑŒ Ð²ÑÐµ "
+#~ "ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ, ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ðµ Ð¿Ñ€Ð¸Ñ…Ð¾Ð´ÑÑ‚ Ð¸Ð· Ð³Ñ€ÑƒÐ¿Ð¿ Ð½Ð¾Ð²Ð¾ÑÑ‚ÐµÐ¹ Usenet, Ð² ÑÐ¿Ð¸ÑÐ¾Ðº Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ð¾Ð¹ "
+#~ "Ñ€Ð°ÑÑÑ‹Ð»ÐºÐ¸."
+
+#~ msgid "Most people won't need this."
+#~ msgstr "Ð‘Ð¾Ð»ÑŒÑˆÐ¸Ð½ÑÑ‚Ð²Ñƒ Ð»ÑŽÐ´ÐµÐ¹ ÑÑ‚Ð¾ Ð½Ðµ Ð½ÑƒÐ¶Ð½Ð¾."

Modified: trunk/debian/po/sk.po
===================================================================
--- trunk/debian/po/sk.po	2011-10-08 14:58:55 UTC (rev 692)
+++ trunk/debian/po/sk.po	2011-10-08 15:30:38 UTC (rev 693)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: mailman at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-02 22:08+0100\n"
+"POT-Creation-Date: 2011-10-08 15:13+0000\n"
 "PO-Revision-Date: 2009-06-02 16:13+0100\n"
 "Last-Translator: Ivan MasÃ¡r <helix84 at centrum.sk>\n"
 "Language-Team: Slovak <sk-i18n at lists.linux.sk>\n"
@@ -228,7 +228,7 @@
 #. from the one in the Choices list; you do not have to worry about
 #. them, and have to simply choose a msgstr among the English values
 #. listed in the Choices field above, e.g. msgstr "nl (Dutch)".
-#: ../templates:1002 ../templates:5001
+#: ../templates:1002 ../templates:4001
 msgid "en (English)[ default language ]"
 msgstr "en (angliÄtina)[ predvolenÃ½ jazyk ]"
 
@@ -274,37 +274,15 @@
 "jeÄ je ich vÃ½ber zruÅ¡enÃ½ a mailman potrebuje aspoÅˆ jeden jazyk na zobrazenie "
 "svojich sprÃ¡v."
 
-#. Type: boolean
-#. Description
-#: ../templates:3001
-msgid "Gate news to mail?"
-msgstr "BrÃ¡na news (nntp) na poÅ¡tu?"
-
-#. Type: boolean
-#. 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."
-msgstr ""
-"Mailman umoÅ¾Åˆuje prekladaÅ¥ novinky na poÅ¡tu, t.j. posielaÅ¥ vÅ¡etky sprÃ¡vy, "
-"ktorÃ© sa objavia v UsenetovÃ½ch skupinÃ¡ch do konferencie."
-
-#. Type: boolean
-#. Description
-#: ../templates:3001
-msgid "Most people won't need this."
-msgstr "VÃ¤ÄÅ¡ina Ä¾udÃ to nebude potrebovaÅ¥."
-
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid "Missing site list"
 msgstr "ChÃ½ba konferencia lokality"
 
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid ""
 "Mailman needs a so-called \"site list\", which is the list from which "
 "password reminders and such are sent out from.  This list needs to be "
@@ -316,7 +294,7 @@
 
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid ""
 "To create the list, run \"newlist mailman\" and follow the instructions on-"
 "screen.  Note that you also need to start mailman after that, using /etc/"
@@ -328,13 +306,13 @@
 
 #. Type: select
 #. Description
-#: ../templates:5002
+#: ../templates:4002
 msgid "Default language for Mailman:"
 msgstr "PredvolenÃ½ jazyk pre Mailman:"
 
 #. Type: select
 #. Description
-#: ../templates:5002
+#: ../templates:4002
 msgid ""
 "The web page will be shown in this language, and in general, Mailman will "
 "use this language to communicate with the user."
@@ -344,25 +322,25 @@
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:5001
 msgid "abort installation"
 msgstr "zruÅ¡iÅ¥ inÅ¡talÃ¡ciu"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:5001
 msgid "continue regardless"
 msgstr "pokraÄovaÅ¥ napriek tomu"
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 msgid "Old queue files present"
 msgstr "SÃº prÃtomnÃ© starÃ© sÃºbory frontu"
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 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"
@@ -392,7 +370,7 @@
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 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 "
@@ -408,7 +386,7 @@
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 msgid ""
 "You have the option to continue installation regardless of this problem, at "
 "the risk of losing the messages in question or breaking your Mailman setup."
@@ -416,3 +394,16 @@
 "MÃ¡te moÅ¾nosÅ¥ pokraÄovaÅ¥ v inÅ¡talÃ¡cii bez ohÄ¾adu na tento problÃ©m, priÄom "
 "vÅ¡ak riskujete stratu dotyÄnÃ½ch sprÃ¡v alebo poÅ¡kodenie svojej konfigurÃ¡cie "
 "Mailmanu."
+
+#~ msgid "Gate news to mail?"
+#~ msgstr "BrÃ¡na news (nntp) na poÅ¡tu?"
+
+#~ msgid ""
+#~ "Mailman allows to gate news to mail, that is, send all the messages which "
+#~ "appear in a Usenet newsgroup to a mailing list."
+#~ msgstr ""
+#~ "Mailman umoÅ¾Åˆuje prekladaÅ¥ novinky na poÅ¡tu, t.j. posielaÅ¥ vÅ¡etky sprÃ¡vy, "
+#~ "ktorÃ© sa objavia v UsenetovÃ½ch skupinÃ¡ch do konferencie."
+
+#~ msgid "Most people won't need this."
+#~ msgstr "VÃ¤ÄÅ¡ina Ä¾udÃ to nebude potrebovaÅ¥."

Modified: trunk/debian/po/sv.po
===================================================================
--- trunk/debian/po/sv.po	2011-10-08 14:58:55 UTC (rev 692)
+++ trunk/debian/po/sv.po	2011-10-08 15:30:38 UTC (rev 693)
@@ -15,7 +15,7 @@
 msgstr ""
 "Project-Id-Version: mailman\n"
 "Report-Msgid-Bugs-To: mailman at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-02 22:08+0100\n"
+"POT-Creation-Date: 2011-10-08 15:13+0000\n"
 "PO-Revision-Date: 2008-12-31 00:01+0100\n"
 "Last-Translator: Martin Bagge <brother at bsnet.se>\n"
 "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
@@ -236,7 +236,7 @@
 #. from the one in the Choices list; you do not have to worry about
 #. them, and have to simply choose a msgstr among the English values
 #. listed in the Choices field above, e.g. msgstr "nl (Dutch)".
-#: ../templates:1002 ../templates:5001
+#: ../templates:1002 ../templates:4001
 msgid "en (English)[ default language ]"
 msgstr "sv (Swedish)"
 
@@ -282,37 +282,15 @@
 "återaktiveras när de avmarkeras och mailman behöver åtminstone ett språk för "
 "att visa sina meddelanden."
 
-#. Type: boolean
-#. Description
-#: ../templates:3001
-msgid "Gate news to mail?"
-msgstr "Hantera nyhetsgrupper till sändlistor?"
-
-#. Type: boolean
-#. 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."
-msgstr ""
-"Mailman tillåter att sända nyhetsgrupper till sändlistor, alltså, skicka "
-"alla meddelanden som dyker upp i en Usenet-nyhetsgrupp till en sändlista."
-
-#. Type: boolean
-#. Description
-#: ../templates:3001
-msgid "Most people won't need this."
-msgstr "De flesta kommer inte att behöva detta."
-
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid "Missing site list"
 msgstr "Saknad \"site list\""
 
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid ""
 "Mailman needs a so-called \"site list\", which is the list from which "
 "password reminders and such are sent out from.  This list needs to be "
@@ -324,7 +302,7 @@
 
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid ""
 "To create the list, run \"newlist mailman\" and follow the instructions on-"
 "screen.  Note that you also need to start mailman after that, using /etc/"
@@ -336,13 +314,13 @@
 
 #. Type: select
 #. Description
-#: ../templates:5002
+#: ../templates:4002
 msgid "Default language for Mailman:"
 msgstr "Standardspråk för Mailman:"
 
 #. Type: select
 #. Description
-#: ../templates:5002
+#: ../templates:4002
 msgid ""
 "The web page will be shown in this language, and in general, Mailman will "
 "use this language to communicate with the user."
@@ -352,25 +330,25 @@
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:5001
 msgid "abort installation"
 msgstr "avbryt installationen"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:5001
 msgid "continue regardless"
 msgstr "fortsätt installationen"
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 msgid "Old queue files present"
 msgstr "Gamla köfiler existerar"
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 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"
@@ -401,7 +379,7 @@
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 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 "
@@ -418,7 +396,7 @@
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 msgid ""
 "You have the option to continue installation regardless of this problem, at "
 "the risk of losing the messages in question or breaking your Mailman setup."
@@ -426,6 +404,19 @@
 "Du kan fortsätta med installationen oberoende av dessa risker. Tänk dock på "
 "att e-post kan försvinna och din installation av Mailman kan skadas."
 
+#~ msgid "Gate news to mail?"
+#~ msgstr "Hantera nyhetsgrupper till sändlistor?"
+
+#~ msgid ""
+#~ "Mailman allows to gate news to mail, that is, send all the messages which "
+#~ "appear in a Usenet newsgroup to a mailing list."
+#~ msgstr ""
+#~ "Mailman tillåter att sända nyhetsgrupper till sändlistor, alltså, skicka "
+#~ "alla meddelanden som dyker upp i en Usenet-nyhetsgrupp till en sändlista."
+
+#~ msgid "Most people won't need this."
+#~ msgstr "De flesta kommer inte att behöva detta."
+
 #~ msgid "big5 (Chinese big5)"
 #~ msgstr "big5 (Kinesiska big5)"
 

Modified: trunk/debian/po/templates.pot
===================================================================
--- trunk/debian/po/templates.pot	2011-10-08 14:58:55 UTC (rev 692)
+++ trunk/debian/po/templates.pot	2011-10-08 15:30:38 UTC (rev 693)
@@ -8,10 +8,11 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: mailman at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-02 22:08+0100\n"
+"POT-Creation-Date: 2011-10-08 15:13+0000\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -228,7 +229,7 @@
 #. from the one in the Choices list; you do not have to worry about
 #. them, and have to simply choose a msgstr among the English values
 #. listed in the Choices field above, e.g. msgstr "nl (Dutch)".
-#: ../templates:1002 ../templates:5001
+#: ../templates:1002 ../templates:4001
 msgid "en (English)[ default language ]"
 msgstr ""
 
@@ -265,35 +266,15 @@
 "messages."
 msgstr ""
 
-#. Type: boolean
-#. Description
-#: ../templates:3001
-msgid "Gate news to mail?"
-msgstr ""
-
-#. Type: boolean
-#. 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."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates:3001
-msgid "Most people won't need this."
-msgstr ""
-
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid "Missing site list"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid ""
 "Mailman needs a so-called \"site list\", which is the list from which "
 "password reminders and such are sent out from.  This list needs to be "
@@ -302,7 +283,7 @@
 
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid ""
 "To create the list, run \"newlist mailman\" and follow the instructions on-"
 "screen.  Note that you also need to start mailman after that, using /etc/"
@@ -311,13 +292,13 @@
 
 #. Type: select
 #. Description
-#: ../templates:5002
+#: ../templates:4002
 msgid "Default language for Mailman:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../templates:5002
+#: ../templates:4002
 msgid ""
 "The web page will be shown in this language, and in general, Mailman will "
 "use this language to communicate with the user."
@@ -325,25 +306,25 @@
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:5001
 msgid "abort installation"
 msgstr ""
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:5001
 msgid "continue regardless"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 msgid "Old queue files present"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 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"
@@ -361,7 +342,7 @@
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 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 "
@@ -372,7 +353,7 @@
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 msgid ""
 "You have the option to continue installation regardless of this problem, at "
 "the risk of losing the messages in question or breaking your Mailman setup."

Modified: trunk/debian/po/vi.po
===================================================================
--- trunk/debian/po/vi.po	2011-10-08 14:58:55 UTC (rev 692)
+++ trunk/debian/po/vi.po	2011-10-08 15:30:38 UTC (rev 693)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: mailman 1:2.1.11-9\n"
 "Report-Msgid-Bugs-To: mailman at packages.debian.org\n"
-"POT-Creation-Date: 2009-03-02 22:08+0100\n"
+"POT-Creation-Date: 2011-10-08 15:13+0000\n"
 "PO-Revision-Date: 2009-01-26 22:23+1030\n"
 "Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
@@ -229,7 +229,7 @@
 #. from the one in the Choices list; you do not have to worry about
 #. them, and have to simply choose a msgstr among the English values
 #. listed in the Choices field above, e.g. msgstr "nl (Dutch)".
-#: ../templates:1002 ../templates:5001
+#: ../templates:1002 ../templates:4001
 msgid "en (English)[ default language ]"
 msgstr "vi (Vietnamese)"
 
@@ -275,37 +275,15 @@
 "hiá»‡u lá»±c láº¡i má»™t cÃ¡ch Ã©p buá»™c khi bá»‹ bá» chá»n. HÆ¡n ná»¯a, trÃ¬nh Mailman cáº§n "
 "thiáº¿t Ãt nháº¥t má»™t ngÃ´n ngá»¯ Ä‘á»ƒ hiá»ƒn thá»‹ thÃ´ng Ä‘iá»‡p."
 
-#. Type: boolean
-#. Description
-#: ../templates:3001
-msgid "Gate news to mail?"
-msgstr "Chuyá»ƒn tiáº¿p tin tá»©c tá»›i thÆ° ?"
-
-#. Type: boolean
-#. 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."
-msgstr ""
-"TrÃ¬nh Mailman cho báº¡n cÃ³ kháº£ nÄƒng chuyá»ƒn tiáº¿p tin tá»©c tá»›i thÆ°, tá»©c lÃ  gá»i "
-"má»i bÃ i tin xuáº¥t hiá»‡n trong nhÃ³m tin Usenet cho há»™p thÆ° chung Ä‘Ã£ chá»n."
-
-#. Type: boolean
-#. Description
-#: ../templates:3001
-msgid "Most people won't need this."
-msgstr "Pháº§n lá»›n ngÆ°á»i khÃ´ng cáº§n tÃnh nÄƒng nÃ y."
-
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid "Missing site list"
 msgstr "Thiáº¿u danh sÃ¡ch Ä‘á»‹a chá»‰ Web"
 
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid ""
 "Mailman needs a so-called \"site list\", which is the list from which "
 "password reminders and such are sent out from.  This list needs to be "
@@ -317,7 +295,7 @@
 
 #. Type: note
 #. Description
-#: ../templates:4001
+#: ../templates:3001
 msgid ""
 "To create the list, run \"newlist mailman\" and follow the instructions on-"
 "screen.  Note that you also need to start mailman after that, using /etc/"
@@ -329,13 +307,13 @@
 
 #. Type: select
 #. Description
-#: ../templates:5002
+#: ../templates:4002
 msgid "Default language for Mailman:"
 msgstr "NgÃ´n ngá»¯ máº·c Ä‘á»‹nh cho Mailman:"
 
 #. Type: select
 #. Description
-#: ../templates:5002
+#: ../templates:4002
 msgid ""
 "The web page will be shown in this language, and in general, Mailman will "
 "use this language to communicate with the user."
@@ -345,25 +323,25 @@
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:5001
 msgid "abort installation"
 msgstr "há»§y bá» tiáº¿n trÃ¬nh cÃ i Ä‘áº·t"
 
 #. Type: select
 #. Choices
-#: ../templates:6001
+#: ../templates:5001
 msgid "continue regardless"
 msgstr "tiáº¿p tá»¥c báº¥t cháº¥p"
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 msgid "Old queue files present"
 msgstr "CÃ³ táºp tin hÃ ng Ä‘á»£i cÅ©"
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 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"
@@ -394,7 +372,7 @@
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 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 "
@@ -411,10 +389,23 @@
 
 #. Type: select
 #. Description
-#: ../templates:6002
+#: ../templates:5002
 msgid ""
 "You have the option to continue installation regardless of this problem, at "
 "the risk of losing the messages in question or breaking your Mailman setup."
 msgstr ""
 "Báº¡n cÃ³ tÃ¹y chá»n tiáº¿p tá»¥c tiáº¿n trÃ¬nh cÃ i Ä‘áº·t báº¥t cháº¥p váº¥n Ä‘á» nÃ y mÃ  cÅ©ng gáº·p "
 "nguy hiá»ƒm máº¥t nhá»¯ng thÆ° liÃªn quan hoáº·c phÃ¡ vá»¡ thiáº¿t láºp Mailman."
+
+#~ msgid "Gate news to mail?"
+#~ msgstr "Chuyá»ƒn tiáº¿p tin tá»©c tá»›i thÆ° ?"
+
+#~ msgid ""
+#~ "Mailman allows to gate news to mail, that is, send all the messages which "
+#~ "appear in a Usenet newsgroup to a mailing list."
+#~ msgstr ""
+#~ "TrÃ¬nh Mailman cho báº¡n cÃ³ kháº£ nÄƒng chuyá»ƒn tiáº¿p tin tá»©c tá»›i thÆ°, tá»©c lÃ  gá»i "
+#~ "má»i bÃ i tin xuáº¥t hiá»‡n trong nhÃ³m tin Usenet cho há»™p thÆ° chung Ä‘Ã£ chá»n."
+
+#~ msgid "Most people won't need this."
+#~ msgstr "Pháº§n lá»›n ngÆ°á»i khÃ´ng cáº§n tÃnh nÄƒng nÃ y."

Modified: trunk/debian/postinst
===================================================================
--- trunk/debian/postinst	2011-10-08 14:58:55 UTC (rev 692)
+++ trunk/debian/postinst	2011-10-08 15:30:38 UTC (rev 693)
@@ -93,51 +93,6 @@
     # Install postfix-to-mailman.py as well
     ucf --debconf-ok --three-way ${mm_dist}/postfix-to-mailman.py ${mm_etc}/postfix-to-mailman.py 2>/dev/null
 
-    # Configure Mailman crontab
-
-    # Ensure the file exists before we awk it.
-    if [ ! -f /etc/cron.d/mailman ]; then
-    cat > /etc/cron.d/mailman <<EOF
-# At 8AM every day, mail reminders to admins as to pending requests.
-# They are less likely to ignore these reminders if they're mailed
-# early in the morning, but of course, this is local time... ;)
-0 8 * * * list [ -x /usr/lib/mailman/cron/checkdbs ] && /usr/lib/mailman/cron/checkdbs
-#
-# At 9AM, send notifications to disabled members that are due to be
-# reminded to re-enable their accounts.
-0 9 * * * list [ -x /usr/lib/mailman/cron/disabled ] && /usr/lib/mailman/cron/disabled
-#
-# Noon, mail digests for lists that do periodic as well as threshold delivery.
-0 12 * * * list [ -x /usr/lib/mailman/cron/senddigests ] && /usr/lib/mailman/cron/senddigests
-#
-# 5 AM on the first of each month, mail out password reminders.
-0 5 1 * * list [ -x /usr/lib/mailman/cron/mailpasswds ] && /usr/lib/mailman/cron/mailpasswds
-#
-# Every 5 mins, try to gate news to mail.  You can comment this one out
-# if you don't want to allow gating, or don't have any going on right now,
-# or want to exclusively use a callback strategy instead of polling.
-# */5 * * * * list [ -x /usr/lib/mailman/cron/gate_news ] && /usr/lib/mailman/cron/gate_news
-#
-# At 3:27am every night, regenerate the gzip'd archive file.  Only
-# turn this on if the internal archiver is used and
-# GZIP_ARCHIVE_TXT_FILES is false in mm_cfg.py
-27 3 * * * list [ -x /usr/lib/mailman/cron/nightly_gzip ] && /usr/lib/mailman/cron/nightly_gzip
-#
-# At 4:30AM daily, cull old entries from the 'bad' and 'shunt' queues.
-30 4 * * * list [ -x /usr/lib/mailman/cron/cull_bad_shunt ] && /usr/lib/mailman/cron/cull_bad_shunt
-EOF
-    fi
-
-    db_get mailman/gate_news || true
-    if [ "$RET" = "false" ]; then
-	# Comment out any lines containing the words "gate_news"
-	awk '/^[^#]*gate_news/ { print "# " $LINE;next }; //' < /etc/cron.d/mailman > /etc/cron.d/mailman.$$
-    else
-	# Remove commenting of any lines containing gate_news
-	awk '/^[ \t]*#.*gate_news/ { sub(/^[ \t]*#[ \t]*/, ""); print; next }; //' < /etc/cron.d/mailman > /etc/cron.d/mailman.$$
-    fi
-    mv -f /etc/cron.d/mailman.$$ /etc/cron.d/mailman
-
     if [ -e /etc/mailman/mm_cfg.py ]; then
         db_get mailman/default_server_language || true
         if [ -n "$RET" ]; then

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2011-10-08 14:58:55 UTC (rev 692)
+++ trunk/debian/rules	2011-10-08 15:30:38 UTC (rev 693)
@@ -89,7 +89,6 @@
 		mv $$i ../../../usr/lib/$(package); \
 	   done
 
-
 	# link them back to /var/lib/mailman
 	for i in debian/mailman/usr/lib/$(package)/*; do \
 	   dh_link usr/lib/$(package)/`basename $$i` var/lib/$(package)/`basename $$i`; \
@@ -115,7 +114,8 @@
 	echo "$(VERSION)" > debian/mailman/var/lib/$(package)/.version
 
 	dh_installlogrotate
-
+	dh_installcron
+	
 	install -m 0644 debian/mm_cfg.py debian/mailman/usr/lib/mailman/Mailman/mm_cfg.py.dist
 
 	rm debian/$(package)/usr/lib/$(package)/Mailman/mm_cfg.py

Modified: trunk/debian/templates
===================================================================
--- trunk/debian/templates	2011-10-08 14:58:55 UTC (rev 692)
+++ trunk/debian/templates	2011-10-08 15:30:38 UTC (rev 693)
@@ -26,15 +26,6 @@
 Type: string
 Description: for internal use: holding result of scan
 
-Template: mailman/gate_news
-Type: boolean
-Default: false
-_Description: Gate news to mail?
- Mailman allows to gate news to mail, that is, send all the messages
- which appear in a Usenet newsgroup to a mailing list.
- .
- Most people won't need this.
-
 Template: mailman/create_site_list
 Type: note
 _Description: Missing site list


