diff options
| -rw-r--r-- | Mailman/Gui/Privacy.py | 10 | ||||
| -rw-r--r-- | messages/mailman.pot | 58 |
2 files changed, 36 insertions, 32 deletions
diff --git a/Mailman/Gui/Privacy.py b/Mailman/Gui/Privacy.py index 3ed995eb..635fef52 100644 --- a/Mailman/Gui/Privacy.py +++ b/Mailman/Gui/Privacy.py @@ -67,7 +67,7 @@ class Privacy(GUIBase): 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 @@ class Privacy(GUIBase): 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 @@ class Privacy(GUIBase): 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 @@ class Privacy(GUIBase): 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 diff --git a/messages/mailman.pot b/messages/mailman.pot index 81268395..07234078 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 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@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -3049,90 +3049,94 @@ msgid "French" msgstr "" #: Mailman/Defaults.py:1347 -msgid "Croatian" +msgid "Hebrew" msgstr "" #: Mailman/Defaults.py:1348 -msgid "Hungarian" +msgid "Croatian" msgstr "" #: Mailman/Defaults.py:1349 -msgid "Interlingua" +msgid "Hungarian" msgstr "" #: Mailman/Defaults.py:1350 -msgid "Italian" +msgid "Interlingua" msgstr "" #: Mailman/Defaults.py:1351 -msgid "Japanese" +msgid "Italian" msgstr "" #: Mailman/Defaults.py:1352 -msgid "Korean" +msgid "Japanese" msgstr "" #: Mailman/Defaults.py:1353 -msgid "Lithuanian" +msgid "Korean" msgstr "" #: Mailman/Defaults.py:1354 -msgid "Dutch" +msgid "Lithuanian" msgstr "" #: Mailman/Defaults.py:1355 -msgid "Norwegian" +msgid "Dutch" msgstr "" #: Mailman/Defaults.py:1356 -msgid "Polish" +msgid "Norwegian" msgstr "" #: Mailman/Defaults.py:1357 -msgid "Portuguese" +msgid "Polish" msgstr "" #: Mailman/Defaults.py:1358 -msgid "Portuguese (Brazil)" +msgid "Portuguese" msgstr "" #: Mailman/Defaults.py:1359 -msgid "Romanian" +msgid "Portuguese (Brazil)" msgstr "" #: Mailman/Defaults.py:1360 -msgid "Russian" +msgid "Romanian" msgstr "" #: Mailman/Defaults.py:1361 -msgid "Serbian" +msgid "Russian" msgstr "" #: Mailman/Defaults.py:1362 -msgid "Slovenian" +msgid "Serbian" msgstr "" #: Mailman/Defaults.py:1363 -msgid "Swedish" +msgid "Slovenian" msgstr "" #: Mailman/Defaults.py:1364 -msgid "Turkish" +msgid "Swedish" msgstr "" #: Mailman/Defaults.py:1365 -msgid "Ukrainian" +msgid "Turkish" msgstr "" #: Mailman/Defaults.py:1366 -msgid "Vietnamese" +msgid "Ukrainian" msgstr "" #: Mailman/Defaults.py:1367 -msgid "Chinese (China)" +msgid "Vietnamese" msgstr "" #: Mailman/Defaults.py:1368 +msgid "Chinese (China)" +msgstr "" + +#: Mailman/Defaults.py:1369 msgid "Chinese (Taiwan)" msgstr "" @@ -4548,7 +4552,7 @@ msgid "" " 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 @@ msgid "" " 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 @@ msgid "" " 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 @@ msgid "" " 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" |