------------------------------------------------------------
revno: 991
committer: Tokio Kikuchi <[EMAIL PROTECTED]>
branch nick: 2.1
timestamp: Mon 2007-11-19 14:22:57 +0900
message:
merge and commit
modified:
Mailman/Gui/Privacy.py
messages/mailman.pot
------------------------------------------------------------
revno: 984.1.31
committer: Mark Sapiro <[EMAIL PROTECTED]>
branch nick: 2.1
timestamp: Sun 2007-11-18 18:16:20 -0800
message:
Updated mailman.pot again to undo unnecessary Privacy.py changes.
modified:
messages/mailman.pot
------------------------------------------------------------
revno: 984.1.30
committer: Mark Sapiro <[EMAIL PROTECTED]>
branch nick: 2.1
timestamp: Sun 2007-11-18 17:59:38 -0800
message:
Privacy.py - Last check-in was too agressive at removing trailing blanks.
modified:
Mailman/Gui/Privacy.py
=== modified file 'Mailman/Gui/Privacy.py'
--- a/Mailman/Gui/Privacy.py 2007-11-18 20:01:26 +0000
+++ b/Mailman/Gui/Privacy.py 2007-11-19 01:59:38 +0000
@@ -67,7 +67,7 @@
Require approval - require list administrator
Approval for subscriptions <br>
Confirm and approve - both confirm and approve
-
+
<p>(*) when someone requests a subscription,
Mailman sends them a notice with a unique
subscription request number that they must reply to
@@ -88,7 +88,7 @@
Require approval - require list administrator
approval for subscriptions <br>
Confirm and approve - both confirm and approve
-
+
<p>(*) when someone requests a subscription,
Mailman sends them a notice with a unique
subscription request number that they must reply to
@@ -359,13 +359,13 @@
against every recipient address in the message. The matching is
performed with Python's re.match() function, meaning they are
anchored to the start of the string.
-
+
<p>For backwards compatibility with Mailman 1.1, if the regexp
does not contain an `@', then the pattern is matched against just
the local part of the recipient address. If that match fails, or
if the pattern does contain an `@', then the pattern is matched
against the entire recipient address.
-
+
<p>Matching against the local part is deprecated; in a future
release, the pattern will always be matched against the entire
recipient address.""")),
@@ -399,7 +399,7 @@
case, each rule is matched in turn, with processing stopped after
the first match.
- Note that headers are collected from all the attachments
+ Note that headers are collected from all the attachments
(except for the mailman administrivia message) and
matched against the regular expressions. With this feature,
you can effectively sort out messages with dangerous file
=== modified file 'messages/mailman.pot'
--- a/messages/mailman.pot 2007-11-18 21:27:53 +0000
+++ b/messages/mailman.pot 2007-11-19 02:16:20 +0000
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: Sun Nov 18 12:59:04 2007\n"
+"POT-Creation-Date: Sun Nov 18 18:03:33 2007\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
@@ -3049,90 +3049,94 @@
msgstr ""
#: Mailman/Defaults.py:1347
+msgid "Hebrew"
+msgstr ""
+
+#: Mailman/Defaults.py:1348
msgid "Croatian"
msgstr ""
-#: Mailman/Defaults.py:1348
+#: Mailman/Defaults.py:1349
msgid "Hungarian"
msgstr ""
-#: Mailman/Defaults.py:1349
+#: Mailman/Defaults.py:1350
msgid "Interlingua"
msgstr ""
-#: Mailman/Defaults.py:1350
+#: Mailman/Defaults.py:1351
msgid "Italian"
msgstr ""
-#: Mailman/Defaults.py:1351
+#: Mailman/Defaults.py:1352
msgid "Japanese"
msgstr ""
-#: Mailman/Defaults.py:1352
+#: Mailman/Defaults.py:1353
msgid "Korean"
msgstr ""
-#: Mailman/Defaults.py:1353
+#: Mailman/Defaults.py:1354
msgid "Lithuanian"
msgstr ""
-#: Mailman/Defaults.py:1354
+#: Mailman/Defaults.py:1355
msgid "Dutch"
msgstr ""
-#: Mailman/Defaults.py:1355
+#: Mailman/Defaults.py:1356
msgid "Norwegian"
msgstr ""
-#: Mailman/Defaults.py:1356
+#: Mailman/Defaults.py:1357
msgid "Polish"
msgstr ""
-#: Mailman/Defaults.py:1357
+#: Mailman/Defaults.py:1358
msgid "Portuguese"
msgstr ""
-#: Mailman/Defaults.py:1358
+#: Mailman/Defaults.py:1359
msgid "Portuguese (Brazil)"
msgstr ""
-#: Mailman/Defaults.py:1359
+#: Mailman/Defaults.py:1360
msgid "Romanian"
msgstr ""
-#: Mailman/Defaults.py:1360
+#: Mailman/Defaults.py:1361
msgid "Russian"
msgstr ""
-#: Mailman/Defaults.py:1361
+#: Mailman/Defaults.py:1362
msgid "Serbian"
msgstr ""
-#: Mailman/Defaults.py:1362
+#: Mailman/Defaults.py:1363
msgid "Slovenian"
msgstr ""
-#: Mailman/Defaults.py:1363
+#: Mailman/Defaults.py:1364
msgid "Swedish"
msgstr ""
-#: Mailman/Defaults.py:1364
+#: Mailman/Defaults.py:1365
msgid "Turkish"
msgstr ""
-#: Mailman/Defaults.py:1365
+#: Mailman/Defaults.py:1366
msgid "Ukrainian"
msgstr ""
-#: Mailman/Defaults.py:1366
+#: Mailman/Defaults.py:1367
msgid "Vietnamese"
msgstr ""
-#: Mailman/Defaults.py:1367
+#: Mailman/Defaults.py:1368
msgid "Chinese (China)"
msgstr ""
-#: Mailman/Defaults.py:1368
+#: Mailman/Defaults.py:1369
msgid "Chinese (Taiwan)"
msgstr ""
@@ -4548,7 +4552,7 @@
" Require approval - require list administrator\n"
" Approval for subscriptions <br>\n"
" Confirm and approve - both confirm and approve\n"
-"\n"
+" \n"
" <p>(*) when someone requests a subscription,\n"
" Mailman sends them a notice with a unique\n"
" subscription request number that they must reply
to\n"
@@ -4565,7 +4569,7 @@
" Require approval - require list administrator\n"
" approval for subscriptions <br>\n"
" Confirm and approve - both confirm and approve\n"
-"\n"
+" \n"
" <p>(*) when someone requests a subscription,\n"
" Mailman sends them a notice with a unique\n"
" subscription request number that they must reply
to\n"
@@ -4925,13 +4929,13 @@
" against every recipient address in the message. The matching
is\n"
" performed with Python's re.match() function, meaning they are\n"
" anchored to the start of the string.\n"
-"\n"
+" \n"
" <p>For backwards compatibility with Mailman 1.1, if the regexp\n"
" does not contain an `@', then the pattern is matched against
just\n"
" the local part of the recipient address. If that match fails,
or\n"
" if the pattern does contain an `@', then the pattern is
matched\n"
" against the entire recipient address.\n"
-"\n"
+" \n"
" <p>Matching against the local part is deprecated; in a future\n"
" release, the pattern will always be matched against the entire\n"
" recipient address."
@@ -4976,7 +4980,7 @@
" case, each rule is matched in turn, with processing stopped
after\n"
" the first match.\n"
"\n"
-" Note that headers are collected from all the attachments\n"
+" Note that headers are collected from all the attachments \n"
" (except for the mailman administrivia message) and\n"
" matched against the regular expressions. With this feature,\n"
" you can effectively sort out messages with dangerous file\n"
--
https://code.launchpad.net/~mailman-coders/mailman/2.1
You are receiving this branch notification because you are subscribed to it.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/2.1/+subscription/mailman-checkins.
_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
