Backporting from HEAD - resolve conflicts

6 files changed, 27 insertions, 69 deletions

diff --git a/messages/cs/LC_MESSAGES/mailman.po b/messages/cs/LC_MESSAGES/mailman.po
index dd56b5e5..ad9defa6 100644
--- a/messages/cs/LC_MESSAGES/mailman.po
+++ b/messages/cs/LC_MESSAGES/mailman.po
@@ -8351,6 +8351,11 @@ msgid ""
 "tone\n"
 "        down the verbosity.\n"
 "\n"
+"    -q/--quiet\n"
+"        Some MTA output can include more verbose help text.  Use this to "
+"tone\n"
+"        down the verbosity.\n"
+"\n"
 "    -h/--help\n"
 "        Print this message and exit.\n"
 msgstr ""
diff --git a/messages/de/LC_MESSAGES/mailman.po b/messages/de/LC_MESSAGES/mailman.po
index ddd9d247..9b3fbb95 100644
--- a/messages/de/LC_MESSAGES/mailman.po
+++ b/messages/de/LC_MESSAGES/mailman.po
@@ -7834,12 +7834,6 @@ msgstr ""
 msgid "## %(listname)s mailing list"
 msgstr "## %(listname)s Mailingliste"
 
-# Mailman/Handlers/Replybot.py:67
-#: Mailman/MTA/Manual.py:80
-#, fuzzy
-msgid "## %(listname)s mailing list"
-msgstr "Die \"%(realname)s\" Mailingliste"
-
 # Mailman/MTA/Manual.py:66
 #: Mailman/MTA/Manual.py:97
 msgid "Mailing list creation request for list %(listname)s"
diff --git a/messages/fr/LC_MESSAGES/mailman.po b/messages/fr/LC_MESSAGES/mailman.po
index a6794036..f7472508 100644
--- a/messages/fr/LC_MESSAGES/mailman.po
+++ b/messages/fr/LC_MESSAGES/mailman.po
@@ -11462,44 +11462,6 @@ msgstr ""
 #~ "Invoqué par cron, ceci vérifie les requêtes de modération en attente\n"
 #~ "et envoie au besoin un courriel au modérateur.\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "Fix the MM2.1b4 archives.\n"
-#~ "\n"
-#~ "Usage: %(PROGRAM)s [options] file ...\n"
-#~ "\n"
-#~ "Where options are:\n"
-#~ "    -h / --help\n"
-#~ "        Print this help message and exit.\n"
-#~ msgstr ""
-#~ "Régénérer les fichiers Postfix data/aliases et data/aliases.db à\n"
-#~ "partir de rien.\n"
-#~ "\n"
-#~ "Usage:\n"
-#~ "\n"
-#~ "    genaliases [options]\n"
-#~ "\n"
-#~ "Options:\n"
-#~ "\n"
-#~ "    -h/--help\n"
-#~ "        Afficher ce message et quitter.\n"
-
-#~ msgid "Big change in %(listname)s@%(listhost)s mailing list"
-#~ msgstr ""
-#~ "Des changements importants sont survenus sur la liste de diffusion %"
-#~ "(listname)s@%(listhost)s"
-
-#~ msgid "Bad argument to -c/--changes-msg: %(arg)s"
-#~ msgstr "Mauvais argument fourni à -c/--changes-msg: %(arg)s"
-
-#~ msgid ""
-#~ "Invoked by cron, this checks for pending moderation requests and mails "
-#~ "the\n"
-#~ "list moderators if necessary.\n"
-#~ msgstr ""
-#~ "Invoqué par cron, ceci vérifie les requêtes de modération en attente\n"
-#~ "et envoie au besoin un courriel au modérateur.\n"
-
 #~ msgid "Posts by member are currently quarantined for moderation"
 #~ msgstr ""
 #~ "Les envois  des abonnés sont actuellement mis en quarantaine\n"
diff --git a/messages/nl/LC_MESSAGES/mailman.po b/messages/nl/LC_MESSAGES/mailman.po
index 2f5a3c8a..230919d4 100644
--- a/messages/nl/LC_MESSAGES/mailman.po
+++ b/messages/nl/LC_MESSAGES/mailman.po
@@ -8734,11 +8734,6 @@ msgid ""
 "tone\n"
 "        down the verbosity.\n"
 "\n"
-"    -q/--quiet\n"
-"        Some MTA output can include more verbose help text.  Use this to "
-"tone\n"
-"        down the verbosity.\n"
-"\n"
 "    -h/--help\n"
 "        Print this message and exit.\n"
 msgstr ""
diff --git a/messages/no/LC_MESSAGES/mailman.po b/messages/no/LC_MESSAGES/mailman.po
index c8e289aa..3f4d1b10 100644
--- a/messages/no/LC_MESSAGES/mailman.po
+++ b/messages/no/LC_MESSAGES/mailman.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mailman 2.1b4+\n"
 "POT-Creation-Date: Sat Sep 13 09:21:50 2003\n"
-"PO-Revision-Date: 2003-04-22 09:26+0200\n"
+"PO-Revision-Date: 2003-09-18 15:57+0200\n"
 "Last-Translator: Daniel Buchmann <Daniel.Buchmann@bibsys.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -1122,9 +1122,8 @@ msgid "<em>The sender is now a member of this list</em>"
 msgstr "<em>Avsender er nå medlem av denne listen</em>"
 
 #: Mailman/Cgi/admindb.py:434
-#, fuzzy
 msgid "Add <b>%(esender)s</b> to one of these sender filters:"
-msgstr "Legge inn <b>%(esender)s</b> i et avsenderfilter som:"
+msgstr "Legge inn <b>%(esender)s</b> i en av disse avsenderfiltrene:"
 
 #: Mailman/Cgi/admindb.py:439
 msgid "Accepts"
@@ -2164,13 +2163,12 @@ msgid "the list admin overview page"
 msgstr "administrasjonssiden"
 
 #: Mailman/Cgi/listinfo.py:124
-#, fuzzy
 msgid ""
 " to find the management interface for your list.\n"
 "         <p>If you are having trouble using the lists, please contact "
 msgstr ""
 " for &aring; administrere en liste.\n"
-"<p>Send sp&oslash;rsm&aring;l og kommentarer til "
+"<p>Har du problemer med &aring; benytte listene, kontakt "
 
 #: Mailman/Cgi/listinfo.py:189
 msgid "Edit Options"
@@ -3571,9 +3569,8 @@ msgid "Russian"
 msgstr "Russisk"
 
 #: Mailman/Defaults.py:1277
-#, fuzzy
 msgid "Serbian"
-msgstr "Tysk"
+msgstr "Serbisk"
 
 #: Mailman/Defaults.py:1278
 msgid "Swedish"
@@ -3581,7 +3578,7 @@ msgstr "Svensk"
 
 #: Mailman/Defaults.py:1279
 msgid "Ukrainian"
-msgstr ""
+msgstr "Ukrainsk"
 
 #: Mailman/Deliverer.py:51
 msgid ""
@@ -5468,9 +5465,8 @@ msgstr ""
 "og det opprinnelige tittelfeltet."
 
 #: Mailman/Gui/Membership.py:26
-#, fuzzy
 msgid "Membership&nbsp;Management..."
-msgstr "Administrere&nbsp;medlemmer"
+msgstr "Administrere&nbsp;medlemmer..."
 
 #: Mailman/Gui/Membership.py:30
 msgid "Membership&nbsp;List"
@@ -5682,9 +5678,8 @@ msgid "Passwords"
 msgstr "Passord"
 
 #: Mailman/Gui/Privacy.py:28
-#, fuzzy
 msgid "Privacy options..."
-msgstr "Restriksjoner"
+msgstr "Restriksjoner..."
 
 #: Mailman/Gui/Privacy.py:32
 msgid "Subscription&nbsp;rules"
@@ -6597,12 +6592,10 @@ msgid "News server settings"
 msgstr "Innstillinger for nyhetsgruppeserver"
 
 #: Mailman/Gui/Usenet.py:40
-#, fuzzy
 msgid "The hostname of the machine your news server is running on."
-msgstr "Internettadressen til nyhetsgruppetjeneren."
+msgstr "Navn på nyhetsgruppetjener."
 
 #: Mailman/Gui/Usenet.py:41
-#, fuzzy
 msgid ""
 "This value may be either the name of your news server, or\n"
 "             optionally of the format name:port, where port is a port "
@@ -6614,10 +6607,13 @@ msgid ""
 "             recognize the machine this mailing list runs on as a machine\n"
 "             capable of reading and posting news."
 msgstr ""
+"Navnet kan enten være kun internettnavnet på nyhetsgruppetjeneren din, eller\n"
+"på formatet navn:port der port er portnummeret.\n"
+"\n"
+"\n"
 "Nyhetsgruppe-tjeneste er ikke en del av Mailman.\n"
 "Du m&aring; ha tilgang til en eksisterende NNTP tjener,\n"
-"og maskinen som denne epostlisten kj&oslash;rer p&aring;, m&aring; ha "
-"tilgang til &aring; lese og sende meldinger til den NNTP tjeneren."
+"og maskinen som denne epostlisten kj&oslash;rer p&aring;, m&aring; ha tilgang til &aring; lese og sende meldinger til den NNTP tjeneren."
 
 #: Mailman/Gui/Usenet.py:50
 msgid "The name of the Usenet group to gateway to and/or from."
@@ -9212,12 +9208,19 @@ msgstr ""
 "    --fullnames / -f\n"
 "        Viser også medlemmenes fulle navn.\n"
 "\n"
-"    --preserve\n"
-"    -p\n"
+"    --preserve / -p\n"
 "        Viser medlemmenes epostadresse slik de ble påmeldt listen.\n"
 "        Benyttes ikke dette valget, vises alle epostadressene med små\n"
 "        bokstaver.\n"
 "\n"
+"    --invalid / -i\n"
+"        Viser kun ugyldige adresser i medlemslisten.\n"
+"        Overstyrer valgene -r, -d, og -n.\n"
+"\n"
+"    --unicode / -u\n"
+"        Viser epostadresser som er lagret som Unicode objekter istedenfor\n"
+"        vanlige streng objekter. Overstyrer valgene -r, -d, og -n.\n"
+"\n"
 "    --help\n"
 "    -h\n"
 "        Viser denne hjelpeteksten.\n"
diff --git a/messages/pt_BR/LC_MESSAGES/mailman.po b/messages/pt_BR/LC_MESSAGES/mailman.po
index 4d03cd98..beb4cb97 100644
--- a/messages/pt_BR/LC_MESSAGES/mailman.po
+++ b/messages/pt_BR/LC_MESSAGES/mailman.po
@@ -2232,7 +2232,6 @@ msgid "You are already using that email address"
 msgstr "Você já está usando aquele endereço de email"
 
 #: Mailman/Cgi/options.py:312
-#, fuzzy
 msgid ""
 "The new address you requested %(newaddr)s is already a member of the\n"
 "%(listname)s mailing list, however you have also requested a global change "