aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Mailman/Archiver/HyperArch.py2
-rw-r--r--Mailman/Gui/NonDigest.py26
-rw-r--r--Mailman/MailList.py2
-rw-r--r--messages/mailman.pot239
4 files changed, 153 insertions, 116 deletions
diff --git a/Mailman/Archiver/HyperArch.py b/Mailman/Archiver/HyperArch.py
index 8cd000e7..843f1507 100644
--- a/Mailman/Archiver/HyperArch.py
+++ b/Mailman/Archiver/HyperArch.py
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2006 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2007 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/Mailman/Gui/NonDigest.py b/Mailman/Gui/NonDigest.py
index c319d6ef..d1d0d232 100644
--- a/Mailman/Gui/NonDigest.py
+++ b/Mailman/Gui/NonDigest.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2003 by the Free Software Foundation, Inc.
+# Copyright (C) 2001-2007 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -12,7 +12,8 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
"""GUI component for managing the non-digest delivery options.
"""
@@ -148,22 +149,23 @@ and footers:
_('Sibling lists'),
('regular_exclude_lists', mm_cfg.EmailList, (3, WIDTH), 0,
- _('''Other mailing lists on this site whose members are
+ _("""Other mailing lists on this site whose members are
excluded from the regular (non-digest) delivery if those
- list addresses appear in To: or Cc: header.'''),
- _('''The list addresses should be written in full mail address
+ list addresses appear in a To: or Cc: header."""),
+ _("""The list addresses should be written in full mail address
format (e.g. mailman@example.com). Do not specify this list
- address mutually in the exclude list configuration page,
- or those doubled members won't get any message. Note also that
- the site administrator may prohibit cross domain sibling.''')),
+ address mutually in the exclude list configuration page of the
+ other list, or members of both lists won't get any message.
+ Note also that the site administrator may prohibit cross domain
+ siblings.""")),
('regular_include_lists', mm_cfg.EmailList, (3, WIDTH), 0,
- _('''Other mailing lists on this site whose members are
+ _("""Other mailing lists on this site whose members are
included in the regular (non-digest) delivery if those
- list addresses don't appear in To: or Cc: header.'''),
- _('''The list addresses should be written in full mail address
+ list addresses don't appear in a To: or Cc: header."""),
+ _("""The list addresses should be written in full mail address
format (e.g. mailman@example.com). Note also that the site
- administrator may prohibit cross domain sibling.''')),
+ administrator may prohibit cross domain siblings.""")),
])
diff --git a/Mailman/MailList.py b/Mailman/MailList.py
index 46959c16..f7753cfe 100644
--- a/Mailman/MailList.py
+++ b/Mailman/MailList.py
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2006 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2007 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
diff --git a/messages/mailman.pot b/messages/mailman.pot
index 07234078..05c8b8ba 100644
--- a/messages/mailman.pot
+++ b/messages/mailman.pot
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: Sun Nov 18 18:03:33 2007\n"
+"POT-Creation-Date: Sun Nov 25 17:20:28 2007\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -24,143 +24,143 @@ msgid " %(size)i bytes "
msgstr ""
#: Mailman/Archiver/HyperArch.py:284 Mailman/Archiver/HyperArch.py:287
-#: Mailman/Archiver/HyperArch.py:415 Mailman/Archiver/HyperArch.py:467
-#: Mailman/Archiver/HyperArch.py:575 Mailman/Archiver/HyperArch.py:1049
-#: Mailman/Archiver/HyperArch.py:1178
+#: Mailman/Archiver/HyperArch.py:415 Mailman/Archiver/HyperArch.py:469
+#: Mailman/Archiver/HyperArch.py:577 Mailman/Archiver/HyperArch.py:1051
+#: Mailman/Archiver/HyperArch.py:1180
msgid " at "
msgstr ""
-#: Mailman/Archiver/HyperArch.py:496
+#: Mailman/Archiver/HyperArch.py:498
msgid "Previous message:"
msgstr ""
-#: Mailman/Archiver/HyperArch.py:518
+#: Mailman/Archiver/HyperArch.py:520
msgid "Next message:"
msgstr ""
-#: Mailman/Archiver/HyperArch.py:690 Mailman/Archiver/HyperArch.py:726
+#: Mailman/Archiver/HyperArch.py:692 Mailman/Archiver/HyperArch.py:728
msgid "thread"
msgstr ""
-#: Mailman/Archiver/HyperArch.py:691 Mailman/Archiver/HyperArch.py:727
+#: Mailman/Archiver/HyperArch.py:693 Mailman/Archiver/HyperArch.py:729
msgid "subject"
msgstr ""
-#: Mailman/Archiver/HyperArch.py:692 Mailman/Archiver/HyperArch.py:728
+#: Mailman/Archiver/HyperArch.py:694 Mailman/Archiver/HyperArch.py:730
msgid "author"
msgstr ""
-#: Mailman/Archiver/HyperArch.py:693 Mailman/Archiver/HyperArch.py:729
+#: Mailman/Archiver/HyperArch.py:695 Mailman/Archiver/HyperArch.py:731
msgid "date"
msgstr ""
-#: Mailman/Archiver/HyperArch.py:765
+#: Mailman/Archiver/HyperArch.py:767
msgid "<P>Currently, there are no archives. </P>"
msgstr ""
-#: Mailman/Archiver/HyperArch.py:803
+#: Mailman/Archiver/HyperArch.py:805
msgid "Gzip'd Text%(sz)s"
msgstr ""
-#: Mailman/Archiver/HyperArch.py:808
+#: Mailman/Archiver/HyperArch.py:810
msgid "Text%(sz)s"
msgstr ""
-#: Mailman/Archiver/HyperArch.py:898
+#: Mailman/Archiver/HyperArch.py:900
msgid ""
"figuring article archives\n"
msgstr ""
-#: Mailman/Archiver/HyperArch.py:908
+#: Mailman/Archiver/HyperArch.py:910
msgid "April"
msgstr ""
-#: Mailman/Archiver/HyperArch.py:908
+#: Mailman/Archiver/HyperArch.py:910
msgid "February"
msgstr ""
-#: Mailman/Archiver/HyperArch.py:908
+#: Mailman/Archiver/HyperArch.py:910
msgid "January"
msgstr ""
-#: Mailman/Archiver/HyperArch.py:908
+#: Mailman/Archiver/HyperArch.py:910
msgid "March"
msgstr ""
-#: Mailman/Archiver/HyperArch.py:909
+#: Mailman/Archiver/HyperArch.py:911
msgid "August"
msgstr ""
-#: Mailman/Archiver/HyperArch.py:909
+#: Mailman/Archiver/HyperArch.py:911
msgid "July"
msgstr ""
-#: Mailman/Archiver/HyperArch.py:909
+#: Mailman/Archiver/HyperArch.py:911
msgid "June"
msgstr ""
-#: Mailman/Archiver/HyperArch.py:909 Mailman/i18n.py:103
+#: Mailman/Archiver/HyperArch.py:911 Mailman/i18n.py:103
msgid "May"
msgstr ""
-#: Mailman/Archiver/HyperArch.py:910
+#: Mailman/Archiver/HyperArch.py:912
msgid "December"
msgstr ""
-#: Mailman/Archiver/HyperArch.py:910
+#: Mailman/Archiver/HyperArch.py:912
msgid "November"
msgstr ""
-#: Mailman/Archiver/HyperArch.py:910
+#: Mailman/Archiver/HyperArch.py:912
msgid "October"
msgstr ""
-#: Mailman/Archiver/HyperArch.py:910
+#: Mailman/Archiver/HyperArch.py:912
msgid "September"
msgstr ""
-#: Mailman/Archiver/HyperArch.py:918
+#: Mailman/Archiver/HyperArch.py:920
msgid "First"
msgstr ""
-#: Mailman/Archiver/HyperArch.py:918
+#: Mailman/Archiver/HyperArch.py:920
msgid "Fourth"
msgstr ""
-#: Mailman/Archiver/HyperArch.py:918
+#: Mailman/Archiver/HyperArch.py:920
msgid "Second"
msgstr ""
-#: Mailman/Archiver/HyperArch.py:918
+#: Mailman/Archiver/HyperArch.py:920
msgid "Third"
msgstr ""
-#: Mailman/Archiver/HyperArch.py:920
+#: Mailman/Archiver/HyperArch.py:922
msgid "%(ord)s quarter %(year)i"
msgstr ""
-#: Mailman/Archiver/HyperArch.py:927
+#: Mailman/Archiver/HyperArch.py:929
msgid "%(month)s %(year)i"
msgstr ""
-#: Mailman/Archiver/HyperArch.py:932
+#: Mailman/Archiver/HyperArch.py:934
msgid "The Week Of Monday %(day)i %(month)s %(year)i"
msgstr ""
-#: Mailman/Archiver/HyperArch.py:936
+#: Mailman/Archiver/HyperArch.py:938
msgid "%(day)i %(month)s %(year)i"
msgstr ""
-#: Mailman/Archiver/HyperArch.py:1036
+#: Mailman/Archiver/HyperArch.py:1038
msgid ""
"Computing threaded index\n"
msgstr ""
-#: Mailman/Archiver/HyperArch.py:1301
+#: Mailman/Archiver/HyperArch.py:1303
msgid "Updating HTML for article %(seq)s"
msgstr ""
-#: Mailman/Archiver/HyperArch.py:1308
+#: Mailman/Archiver/HyperArch.py:1310
msgid "article file %(filename)s is missing!"
msgstr ""
@@ -773,8 +773,8 @@ msgstr ""
#: Mailman/Gui/General.py:316 Mailman/Gui/General.py:321
#: Mailman/Gui/General.py:327 Mailman/Gui/General.py:347
#: Mailman/Gui/General.py:375 Mailman/Gui/General.py:398
-#: Mailman/Gui/NonDigest.py:44 Mailman/Gui/NonDigest.py:52
-#: Mailman/Gui/NonDigest.py:139 Mailman/Gui/Privacy.py:110
+#: Mailman/Gui/NonDigest.py:45 Mailman/Gui/NonDigest.py:53
+#: Mailman/Gui/NonDigest.py:140 Mailman/Gui/Privacy.py:110
#: Mailman/Gui/Privacy.py:116 Mailman/Gui/Privacy.py:149
#: Mailman/Gui/Privacy.py:197 Mailman/Gui/Privacy.py:312
#: Mailman/Gui/Privacy.py:331 Mailman/Gui/Usenet.py:52
@@ -799,8 +799,8 @@ msgstr ""
#: Mailman/Gui/General.py:306 Mailman/Gui/General.py:316
#: Mailman/Gui/General.py:321 Mailman/Gui/General.py:327
#: Mailman/Gui/General.py:347 Mailman/Gui/General.py:375
-#: Mailman/Gui/General.py:398 Mailman/Gui/NonDigest.py:44
-#: Mailman/Gui/NonDigest.py:52 Mailman/Gui/NonDigest.py:139
+#: Mailman/Gui/General.py:398 Mailman/Gui/NonDigest.py:45
+#: Mailman/Gui/NonDigest.py:53 Mailman/Gui/NonDigest.py:140
#: Mailman/Gui/Privacy.py:110 Mailman/Gui/Privacy.py:116
#: Mailman/Gui/Privacy.py:149 Mailman/Gui/Privacy.py:197
#: Mailman/Gui/Privacy.py:312 Mailman/Gui/Privacy.py:331
@@ -1711,7 +1711,7 @@ msgid "Create a %(hostname)s Mailing List"
msgstr ""
#: Mailman/Cgi/create.py:302 Mailman/Cgi/rmlist.py:199
-#: Mailman/Gui/Bounce.py:187 Mailman/htmlformat.py:340
+#: Mailman/Gui/Bounce.py:187 Mailman/htmlformat.py:343
msgid "Error: "
msgstr ""
@@ -3004,139 +3004,139 @@ msgstr ""
msgid "Digest members:"
msgstr ""
-#: Mailman/Defaults.py:1336
+#: Mailman/Defaults.py:1341
msgid "Arabic"
msgstr ""
-#: Mailman/Defaults.py:1337
+#: Mailman/Defaults.py:1342
msgid "Catalan"
msgstr ""
-#: Mailman/Defaults.py:1338
+#: Mailman/Defaults.py:1343
msgid "Czech"
msgstr ""
-#: Mailman/Defaults.py:1339
+#: Mailman/Defaults.py:1344
msgid "Danish"
msgstr ""
-#: Mailman/Defaults.py:1340
+#: Mailman/Defaults.py:1345
msgid "German"
msgstr ""
-#: Mailman/Defaults.py:1341
+#: Mailman/Defaults.py:1346
msgid "English (USA)"
msgstr ""
-#: Mailman/Defaults.py:1342
+#: Mailman/Defaults.py:1347
msgid "Spanish (Spain)"
msgstr ""
-#: Mailman/Defaults.py:1343
+#: Mailman/Defaults.py:1348
msgid "Estonian"
msgstr ""
-#: Mailman/Defaults.py:1344
+#: Mailman/Defaults.py:1349
msgid "Euskara"
msgstr ""
-#: Mailman/Defaults.py:1345
+#: Mailman/Defaults.py:1350
msgid "Finnish"
msgstr ""
-#: Mailman/Defaults.py:1346
+#: Mailman/Defaults.py:1351
msgid "French"
msgstr ""
-#: Mailman/Defaults.py:1347
+#: Mailman/Defaults.py:1352
msgid "Hebrew"
msgstr ""
-#: Mailman/Defaults.py:1348
+#: Mailman/Defaults.py:1353
msgid "Croatian"
msgstr ""
-#: Mailman/Defaults.py:1349
+#: Mailman/Defaults.py:1354
msgid "Hungarian"
msgstr ""
-#: Mailman/Defaults.py:1350
+#: Mailman/Defaults.py:1355
msgid "Interlingua"
msgstr ""
-#: Mailman/Defaults.py:1351
+#: Mailman/Defaults.py:1356
msgid "Italian"
msgstr ""
-#: Mailman/Defaults.py:1352
+#: Mailman/Defaults.py:1357
msgid "Japanese"
msgstr ""
-#: Mailman/Defaults.py:1353
+#: Mailman/Defaults.py:1358
msgid "Korean"
msgstr ""
-#: Mailman/Defaults.py:1354
+#: Mailman/Defaults.py:1359
msgid "Lithuanian"
msgstr ""
-#: Mailman/Defaults.py:1355
+#: Mailman/Defaults.py:1360
msgid "Dutch"
msgstr ""
-#: Mailman/Defaults.py:1356
+#: Mailman/Defaults.py:1361
msgid "Norwegian"
msgstr ""
-#: Mailman/Defaults.py:1357
+#: Mailman/Defaults.py:1362
msgid "Polish"
msgstr ""
-#: Mailman/Defaults.py:1358
+#: Mailman/Defaults.py:1363
msgid "Portuguese"
msgstr ""
-#: Mailman/Defaults.py:1359
+#: Mailman/Defaults.py:1364
msgid "Portuguese (Brazil)"
msgstr ""
-#: Mailman/Defaults.py:1360
+#: Mailman/Defaults.py:1365
msgid "Romanian"
msgstr ""
-#: Mailman/Defaults.py:1361
+#: Mailman/Defaults.py:1366
msgid "Russian"
msgstr ""
-#: Mailman/Defaults.py:1362
+#: Mailman/Defaults.py:1367
msgid "Serbian"
msgstr ""
-#: Mailman/Defaults.py:1363
+#: Mailman/Defaults.py:1368
msgid "Slovenian"
msgstr ""
-#: Mailman/Defaults.py:1364
+#: Mailman/Defaults.py:1369
msgid "Swedish"
msgstr ""
-#: Mailman/Defaults.py:1365
+#: Mailman/Defaults.py:1370
msgid "Turkish"
msgstr ""
-#: Mailman/Defaults.py:1366
+#: Mailman/Defaults.py:1371
msgid "Ukrainian"
msgstr ""
-#: Mailman/Defaults.py:1367
+#: Mailman/Defaults.py:1372
msgid "Vietnamese"
msgstr ""
-#: Mailman/Defaults.py:1368
+#: Mailman/Defaults.py:1373
msgid "Chinese (China)"
msgstr ""
-#: Mailman/Defaults.py:1369
+#: Mailman/Defaults.py:1374
msgid "Chinese (Taiwan)"
msgstr ""
@@ -4379,25 +4379,25 @@ msgstr ""
msgid "Mass&nbsp;Removal"
msgstr ""
-#: Mailman/Gui/NonDigest.py:34
+#: Mailman/Gui/NonDigest.py:35
msgid "Non-digest&nbsp;options"
msgstr ""
-#: Mailman/Gui/NonDigest.py:42
+#: Mailman/Gui/NonDigest.py:43
msgid "Policies concerning immediately delivered list traffic."
msgstr ""
-#: Mailman/Gui/NonDigest.py:45
+#: Mailman/Gui/NonDigest.py:46
msgid ""
"Can subscribers choose to receive mail immediately, rather\n"
" than in batched digests?"
msgstr ""
-#: Mailman/Gui/NonDigest.py:52
+#: Mailman/Gui/NonDigest.py:53
msgid "Full Personalization"
msgstr ""
-#: Mailman/Gui/NonDigest.py:54
+#: Mailman/Gui/NonDigest.py:55
msgid ""
"Should Mailman personalize each non-digest delivery?\n"
" This is often useful for announce-only lists, but <a\n"
@@ -4406,7 +4406,7 @@ msgid ""
" issues."
msgstr ""
-#: Mailman/Gui/NonDigest.py:60
+#: Mailman/Gui/NonDigest.py:61
msgid ""
"Normally, Mailman sends the regular delivery messages to\n"
" the mail server in batches. This is much more efficent\n"
@@ -4451,7 +4451,7 @@ msgid ""
" "
msgstr ""
-#: Mailman/Gui/NonDigest.py:109
+#: Mailman/Gui/NonDigest.py:110
msgid ""
"When <a href=\"?VARHELP=nondigest/personalize\">personalization</a> is enabled\n"
"for this list, additional substitution variables are allowed in your headers\n"
@@ -4468,31 +4468,31 @@ msgid ""
"</ul>\n"
msgstr ""
-#: Mailman/Gui/NonDigest.py:128
+#: Mailman/Gui/NonDigest.py:129
msgid "Header added to mail sent to regular list members"
msgstr ""
-#: Mailman/Gui/NonDigest.py:129
+#: Mailman/Gui/NonDigest.py:130
msgid ""
"Text prepended to the top of every immediately-delivery\n"
" message. "
msgstr ""
-#: Mailman/Gui/NonDigest.py:133
+#: Mailman/Gui/NonDigest.py:134
msgid "Footer added to mail sent to regular list members"
msgstr ""
-#: Mailman/Gui/NonDigest.py:134
+#: Mailman/Gui/NonDigest.py:135
msgid ""
"Text appended to the bottom of every immediately-delivery\n"
" message. "
msgstr ""
-#: Mailman/Gui/NonDigest.py:140
+#: Mailman/Gui/NonDigest.py:141
msgid "Scrub attachments of regular delivery message?"
msgstr ""
-#: Mailman/Gui/NonDigest.py:141
+#: Mailman/Gui/NonDigest.py:142
msgid ""
"When you scrub attachments, they are stored in archive\n"
" area and links are made in the message so that the member can\n"
@@ -4500,6 +4500,41 @@ msgid ""
" disappear, you can use content filter options."
msgstr ""
+#: Mailman/Gui/NonDigest.py:149
+msgid "Sibling lists"
+msgstr ""
+
+#: Mailman/Gui/NonDigest.py:152
+msgid ""
+"Other mailing lists on this site whose members are\n"
+" excluded from the regular (non-digest) delivery if those\n"
+" list addresses appear in a To: or Cc: header."
+msgstr ""
+
+#: Mailman/Gui/NonDigest.py:155
+msgid ""
+"The list addresses should be written in full mail address\n"
+" format (e.g. mailman@example.com). Do not specify this list\n"
+" address mutually in the exclude list configuration page of the\n"
+" other list, or members of both lists won't get any message.\n"
+" Note also that the site administrator may prohibit cross domain\n"
+" siblings."
+msgstr ""
+
+#: Mailman/Gui/NonDigest.py:163
+msgid ""
+"Other mailing lists on this site whose members are\n"
+" included in the regular (non-digest) delivery if those\n"
+" list addresses don't appear in a To: or Cc: header."
+msgstr ""
+
+#: Mailman/Gui/NonDigest.py:166
+msgid ""
+"The list addresses should be written in full mail address\n"
+" format (e.g. mailman@example.com). Note also that the site\n"
+" administrator may prohibit cross domain siblings."
+msgstr ""
+
#: Mailman/Gui/Passwords.py:27
msgid "Passwords"
msgstr ""
@@ -5477,7 +5512,7 @@ msgstr ""
msgid "%(realname)s post acknowledgement"
msgstr ""
-#: Mailman/Handlers/CalcRecips.py:69
+#: Mailman/Handlers/CalcRecips.py:78
msgid ""
"Your urgent message to the %(realname)s mailing list was not authorized for\n"
"delivery. The original message as received by Mailman is attached.\n"
@@ -5868,35 +5903,35 @@ msgstr ""
msgid "Your confirmation is required to leave the %(listname)s mailing list"
msgstr ""
-#: Mailman/MailList.py:881 Mailman/MailList.py:1293
+#: Mailman/MailList.py:883 Mailman/MailList.py:1295
msgid " from %(remote)s"
msgstr ""
-#: Mailman/MailList.py:914
+#: Mailman/MailList.py:916
msgid "subscriptions to %(realname)s require moderator approval"
msgstr ""
-#: Mailman/MailList.py:983 bin/add_members:242
+#: Mailman/MailList.py:985 bin/add_members:242
msgid "%(realname)s subscription notification"
msgstr ""
-#: Mailman/MailList.py:1002
+#: Mailman/MailList.py:1004
msgid "unsubscriptions require moderator approval"
msgstr ""
-#: Mailman/MailList.py:1022
+#: Mailman/MailList.py:1024
msgid "%(realname)s unsubscribe notification"
msgstr ""
-#: Mailman/MailList.py:1202
+#: Mailman/MailList.py:1204
msgid "subscriptions to %(name)s require administrator approval"
msgstr ""
-#: Mailman/MailList.py:1465
+#: Mailman/MailList.py:1467
msgid "Last autoresponse notification for today"
msgstr ""
-#: Mailman/Queue/BounceRunner.py:310
+#: Mailman/Queue/BounceRunner.py:321
msgid ""
"The attached message was received as a bounce, but either the bounce format\n"
"was not recognized, or no member addresses could be extracted from it. This\n"
@@ -5908,7 +5943,7 @@ msgid ""
"\n"
msgstr ""
-#: Mailman/Queue/BounceRunner.py:320
+#: Mailman/Queue/BounceRunner.py:331
msgid "Uncaught bounce notification"
msgstr ""
@@ -5955,15 +5990,15 @@ msgstr ""
msgid "The results of your email commands"
msgstr ""
-#: Mailman/htmlformat.py:636
+#: Mailman/htmlformat.py:639
msgid "Delivered by Mailman<br>version %(version)s"
msgstr ""
-#: Mailman/htmlformat.py:637
+#: Mailman/htmlformat.py:640
msgid "Python Powered"
msgstr ""
-#: Mailman/htmlformat.py:638
+#: Mailman/htmlformat.py:641
msgid "Gnu's Not Unix"
msgstr ""