aboutsummaryrefslogtreecommitdiffstats
path: root/Mailman/Gui
diff options
context:
space:
mode:
authorMark Sapiro <msapiro@value.net>2010-09-10 15:17:01 -0700
committerMark Sapiro <msapiro@value.net>2010-09-10 15:17:01 -0700
commitd3b2c76a1adf689cf8ea231fbc7d960e1286256b (patch)
tree835fd401103d455a6870bfeb62488c23c6e1bbde /Mailman/Gui
parent7ad92f7ca2ce0d52f48f294fd6c83c6029f0c77f (diff)
downloadmailman2-d3b2c76a1adf689cf8ea231fbc7d960e1286256b.tar.gz
mailman2-d3b2c76a1adf689cf8ea231fbc7d960e1286256b.tar.xz
mailman2-d3b2c76a1adf689cf8ea231fbc7d960e1286256b.zip
Made minor wording improvements and typo corrections in some messages.
Bug #426979.
Diffstat (limited to 'Mailman/Gui')
-rw-r--r--Mailman/Gui/General.py8
-rw-r--r--Mailman/Gui/NonDigest.py10
2 files changed, 9 insertions, 9 deletions
diff --git a/Mailman/Gui/General.py b/Mailman/Gui/General.py
index 43c5967d..b398bc92 100644
--- a/Mailman/Gui/General.py
+++ b/Mailman/Gui/General.py
@@ -344,7 +344,7 @@ class General(GUIBase):
type="hidden" name="new_member_options" value="ignore">'''),
_("""When a new member is subscribed to this list, their initial
- set of options is taken from the this variable's setting.""")),
+ set of options is taken from this variable's setting.""")),
('administrivia', mm_cfg.Radio, (_('No'), _('Yes')), 0,
_('''(Administrivia filter) Check postings and intercept ones
@@ -423,15 +423,15 @@ class General(GUIBase):
mailing list to avoid stray bounces? <em>Yes</em> is
recommended."""),
- _(""""<a href="http://www.faqs.org/rfcs/rfc2822.html">RFC
+ _("""<a href="http://www.faqs.org/rfcs/rfc2822.html">RFC
2822</a> defines the <tt>Sender</tt> header and defines it
as "the mailbox of the agent responsible for the actual
transmission of the message." Mailman replaces this header
- per default with the list's bounce address.
+ by default with the list's bounce address.
<p>While it is debatable if Mailman is such an agent, setting
this header helps directing bounces from some broken MTAs to
- the right destination. On the other hand do some mail
+ the right destination. On the other hand, some mail
readers show unexpected behaviour if this header is set (like
missing addresses in forwarded mails and copies sent to the
bounce address on reply-to-all), so it can be disabled
diff --git a/Mailman/Gui/NonDigest.py b/Mailman/Gui/NonDigest.py
index d1d0d232..9af4a2be 100644
--- a/Mailman/Gui/NonDigest.py
+++ b/Mailman/Gui/NonDigest.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2007 by the Free Software Foundation, Inc.
+# Copyright (C) 2001-2010 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
@@ -82,7 +82,7 @@ class NonDigest(GUIBase):
address.
<p>When personalization is enabled, a few more expansion
- variables that can be included in the <a
+ variables can be included in the <a
href="?VARHELP=nondigest/msg_header">message header</a> and
<a href="?VARHELP=nondigest/msg_footer">message footer</a>.
@@ -139,10 +139,10 @@ and footers:
info.extend([
('scrub_nondigest', mm_cfg.Toggle, (_('No'), _('Yes')), 0,
_('Scrub attachments of regular delivery message?'),
- _('''When you scrub attachments, they are stored in archive
+ _('''When you scrub attachments, they are stored in the archive
area and links are made in the message so that the member can
- access via web browser. If you want the attachments totally
- disappear, you can use content filter options.''')),
+ access them via a web browser. If you want the attachments to
+ totally disappear, you can use content filtering options.''')),
])
info.extend([