From 7a920f27b8a05796746f8350890c6668e028f686 Mon Sep 17 00:00:00 2001
From: Thijs Kinkhorst <thijs@kinkhorst.com>
Date: Wed, 5 Sep 2018 05:03:04 +0000
Subject: [PATCH] New upstream release 2.1.29

---
 Mailman/Cgi/admin.py                  |    2 +-
 Mailman/Cgi/edithtml.py               |   42 +-
 Mailman/Defaults.py.in                |    8 +-
 Mailman/Gui/Privacy.py                |    2 +-
 Mailman/Gui/Topics.py                 |    2 +-
 Mailman/Utils.py                      |   32 +-
 Mailman/Version.py                    |    4 +-
 Mailman/htmlformat.py                 |    4 +-
 NEWS                                  |   40 +-
 bin/find_member                       |    2 +-
 messages/ar/LC_MESSAGES/mailman.po    |  346 +--
 messages/ast/LC_MESSAGES/mailman.po   |  344 +--
 messages/ca/LC_MESSAGES/mailman.po    |  344 +--
 messages/cs/LC_MESSAGES/mailman.po    |  342 +--
 messages/da/LC_MESSAGES/mailman.po    |  346 +--
 messages/de/LC_MESSAGES/mailman.po    |  358 +--
 messages/docstring.files              |   64 +-
 messages/el/LC_MESSAGES/mailman.po    |  344 +--
 messages/eo/LC_MESSAGES/mailman.po    |  367 +--
 messages/es/LC_MESSAGES/mailman.po    |  344 +--
 messages/et/LC_MESSAGES/mailman.po    |  346 +--
 messages/eu/LC_MESSAGES/mailman.po    |  342 +--
 messages/fa/LC_MESSAGES/mailman.po    |  338 +--
 messages/fi/LC_MESSAGES/mailman.po    |  344 +--
 messages/fr/LC_MESSAGES/mailman.po    |  344 +--
 messages/gl/LC_MESSAGES/mailman.po    |  344 +--
 messages/he/LC_MESSAGES/mailman.po    |  342 +--
 messages/hr/LC_MESSAGES/mailman.po    |  342 +--
 messages/hu/LC_MESSAGES/mailman.po    |  344 +--
 messages/ia/LC_MESSAGES/mailman.po    |  342 +--
 messages/it/LC_MESSAGES/mailman.po    |  344 +--
 messages/ja/LC_MESSAGES/mailman.po    | 3844 +++++++++++++------------
 messages/ja/README                    |  114 +-
 messages/ja/doc/Defaults.py.in        |   46 +-
 messages/ko/LC_MESSAGES/mailman.po    |  346 +--
 messages/lt/LC_MESSAGES/mailman.po    |  338 +--
 messages/mailman.pot                  |  336 +--
 messages/marked.files                 |  222 +-
 messages/nl/LC_MESSAGES/mailman.po    |  342 +--
 messages/no/LC_MESSAGES/mailman.po    |  346 +--
 messages/pl/LC_MESSAGES/mailman.po    |  342 +--
 messages/pt/LC_MESSAGES/mailman.po    |  344 +--
 messages/pt_BR/LC_MESSAGES/mailman.po |  344 +--
 messages/ro/LC_MESSAGES/mailman.po    |  342 +--
 messages/ru/LC_MESSAGES/mailman.po    |  344 +--
 messages/sk/LC_MESSAGES/mailman.po    |  342 +--
 messages/sl/LC_MESSAGES/mailman.po    |  348 +--
 messages/sr/LC_MESSAGES/mailman.po    |  338 +--
 messages/sv/LC_MESSAGES/mailman.po    |  350 +--
 messages/tr/LC_MESSAGES/mailman.po    |  342 +--
 messages/uk/LC_MESSAGES/mailman.po    |  344 +--
 messages/vi/LC_MESSAGES/mailman.po    |  344 +--
 messages/zh_CN/LC_MESSAGES/mailman.po |  344 +--
 messages/zh_TW/LC_MESSAGES/mailman.po |  340 +--
 misc/sitelist.cfg                     |    2 +-
 templates/ar/headfoot.html            |    2 +-
 templates/ast/headfoot.html           |    2 +-
 templates/ca/headfoot.html            |    2 +-
 templates/cs/headfoot.html            |    2 +-
 templates/cs/listinfo.html            |    2 +-
 templates/da/headfoot.html            |    2 +-
 templates/de/headfoot.html            |    2 +-
 templates/el/headfoot.html            |    2 +-
 templates/en/headfoot.html            |    2 +-
 templates/es/headfoot.html            |    2 +-
 templates/et/headfoot.html            |    2 +-
 templates/eu/headfoot.html            |    2 +-
 templates/fi/headfoot.html            |    2 +-
 templates/fr/headfoot.html            |    2 +-
 templates/gl/headfoot.html            |    2 +-
 templates/he/headfoot.html            |    2 +-
 templates/hr/headfoot.html            |    2 +-
 templates/hu/headfoot.html            |    2 +-
 templates/ia/headfoot.html            |    2 +-
 templates/it/headfoot.html            |    2 +-
 templates/ja/adminaddrchgack.txt      |    2 +-
 templates/ja/admindbdetails.html      |  111 +-
 templates/ja/admindbpreamble.html     |   14 +-
 templates/ja/admindbsummary.html      |   18 +-
 templates/ja/adminsubscribeack.txt    |    2 +-
 templates/ja/adminunsubscribeack.txt  |    2 +-
 templates/ja/admlogin.html            |   14 +-
 templates/ja/approve.txt              |   14 +-
 templates/ja/archidxfoot.html         |    2 +-
 templates/ja/archtoc.html             |    2 +-
 templates/ja/bounce.txt               |   10 +-
 templates/ja/checkdbs.txt             |    8 +-
 templates/ja/convert.txt              |   42 +-
 templates/ja/cronpass.txt             |   20 +-
 templates/ja/disabled.txt             |   24 +-
 templates/ja/emptyarchive.html        |    6 +-
 templates/ja/headfoot.html            |   28 +-
 templates/ja/help.txt                 |   30 +-
 templates/ja/invite.txt               |   22 +-
 templates/ja/listinfo.html            |   38 +-
 templates/ja/masthead.txt             |   14 +-
 templates/ja/newlist.txt              |   32 +-
 templates/ja/nomoretoday.txt          |   12 +-
 templates/ja/options.html             |   44 +-
 templates/ja/postauth.txt             |    2 +-
 templates/ja/private.html             |   22 +-
 templates/ja/probe.txt                |   26 +-
 templates/ja/roster.html              |    6 +-
 templates/ja/unsub.txt                |    2 +-
 templates/ja/verify.txt               |    2 +-
 templates/ko/headfoot.html            |    2 +-
 templates/lt/headfoot.html            |    2 +-
 templates/nl/headfoot.html            |    2 +-
 templates/no/headfoot.html            |    2 +-
 templates/pt/headfoot.html            |    2 +-
 templates/pt_BR/headfoot.html         |    2 +-
 templates/ro/headfoot.html            |    2 +-
 templates/ru/headfoot.html            |    2 +-
 templates/sk/headfoot.html            |    2 +-
 templates/sl/headfoot.html            |    2 +-
 templates/sr/headfoot.html            |    2 +-
 templates/sv/headfoot.html            |    2 +-
 templates/tr/headfoot.html            |    2 +-
 templates/uk/headfoot.html            |    2 +-
 templates/vi/headfoot.html            |    2 +-
 templates/zh_CN/headfoot.html         |    2 +-
 templates/zh_TW/headfoot.html         |    2 +-
 122 files changed, 9389 insertions(+), 9109 deletions(-)

diff --git a/Mailman/Cgi/admin.py b/Mailman/Cgi/admin.py
index a92ab378..d2577b53 100644
--- a/Mailman/Cgi/admin.py
+++ b/Mailman/Cgi/admin.py
@@ -917,7 +917,7 @@ def membership_options(mlist, subcat, cgidata, doc, form):
     container.AddItem(header)
     # Add a "search for member" button
     table = Table(width='100%')
-    link = Link('http://docs.python.org/library/re.html'
+    link = Link('https://docs.python.org/2/library/re.html'
                 '#regular-expression-syntax',
                 _('(help)')).Format()
     table.AddRow([Label(_('Find member %(link)s:')),
diff --git a/Mailman/Cgi/edithtml.py b/Mailman/Cgi/edithtml.py
index 796d8539..1dd9e87b 100644
--- a/Mailman/Cgi/edithtml.py
+++ b/Mailman/Cgi/edithtml.py
@@ -138,6 +138,13 @@ def main():
         Auth.loginpage(mlist, 'admin', msg=msg)
         return
 
+    # See if the user want to see this page in other language
+    language = cgidata.getfirst('language', '')
+    if language not in mlist.GetAvailableLanguages():
+        language = mlist.preferred_language
+    i18n.set_language(language)
+    doc.set_language(language)
+
     realname = mlist.real_name
     if len(parts) > 1:
         template_name = parts[1]
@@ -169,42 +176,63 @@ def main():
         return
 
     try:
-        if cgidata.keys():
+        if cgidata.keys() and not cgidata.has_key('langform'):
             if csrf_checked:
-                ChangeHTML(mlist, cgidata, template_name, doc)
+                ChangeHTML(mlist, cgidata, template_name, doc, lang=language)
             else:
                 doc.addError(
                   _('The form lifetime has expired. (request forgery check)'))
-        FormatHTML(mlist, doc, template_name, template_info)
+        FormatHTML(mlist, doc, template_name, template_info, lang=language)
     finally:
         doc.AddItem(mlist.GetMailmanFooter())
         print doc.Format()
 
 
 
-def FormatHTML(mlist, doc, template_name, template_info):
+def FormatHTML(mlist, doc, template_name, template_info, lang=None):
+    if lang not in mlist.GetAvailableLanguages():
+        lang = mlist.preferred_language
+    lcset = Utils.GetCharSet(lang)
     doc.AddItem(Header(1,'%s:' % mlist.real_name))
     doc.AddItem(Header(1, template_info))
     doc.AddItem('<hr>')
 
     link = Link(mlist.GetScriptURL('admin'),
                 _('View or edit the list configuration information.'))
+    backlink = Link(mlist.GetScriptURL('edithtml'),
+                    _('Edit the public HTML pages and text files'))
 
     doc.AddItem(FontSize("+1", link))
+    doc.AddItem('<br>')
+    doc.AddItem(FontSize("+1", backlink))
     doc.AddItem('<p>')
     doc.AddItem('<hr>')
+    if len(mlist.GetAvailableLanguages()) > 1:
+        langform = Form(mlist.GetScriptURL('edithtml') + '/' + template_name,
+                        mlist=mlist, contexts=AUTH_CONTEXTS)
+        langform.AddItem(
+                    mlist.FormatButton('editlang-button',
+                                       text = _("Edit this template for")))
+        langform.AddItem(mlist.GetLangSelectBox(lang))
+        langform.AddItem(Hidden('langform', 'True'))
+        doc.AddItem(langform)
+        doc.AddItem('<hr>')
     form = Form(mlist.GetScriptURL('edithtml') + '/' + template_name,
                mlist=mlist, contexts=AUTH_CONTEXTS)
-    text = Utils.maketext(template_name, raw=1, mlist=mlist)
+    text = Utils.maketext(template_name, raw=1, lang=lang, mlist=mlist)
     # MAS: Don't websafe twice.  TextArea does it.
     form.AddItem(TextArea('html_code', text, rows=40, cols=75))
     form.AddItem('<p>' + _('When you are done making changes...'))
+    if lang != mlist.preferred_language:
+        form.AddItem(Hidden('language', lang))
     form.AddItem(SubmitButton('submit', _('Submit Changes')))
     doc.AddItem(form)
 
 
 
-def ChangeHTML(mlist, cgi_info, template_name, doc):
+def ChangeHTML(mlist, cgi_info, template_name, doc, lang=None):
+    if lang not in mlist.GetAvailableLanguages():
+        lang = mlist.preferred_language
     if not cgi_info.has_key('html_code'):
         doc.AddItem(Header(3,_("Can't have empty html page.")))
         doc.AddItem(Header(3,_("HTML Unchanged.")))
@@ -225,7 +253,7 @@ must have shell access to your Mailman server.
         doc.AddItem(Header(3,_("Page Unchanged.")))
         doc.AddItem('<hr>')
         return
-    langdir = os.path.join(mlist.fullpath(), mlist.preferred_language)
+    langdir = os.path.join(mlist.fullpath(), lang)
     # Make sure the directory exists
     omask = os.umask(0)
     try:
diff --git a/Mailman/Defaults.py.in b/Mailman/Defaults.py.in
index 29eaaacc..9105d2e4 100644
--- a/Mailman/Defaults.py.in
+++ b/Mailman/Defaults.py.in
@@ -151,12 +151,14 @@ RECAPTCHA_SECRET_KEY = None
 # GLOBAL_BAN_LIST = ['xxx@aol\.com', '^yyy.*@gmail\.com$']
 GLOBAL_BAN_LIST = []
 
-# IF the following is set to Yes, and a web subscribe comes from an IPv4
+# If the following is set to Yes, and a web subscribe comes from an IPv4
 # address and the IP is listed in Spamhaus SBL, CSS or XBL, the subscription
-# will be blocked.
+# will be blocked.  It will work with IPv6 addresses if Python's py2-ipaddress
+# module is installed.  The module can be installed via pip if not included
+# in your Python.
 BLOCK_SPAMHAUS_LISTED_IP_SUBSCRIBE = No
 
-# IF the following is set to Yes, and a subscriper uses a domain that is
+# If the following is set to Yes, and a subscriber uses a domain that is
 # listed in the Spamhaus DBL, the subscription will be blocked.
 BLOCK_SPAMHAUS_LISTED_DBL_SUBSCRIBE = No
 
diff --git a/Mailman/Gui/Privacy.py b/Mailman/Gui/Privacy.py
index 25e49d2f..4df63da1 100644
--- a/Mailman/Gui/Privacy.py
+++ b/Mailman/Gui/Privacy.py
@@ -203,7 +203,7 @@ class Privacy(GUIBase):
 
             <p>In the text boxes below, add one address per line; start the
             line with a ^ character to designate a <a href=
-            "http://docs.python.org/library/re.html"
+            "https://docs.python.org/2/library/re.html"
             >Python regular expression</a>.  When entering backslashes, do so
             as if you were using Python raw strings (i.e. you generally just
             use a single backslash).
diff --git a/Mailman/Gui/Topics.py b/Mailman/Gui/Topics.py
index b1db0c51..d81dd7b0 100644
--- a/Mailman/Gui/Topics.py
+++ b/Mailman/Gui/Topics.py
@@ -50,7 +50,7 @@ class Topics(GUIBase):
 
              _("""The topic filter categorizes each incoming email message
              according to <a
-            href="http://docs.python.org/library/re.html">regular
+            href="https://docs.python.org/2/library/re.html">regular
              expression filters</a> you specify below.  If the message's
              <code>Subject:</code> or <code>Keywords:</code> header contains a
              match against a topic filter, the message is logically placed
diff --git a/Mailman/Utils.py b/Mailman/Utils.py
index d504ecce..605d0976 100644
--- a/Mailman/Utils.py
+++ b/Mailman/Utils.py
@@ -280,17 +280,28 @@ CRNLpat = re.compile(r'[^\x21-\x7e]')
 def GetPathPieces(envar='PATH_INFO'):
     path = os.environ.get(envar)
     if path:
+        remote = os.environ.get('HTTP_FORWARDED_FOR',
+                 os.environ.get('HTTP_X_FORWARDED_FOR',
+                 os.environ.get('REMOTE_ADDR',
+                                'unidentified origin')))
         if CRNLpat.search(path):
             path = CRNLpat.split(path)[0]
-            remote = os.environ.get('HTTP_FORWARDED_FOR',
-                     os.environ.get('HTTP_X_FORWARDED_FOR',
-                     os.environ.get('REMOTE_ADDR',
-                                    'unidentified origin')))
             syslog('error',
                 'Warning: Possible malformed path attack domain=%s remote=%s',
                    get_domain(),
                    remote)
-        return [p for p in path.split('/') if p]
+        # Check for listname injections that won't be websafed.
+        pieces = [p for p in path.split('/') if p]
+        # Get the longest listname or 20 if none.
+        if list_names():
+            longest = max([len(x) for x in list_names()])
+        else:
+            longest = 20
+        if pieces and len(pieces[0]) > longest:
+            syslog('mischief',
+               'Hostile listname: listname=%s: remote=%s', pieces[0], remote)
+            pieces[0] = pieces[0][:longest] + '...'
+        return pieces
     return None
 
 
@@ -473,7 +484,7 @@ def check_global_password(response, siteadmin=True):
 
 
 _ampre = re.compile('&amp;((?:#[0-9]+|[a-z]+);)', re.IGNORECASE)
-def websafe(s):
+def websafe(s, doubleescape=False):
     # If a user submits a form or URL with post data or query fragments
     # with multiple occurrences of the same variable, we can get a list
     # here.  Be as careful as possible.
@@ -488,8 +499,11 @@ def websafe(s):
         if isinstance(s, str):
             for k in mm_cfg.BROKEN_BROWSER_REPLACEMENTS:
                 s = s.replace(k, mm_cfg.BROKEN_BROWSER_REPLACEMENTS[k])
-    # Don't double escape html entities
-    return _ampre.sub(r'&\1', cgi.escape(s, quote=True))
+    if doubleescape:
+        return cgi.escape(s, quote=True)
+    else:
+        # Don't double escape html entities
+        return _ampre.sub(r'&\1', cgi.escape(s, quote=True))
 
 
 def nntpsplit(s):
@@ -1543,7 +1557,7 @@ def banned_domain(email):
     email = email.lower()
     user, domain = ParseEmail(email)
 
-    lookup = '%s.zen.spamhaus.org' % (domain)
+    lookup = '%s.dbl.spamhaus.org' % (domain)
 
     resolver = dns.resolver.Resolver()
     try:
diff --git a/Mailman/Version.py b/Mailman/Version.py
index 2d90eee8..da704882 100644
--- a/Mailman/Version.py
+++ b/Mailman/Version.py
@@ -16,7 +16,7 @@
 # USA.
 
 # Mailman version
-VERSION = '2.1.27'
+VERSION = '2.1.29'
 
 # And as a hex number in the manner of PY_VERSION_HEX
 ALPHA = 0xa
@@ -28,7 +28,7 @@ FINAL = 0xf
 
 MAJOR_REV = 2
 MINOR_REV = 1
-MICRO_REV = 27
+MICRO_REV = 29
 REL_LEVEL = FINAL
 # at most 15 beta releases!
 REL_SERIAL = 0
diff --git a/Mailman/htmlformat.py b/Mailman/htmlformat.py
index 7dcabc3e..44fb15f5 100644
--- a/Mailman/htmlformat.py
+++ b/Mailman/htmlformat.py
@@ -496,7 +496,9 @@ class TextArea:
     def __init__(self, name, text='', rows=None, cols=None, wrap='soft',
                  readonly=0):
         if isinstance(text, str):
-            safetext = Utils.websafe(text)
+            # Double escape HTML entities in non-readonly areas.
+            doubleescape = not readonly
+            safetext = Utils.websafe(text, doubleescape)
         else:
             safetext = text
         self.name = name
diff --git a/NEWS b/NEWS
index 6e3a8a09..e7071dce 100644
--- a/NEWS
+++ b/NEWS
@@ -5,16 +5,52 @@ Copyright (C) 1998-2018 by the Free Software Foundation, Inc.
 
 Here is a history of user visible changes to Mailman.
 
+2.1.29 (24-Jul-2018)
+
+  Bug Fixes
+
+    - Fixed the listinfo and admin overview pages that were broken by
+      LP: #1780874.  (LP: #1783417)
+
+2.1.28 (23-Jul-2018)
+
+  Security
+ 
+    - A content spoofing vulnerability with invalid list name messages in
+      the web UI has been fixed.  CVE-2018-13796  (LP: #1780874)
+
+  New Features
+
+    - It is now possible to edit HTML and text templates via the web admin
+      UI in a supported language other than the list's preferred_language.
+      Thanks to Yasuhito FUTATSUKI.
+
+  i18n
+
+    - The Japanese translation has been updated by Yasuhito FUTATSUKI.
+
+    - The German translation has been updated by Ralf Hildebrandt.
+
+    - The Esperanto translation has been updated by Rub�n Fern�ndez Asensio.
+
+  Bug fixes and other patches
+
+    - The BLOCK_SPAMHAUS_LISTED_DBL_SUBSCRIBE feature added in 2.1.27 was
+      not working.  This is fixed.  (LP: #1779774)
+
+    - Escaping of HTML entities for the web UI is now done more selectively.
+      (LP: #1779445)
+
 2.1.27 (22-Jun-2018)
 
   Security
 
     - Existing protections against malicious listowners injecting evil
       scripts into listinfo pages have had a few more checks added.
-      JVN#00846677/JPCERT#97432283
+      JVN#00846677/JPCERT#97432283/CVE-2018-0618
 
     - A few more error messages have had their values HTML escaped.
-      JVN#00846677/JPCERT#97432283
+      JVN#00846677/JPCERT#97432283/CVE-2018-0618
 
     - The hash generated when SUBSCRIBE_FORM_SECRET is set could have been
       the same as one generated at the same time for a different list and
diff --git a/bin/find_member b/bin/find_member
index d83b6f59..ba26cc8e 100755
--- a/bin/find_member
+++ b/bin/find_member
@@ -49,7 +49,7 @@ specifically excluded.
 Regular expression syntax is Perl5-like, using the Python re module.  Complete
 specifications are at:
 
-http://docs.python.org/library/re.html
+https://docs.python.org/2/library/re.html
 
 Address matches are case-insensitive, but case-preserved addresses are
 displayed.
diff --git a/messages/ar/LC_MESSAGES/mailman.po b/messages/ar/LC_MESSAGES/mailman.po
index 6cedcd82..ac804f7f 100644
--- a/messages/ar/LC_MESSAGES/mailman.po
+++ b/messages/ar/LC_MESSAGES/mailman.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mailman_ar\n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: 2006-03-19 17:06+0300\n"
 "Last-Translator: Munzir Taha <munzirtaha@newhorizons.com.sa>\n"
 "Language-Team: Arabic\n"
@@ -208,7 +208,7 @@ msgstr "من قبلك"
 msgid "by the list administrator"
 msgstr "من قبل مشرف القائمة"
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "لأسباب مجهولة"
 
@@ -224,23 +224,23 @@ msgstr "معطل"
 msgid "Bounce action notification"
 msgstr "تنبيه رد الرفض"
 
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "معطل"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr "استقبل رد الرفض الأخير من قبلك بتاريخ %(date)s"
 
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
 msgid "(no subject)"
 msgstr "(بدون عنوان)"
 
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr "]لا يوجد تفاصيل لرد الرفض["
 
@@ -254,7 +254,7 @@ msgstr "مشرف"
 
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -262,7 +262,7 @@ msgstr "لا يوجد قائمة بالإسم <em>%(safelistname)s</em>"
 
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -272,8 +272,8 @@ msgstr "خطأ"
 
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -285,7 +285,7 @@ msgid "Authorization failed."
 msgstr "فشل التحقق من الشخصية."
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr ""
 
@@ -304,7 +304,7 @@ msgstr ""
 "الاستعمال."
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "تحذير: "
 
@@ -453,7 +453,7 @@ msgstr "اهتم بطلبات المنظمين العالقة"
 msgid "Go to the general list information page"
 msgstr "إذهب إلى صفحة المعلومات العامة للقائمة"
 
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 msgid "Edit the public HTML pages and text files"
 msgstr "حرر صفحات الإتش تي إم إل العمومية والملفات النصية"
 
@@ -544,7 +544,7 @@ msgstr "اسم الموضوع:"
 msgid "Regexp:"
 msgstr "صيغة نظامية Regexp:"
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "الشرح:"
 
@@ -703,7 +703,7 @@ msgid "nodupes"
 msgstr "لا تكرارات"
 
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr "دفعات"
 
@@ -735,7 +735,7 @@ msgstr "B"
 msgid "notmetoo"
 msgstr "ليس لي أيضاً"
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr "ﻻﺏﺭﻱﺩ"
 
@@ -1040,150 +1040,150 @@ msgstr "أكد كلمة سر المنظم"
 msgid "Submit Your Changes"
 msgstr "أرسل تعديلاتك"
 
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr "كلمتي سر المنظم غير متطابقتين"
 
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 #, fuzzy
 msgid "Poster passwords did not match"
 msgstr "كلمتي سرك غير متطابقتين."
 
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 msgid "Administrator passwords did not match"
 msgstr "كلمتي سر المشرف غير متطابقتين"
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "مشترك أصلاً"
 
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr "&lt;سطر فارغ&gt;"
 
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "عنوان بريد إلكتروني سيء أو غير صحيح"
 
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr "عنوان عدواني (فيه أحرف غير مسموحة)"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "تمت دعوته بنجاح"
 
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "تم اشتراكه بنجاح"
 
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "خطأ في الدعوة"
 
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "خطأ في الاشتراك"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "خطأ في تسجيل الاشتراك"
 
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr "لا يمكن إلغاء اشتراك غير الأعضاء"
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 msgid "You must provide both current and new addresses."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 #, fuzzy
 msgid "%(schange_to)s is already a list member."
 msgstr "عضو أصلاً"
 
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 #, fuzzy
 msgid "%(schange_to)s is not a valid email address."
 msgstr "يجب أن تدخل عنواناً إلكترونياً صحيحاً"
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 #, fuzzy
 msgid "%(schange_to)s is already a member"
 msgstr "عضو أصلاً"
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 #, fuzzy
 msgid "%(list_name)s address change notice."
 msgstr "تنبيه إلغاء اشتراك %(realname)s"
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 #, fuzzy
 msgid "Notification sent to %(schange_from)s."
 msgstr "تنبيهات"
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 #, fuzzy
 msgid "Notification sent to %(schange_to)s."
 msgstr "تنبيهات"
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr "قيمة علامة تنظيم غير صحيحة"
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 msgid "member mgt page"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "غير مشترك"
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr "تجاهل التعديلات لعنصر المحذوف: %(user)s"
 
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "تمت إزالته بنجاح"
 
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "خطأ في إلغاء الاشتراك"
 
@@ -1721,8 +1721,8 @@ msgstr ""
 "اضغط على زر <em>إلغاء الاشتراك</em> تحت لإكمال عملية التأكيد\n"
 "    <p>أو اضغط  <em>إلغاء وإزالة</em> لإلغاء طلب إلغاء الاشتراك."
 
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "إلغاء الاشتراك"
 
@@ -2291,47 +2291,51 @@ msgstr "هل أرسل تذكير شهري بكلمات السر؟"
 msgid "List name is required."
 msgstr "اسم القائمة مطلوب."
 
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr "%(realname)s -- عدل صيغة html لـ %(template_info)s"
 
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr "تعديل HTML : خطأ"
 
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr "%(safetemplatename)s: قالب غير صالح"
 
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr "%(realname)s -- تحريرصيغة صفحة HTML "
 
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr "اختر صفحة للتعديل:"
 
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "اعرض أو حرر معلومات ضبط القائمة."
 
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "عندما تنتهي من إجراء تعديلاتك..."
 
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "أرسل التعديلات"
 
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr "لا يمكن أن تكون صفحة html فارغة."
 
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr "لم يتم تعديل صيغة HTML "
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2340,20 +2344,20 @@ msgid ""
 "             "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 #, fuzzy
 msgid "Page Unchanged."
 msgstr "لم يتم تعديل صيغة HTML "
 
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr "تم تحديث HTML بنجاح."
 
@@ -2414,7 +2418,7 @@ msgstr ""
 msgid "Edit Options"
 msgstr "خيارات التحرير"
 
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "اعرض هذه الصفحة في"
@@ -2423,71 +2427,71 @@ msgstr "اعرض هذه الصفحة في"
 msgid "This form requires JavaScript."
 msgstr ""
 
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "خطأ نص برمجي CGI"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "لا يوجد عنوان معطى"
 
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "عنوان بريد إلكتروني غير نظامي: %(safeuser)s"
 
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr "لا يوجد مثل هذ العضو: %(safeuser)s"
 
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 #, fuzzy
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr "تم إرسال رسالة التأكيد."
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 #, fuzzy
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
 "             forwarded to the list administrator for approval."
 msgstr "تم تحويل طلب إلغاء اشتراكك إلى مشرف القائمة للموافقة."
 
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 #, fuzzy
 msgid ""
 "If you are a list member,\n"
 "            your password has been emailed to you."
 msgstr "رسالة تذكيرية لكلمة سرك قد أرسلت إليك."
 
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "فشل التحقق."
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr "رسالة تذكيرية لكلمة سرك قد أرسلت إليك."
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
 msgstr ""
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr "ملاحظة: "
 
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr "اشتراكات القائمة لـ %(safeuser)s على الخادم %(hostname)s"
 
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
@@ -2495,22 +2499,22 @@ msgstr ""
 "انقر على الرابط للذهاب إلى صفحة الخيارات المتعلقة بك من أجل القائمة البريدية "
 "المطلوبة."
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
 "            subscription for this mailing list has been changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "العناوين لم تتطابق!"
 
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr "أنت تستعمل أصلاً ذلك العنوان البريدي الإلكتروني"
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 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 "
@@ -2522,31 +2526,31 @@ msgstr ""
 "%(listname)s, مع أنك طلبت أيضاً تغيير العنوان بشكل عام. عند التأكيد سيتم "
 "تغيير كل قائمة بريدية تحتوي على العنوان %(safeuser)s. "
 
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "العنوان الجديد عضو أصلاً: %(newaddr)s"
 
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "العناوين يجب أن لا تكون فارغة"
 
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr "تم إرسال رسالة تأكيد إلى: %(newaddr)s. "
 
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "تم التزويد بعنوان سيء"
 
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "تم التزويد بعنوان غير نظامي"
 
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s عضو أصلاً في القائمة."
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 #, fuzzy
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
@@ -2557,11 +2561,11 @@ msgstr ""
 "إذا كنت ترى أن هذا حصل بالخطأ، الرجاء اتصل بأصحاب القائمة في الارتباط "
 "%(owneraddr)s."
 
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr "تم تغيير اسم العضو بنجاح. "
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 #, fuzzy
 msgid ""
 "The list administrator may not change the\n"
@@ -2570,15 +2574,15 @@ msgstr ""
 "لقد عطل مشرف القائمة الإرسال بغير الدفعات لهذه القائمة، ولهذا لم يتم ضبط "
 "خيار الإرسال لك. على كل حال تم ضبط الخيارات الأخرى بنجاح."
 
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "يجب أن لا تكون كلمات السر فارغة."
 
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "لم تتطابق كلمات السر!"
 
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 #, fuzzy
 msgid ""
 "The list administrator may not change the\n"
@@ -2588,12 +2592,12 @@ msgstr ""
 "لقد عطل مشرف القائمة الإرسال بغير الدفعات لهذه القائمة، ولهذا لم يتم ضبط "
 "خيار الإرسال لك. على كل حال تم ضبط الخيارات الأخرى بنجاح."
 
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "تم تغيير كلمة السر بنجاح."
 
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
@@ -2602,16 +2606,16 @@ msgstr ""
 "يجب عليك تأكيد إلغاء اشتراكك بتفعيل حقل صح/خطأ تحت زر  <em>إلغاء الاشتراك</"
 "em>.  لم يتم إلغاء اشتراكك."
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 #, fuzzy
 msgid "via the member options page"
 msgstr "صفحة الدخول إلى خيارات عضو القائمة %(realname)s "
 
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "نتائج إلغاء الاشتراك"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -2621,7 +2625,7 @@ msgstr ""
 "تم استلام طلب إلغاء اشتراكك وتم تحويله إلى منظمي القائمة للموافقة. سوف تستلم "
 "إعلام فور اتخاذ منظمي القائمة قرارهم."
 
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -2634,7 +2638,7 @@ msgstr ""
 "إرسال بالدفعات فقد تستلم دفعة أخرى واحدة. إن كان عندك أي أسئلة حول إلغاء "
 "اشتراكك، الرجاء اتصل بمالكي القائمة %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -2642,7 +2646,7 @@ msgid ""
 "                changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -2652,7 +2656,7 @@ msgstr ""
 "لقد عطل مشرف القائمة الإرسال بالدفعات لهذه القائمة، ولهذا لم يتم ضبط خيار "
 "الإرسال لك. على كل حال تم ضبط الخيارات الأخرى بنجاح."
 
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -2662,63 +2666,63 @@ msgstr ""
 "لقد عطل مشرف القائمة الإرسال بغير الدفعات لهذه القائمة، ولهذا لم يتم ضبط "
 "خيار الإرسال لك. على كل حال تم ضبط الخيارات الأخرى بنجاح."
 
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "لقد قمت بتحديد خياراتك بنجاح."
 
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "من الممكن أن تتلقى دفعة أخيرة واحدة."
 
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>نعم، أنا أريد حقيقة أن ألغي اشتراكي</em>"
 
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "غير كلمة سري"
 
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "اعرض اشتراكاتي الأخرى"
 
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "أرسل كلمة سري إلي برسالة إلكترونية"
 
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "كلمة السر"
 
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "خروج"
 
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "أرسل تعديلاتي"
 
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "يوم"
 
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "يوم"
 
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr "%(days)d %(units)s"
 
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "غير عنواني واسمي"
 
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "<em>لا يوجد مواضيع معرفة</em>"
 
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
@@ -2727,19 +2731,19 @@ msgstr ""
 "\n"
 "أنت مشترك في هذه القائمة بالعنوان المحفوظ حالة أحرفه <em>%(cpuser)s</em>."
 
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "صفحة الدخول إلى خيارات عضو القائمة %(realname)s "
 
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "عنوان إلكتروني و "
 
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr "خيارات عضو القائمة %(realname)s للمستخدم  %(safeuser)s"
 
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -2764,19 +2768,19 @@ msgstr ""
 "الكوكيز مفعلة في مستعرضك، وإلا فلن تؤثر أي من تغييراتك.\n"
 "    "
 
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "البريد الإلكتروني:"
 
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "كلمة السر:"
 
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "دخول"
 
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -2788,38 +2792,38 @@ msgstr ""
 "هذه الرسالة على رابط عليك أن تنقر عليه لتكمل عملية الإزالة (يمكنك أيضاً "
 "التأكيد بالبريد، انظر التعليمات في رسالة التأكيد)."
 
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "مذكر كلمة السر"
 
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
 msgstr ""
 "بالنقر على زر <em>تذكير</em>, سوف يتم إرسال كلمة سرك إليك بالبريد الإلكتروني."
 
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "تذكير"
 
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr "<مفقود>"
 
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "موضوع مطلوب غير صحيح: %(topicname)s"
 
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "تفاصيل مصفي الموضوع"
 
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "الاسم:"
 
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr "الصيغة المكررة (كصيغة نظامية):"
 
@@ -6400,7 +6404,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -6431,7 +6435,7 @@ msgstr ""
 "\n"
 "            <p>في مربعات النص تحت، أضف عناناً واحداً في السطر، ابدأ السطر "
 "بمحرف ^ لصنع <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >صيغة بايثون نظامية</a>.  عند إدخال محرف التقسيم الخلفي أدخله "
 "وكأنك تدخل أحرف بايثون خام (مثلاً أنت عادة تستخدم محرف تقسيم خلفي واحد).\n"
 "            <p>لاحظ أن المقابلات مع الإدخالات غير الصيغ النظامية دائماً تحصل "
@@ -7135,7 +7139,7 @@ msgstr "هل يجب أن يكون مصفي الموضوع ممكناً أم مع
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -7158,7 +7162,7 @@ msgid ""
 "             configuration variable."
 msgstr ""
 "يصنف مصفي الموضوع كل رسالة بريد قائمة حسب  <a\n"
-"            href=\"http://docs.python.org/library/re.html\">مصفيات صيغ "
+"            href=\"https://docs.python.org/2/library/re.html\">مصفيات صيغ "
 "نظامية</a> تحددها أنت في الأسفل.  إذا كانت ترويسة  \n"
 "             <code>Subject :</code>  أو <code>Keywords:</code> الخاصة "
 "بالرسالة تحتوي على تطابق مع مصفي موضوع فسوف توضع الرسالة في  <em>جيب</em> "
@@ -7684,7 +7688,7 @@ msgstr "اذهب إلى قائمة المشتركين"
 msgid "Once a month, your password will be emailed to you as a reminder."
 msgstr "في كل شهر مرة، سيتم بإذن الله إرسال كلمة سرك إليك كتذكير."
 
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 msgid "The current archive"
 msgstr "الأرشيف الحالي"
 
@@ -8039,7 +8043,7 @@ msgstr "نهاية "
 msgid "Posting of your message titled \"%(subject)s\""
 msgstr "إرسال رسالتك المعنونة \"%(subject)s\""
 
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "]بدون سبب معطى["
 
@@ -8051,28 +8055,28 @@ msgstr "تحويل لرسالة منظمة"
 msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr "طلب اشتراك جديد في القائمة %(realname)s من العنوان %(addr)s"
 
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "طلب اشتراك"
 
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "استمر في انتظار القبول"
 
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr "طلب إلغاء اشتراك من القائمة %(realname)s من قبل %(addr)s"
 
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr "طلب إلغاء اشتراك"
 
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr "الرسالة الأصلية"
 
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr "تم رفض طلب إلى القائمة البريدية %(realname)s"
 
@@ -8179,56 +8183,56 @@ msgstr "تأكيدك مطلوب للانضمام إلى القائمة البر
 msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr "تأكيدك مطلوب لترك القائمة البريدية %(listname)s ."
 
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr "من قبل %(remote)s"
 
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr "تحتاج الاشتراكات في %(realname)s موافقة المنظم"
 
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "تنبيه اشتراك %(realname)s"
 
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr "يحتاج إلغاء الاشتراك إلى موافقة المدير"
 
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr "تنبيه إلغاء اشتراك %(realname)s"
 
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 #, fuzzy
 msgid "%(realname)s address change notification"
 msgstr "تنبيه إلغاء اشتراك %(realname)s"
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "مجموعة محارف تأكيد سيئة"
 
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "مجموعة محارف تأكيد سيئة"
 
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr "تحتاج الاشتراكات في %(name)s إلى موافقة المدير"
 
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "مجموعة محارف تأكيد سيئة"
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "أدخل كوكي التأكيد"
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr "آخر تنبيه رد تلقائي لهذا اليوم"
 
@@ -8316,15 +8320,15 @@ msgstr ""
 msgid "Original message suppressed by Mailman site configuration\n"
 msgstr ""
 
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr "تم توصيلها من قبل برنامج ميلمان <br>الاصدار %(version)s"
 
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr "مدعومة بلغة بايثون"
 
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr "جي إن يو ليست يونيكس"
 
@@ -9346,7 +9350,7 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
@@ -12082,7 +12086,7 @@ msgstr ""
 
 #~ msgid ""
 #~ "This text can include \n"
-#~ "<a href=\"http://docs.python.org/library/stdtypes.html#string-formatting-"
+#~ "<a href=\"https://docs.python.org/2/library/stdtypes.html#string-formatting-"
 #~ "operations\">Python\n"
 #~ "format strings</a> which are resolved against list attributes.  The\n"
 #~ "list of substitutions allowed are:\n"
@@ -12111,7 +12115,7 @@ msgstr ""
 #~ "    <li><b>cgiext</b> - The extension added to CGI scripts.\n"
 #~ "</ul>"
 #~ msgstr ""
-#~ "يمكن لهذا النص أن يتضمن<a href=\"http://docs.python.org/library/stdtypes."
+#~ "يمكن لهذا النص أن يتضمن<a href=\"https://docs.python.org/2/library/stdtypes."
 #~ "html#string-formatting-operations\">محارف تنسيق بايثون</a> \n"
 #~ "والتي سيتم حلها مع مواصفات القائمة. قائمة الاستبدالات المسموحة هي:\n"
 #~ "\n"
diff --git a/messages/ast/LC_MESSAGES/mailman.po b/messages/ast/LC_MESSAGES/mailman.po
index 49031161..12d12bfd 100644
--- a/messages/ast/LC_MESSAGES/mailman.po
+++ b/messages/ast/LC_MESSAGES/mailman.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mailman\n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: 2009-12-07 17:01+0100\n"
 "Last-Translator: astur <malditoastur@gmail.com>\n"
 "Language-Team: Asturian <alministradores@softastur.org>\n"
@@ -204,7 +204,7 @@ msgstr "por t
 msgid "by the list administrator"
 msgstr "pol alministrador de la llista"
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "por dalg�n motivu desconoc�u"
 
@@ -220,23 +220,23 @@ msgstr "desactivada"
 msgid "Bounce action notification"
 msgstr "Avisu de rebote"
 
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "desactivada"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr "El caberu rebote recib�u de ti foi fae %(date)s"
 
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
 msgid "(no subject)"
 msgstr "(ensin asuntu)"
 
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr "[Nun hai detalles de rebotes disponibles]"
 
@@ -250,7 +250,7 @@ msgstr "Alministrador"
 
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -258,7 +258,7 @@ msgstr "La llista <em>%(safelistname)s</em> nun esiste"
 
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -268,8 +268,8 @@ msgstr "Fallu"
 
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -281,7 +281,7 @@ msgid "Authorization failed."
 msgstr "Autorizaci�n infructuosa."
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr ""
 
@@ -300,7 +300,7 @@ msgstr ""
 "               la to llista de corr�u nun podr� usase."
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "Avisu:"
 
@@ -461,7 +461,7 @@ msgstr "Ocupase de les peticiones pendientes de llendar"
 msgid "Go to the general list information page"
 msgstr "Dir a la p�xina d'informaci�n xeneral sobre la llista."
 
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 msgid "Edit the public HTML pages and text files"
 msgstr ""
 "Editar el c�digu HTML de les p�xines d'accesu\n"
@@ -556,7 +556,7 @@ msgstr "Nome del tema:"
 msgid "Regexp:"
 msgstr "Espresi�n regular:"
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "Descripci�n"
 
@@ -716,7 +716,7 @@ msgid "nodupes"
 msgstr "ensin duplicaos"
 
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr "agrup�u"
 
@@ -748,7 +748,7 @@ msgstr "B"
 msgid "notmetoo"
 msgstr "a m� non"
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr "ensin corr�u"
 
@@ -1086,152 +1086,152 @@ msgstr "Confirma la contrase
 msgid "Submit Your Changes"
 msgstr "Unviar los cambeos"
 
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr "Les contrase�es del Moderador nun concasen"
 
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 #, fuzzy
 msgid "Poster passwords did not match"
 msgstr "Les tos contrase�es nun concasen."
 
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 msgid "Administrator passwords did not match"
 msgstr "Les contrase�es del Alministrador nun concasen"
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "Ya tas soscritu"
 
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr "&lt;llinia vac�a&gt;"
 
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "Direici�n de corr�u electr�nicu incorreuta/inv�lida"
 
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr "Direici�n hostil (carauteres nun v�lidos)"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr "Direici�n baneada (coincidencia %(pattern)s)"
 
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "Invitaos satisfactoriamente:"
 
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "Subscritos satisfactoriamente:"
 
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "Fallu invitando a soscribise:"
 
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "Fallu dando d'alta la soscrici�n:"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "Encaboxasti la soscripci�n darr�u:"
 
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr "Nun puede desoscribise a los non soscritos:"
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 #, fuzzy
 msgid "You must provide both current and new addresses."
 msgstr "Primero tienes qu'iguar la direici�n non v�lida precedente."
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 #, fuzzy
 msgid "%(schange_to)s is already a list member."
 msgstr " y� ta soscritu"
 
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 #, fuzzy
 msgid "%(schange_to)s is not a valid email address."
 msgstr "Tienes de dar una direici�n de corr�u electr�nicu v�lida."
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 #, fuzzy
 msgid "%(schange_to)s is already a member"
 msgstr " y� ta soscritu"
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 #, fuzzy
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr "%(addr)s ta vetada (concordancia: %(patt)s)"
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 #, fuzzy
 msgid "%(list_name)s address change notice."
 msgstr "Notificaci�n de desoscrici�n a %(realname)s"
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 #, fuzzy
 msgid "Notification sent to %(schange_from)s."
 msgstr "Notificaciones"
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 #, fuzzy
 msgid "Notification sent to %(schange_to)s."
 msgstr "Notificaciones"
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr "Flag incorreutu de llendadura"
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 msgid "member mgt page"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "Non soscritu"
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr "Inorando los cambeos del usuariu desanici�u: %(user)s"
 
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "Desanici�u Dafechu:"
 
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "Fallu desoscribiendo:"
 
@@ -1811,8 +1811,8 @@ msgstr ""
 "    <p>O calca <em>Encaboxar y descartar</em> pa encaboxar esta solicit�\n"
 "    de baxa."
 
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "Esborrase de la llista"
 
@@ -2425,47 +2425,51 @@ msgstr "
 msgid "List name is required."
 msgstr "Requierse'l Nome de Llista."
 
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr "%(realname)s -- Editar el c�digu html pa %(template_info)s"
 
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr "Editar HTML : Fallu"
 
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr "%(safetemplatename)s: Plant�a non v�lida"
 
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr "%(realname)s -- Edici�n del c�digu HTML de les P�xines"
 
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr "Seleiciona la p�xina a editar:"
 
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "Ver o editar la informaci�n de configuraci�n de la llista."
 
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "Cuando tengas finao de facer cambeos..."
 
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "Unviar los cambeos"
 
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr "Nun puede tenese una p�xina html erma."
 
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr "C�digu HTML non camud�u."
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 #, fuzzy
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
@@ -2479,19 +2483,19 @@ msgstr ""
 "refug�se. Si ent� quies facer esos cambeos, tienes\n"
 "que tener accesu al to sirvidor Mailman.\n"
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr "Mirar "
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr "FAQ 4.48."
 
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 msgid "Page Unchanged."
 msgstr "P�xina Non Camudada."
 
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr "HTML anov�u satisfactoriamente."
 
@@ -2556,7 +2560,7 @@ msgstr ""
 msgid "Edit Options"
 msgstr "Editar Opciones"
 
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "Ver esta p�xina en "
@@ -2565,34 +2569,34 @@ msgstr "Ver esta p
 msgid "This form requires JavaScript."
 msgstr ""
 
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "Fallu del script CGI"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "Nun se di� direici�n"
 
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "Direici�n de corr�u electr�nicu incorreuta: %(safeuser)s"
 
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr "Nun esiste soscritor: %(safeuser)s."
 
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 #, fuzzy
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr "La confirmaci�n unvi�se per corr�u electr�nicu."
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 #, fuzzy
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
@@ -2601,22 +2605,22 @@ msgstr ""
 "La solicit� de baxa reunvi�se al\n"
 "                    alministrador de la llista pa que-y de'l preste."
 
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 #, fuzzy
 msgid ""
 "If you are a list member,\n"
 "            your password has been emailed to you."
 msgstr "Unvi�se un recordatoriu de la to contrase�a al to corr�u-e."
 
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "Fall� l'autentificaci�n."
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr "Unvi�se un recordatoriu de la to contrase�a al to corr�u-e."
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
@@ -2624,16 +2628,16 @@ msgstr ""
 "L'alministrador de la llista puede nun ver les otres\n"
 "            soscriciones pa esti usuariu."
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr "Nota: "
 
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr "soscriciones de %(safeuser)s en %(hostname)s"
 
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
@@ -2641,7 +2645,7 @@ msgstr ""
 "Calca nel enllaz pa visitar la p�xina de les tos opciones\n"
 "        na llista de corr�u solicitada."
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
@@ -2652,15 +2656,15 @@ msgstr ""
 "la\n"
 "            soscrici�n pa la llista de corr�u camud�se."
 
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "�Les direiciones nun concasen!"
 
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr "Y� tas usando esa direici�n de corr�u electr�nicu"
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 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 "
@@ -2673,31 +2677,31 @@ msgstr ""
 "global de direici�n. Una vegada que lo confirmes, tami�n se camudar�\n"
 "cualisquier otra llista de corr�u que caltenga la direici�n %(safeuser)s."
 
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "La direici�n nueva y� ta dada d'alta: %(newaddr)s"
 
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "Les direiciones nun pueden tar ermes"
 
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr "Unvi�se un mensax de confirmaci�n a %(newaddr)s"
 
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "Disti una direici�n de corr�u electr�nicu nun v�lida"
 
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "Di�se una direici�n de corr�u electr�nicu illegal"
 
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s y� ta soscritu a la llista."
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
 "                      think this restriction is erroneous, please contact\n"
@@ -2707,11 +2711,11 @@ msgstr ""
 "                      qu'esta restrici�n ta mal, por favor, contauta\n"
 "                      colos propietarios de la llista en %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr "Nome de soscritor camudaos dafechu."
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 msgid ""
 "The list administrator may not change the\n"
 "                    password for a user."
@@ -2719,15 +2723,15 @@ msgstr ""
 "L'alministrador de la llista puede non camudar\n"
 "            la contrase�a pal usuariu."
 
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "Les contrase�es nun pueden tar ermes"
 
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "�Les contrase�es nun concasen!"
 
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 msgid ""
 "The list administrator may not change the\n"
 "            password for this user's other subscriptions.  However, the\n"
@@ -2737,12 +2741,12 @@ msgstr ""
 "            contrase�a pa esti usuariu n'otres soscriciones. Sicas�,\n"
 "            camud�se la contrase�a nesta llista de corr�u."
 
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "Camud�se la contrase�a dafechu."
 
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
@@ -2752,16 +2756,16 @@ msgstr ""
 "                verificaci�n que ta embaxu de <em>Desoscribir</em>. �Nun se\n"
 "                t'esborr� de la soscrici�n!"
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 #, fuzzy
 msgid "via the member options page"
 msgstr "Llista %(realname)s: p�xina d'entrada d'opciones soscritor"
 
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "Resultaos de la desoscrici�n"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -2772,7 +2776,7 @@ msgstr ""
 "            de llendadores pa la so aprobaci�n. Notificar�sete\n"
 "            cuando'l llendador tenga tomao la so decisi�n."
 
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -2789,7 +2793,7 @@ msgstr ""
 "        baxa, por favor contauta colos propietarios de la llista en\n"
 "        %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -2801,7 +2805,7 @@ msgstr ""
 "            casu, camudar�nse les opciones pa la soscrici�n d'esta\n"
 "            llista."
 
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -2813,7 +2817,7 @@ msgstr ""
 "En tou\n"
 "            casu, les otres tos opciones afit�ronse dafechu."
 
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -2825,63 +2829,63 @@ msgstr ""
 "En tou\n"
 "            casu, les tos otres opciones afit�ronse dafechu."
 
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "Afitasti les tos opciones con �situ."
 
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "Puede que tengas un caberu corr�u agrup�u."
 
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>S�, daveres quiero dame de baxa</em>"
 
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "Camudar la mio contrase�a"
 
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "Llistar les mios otres soscriciones"
 
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "Unviame la mio contrase�a per corr�u-e"
 
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "contrase�a"
 
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "Colar"
 
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "Confirmar los mios cambeos"
 
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "d�es"
 
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "d�a"
 
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr "%(days)d %(units)s"
 
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "Camudar la mio Direici�n y Nome"
 
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "<em>Temes non defin�os</em>"
 
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
@@ -2891,19 +2895,19 @@ msgstr ""
 "Tas soscritu a la llista cola direici�n respetando may�scules y min�scules\n"
 "<em>%(cpuser)s</em>."
 
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "Llista %(realname)s: p�xina d'entrada d'opciones soscritor"
 
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "direici�n de corr�u electr�nicu y "
 
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr "Llista %(realname)s: opciones de soscrici�n de %(safeuser)s"
 
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -2938,19 +2942,19 @@ msgstr ""
 "    "
 
 # In this entry insert a space at the end of string, it will be stripped.
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "Corr�u electr�nicu: "
 
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "Contrase�a:"
 
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "Entrar"
 
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -2964,11 +2968,11 @@ msgstr ""
 "    tami�n confirmar per corr�u electr�nicu; mira les intrucciones nel\n"
 "    mensax de confirmaci�n)."
 
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "Remembrar contrase�a"
 
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
@@ -2976,27 +2980,27 @@ msgstr ""
 "Al calcar en <em>Remembrar</em>, la to\n"
 "    contrase�a unviar�sete per email al to corr�u."
 
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "Remembrar"
 
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr "<perd�u>"
 
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "El tema solicit�u nun ye v�lidu: %(topicname)s"
 
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "Detalles de la pe�era de temes"
 
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "Nome:"
 
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr "Patr�n (como una espresi�n regular):"
 
@@ -7101,7 +7105,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -7142,7 +7146,7 @@ msgstr ""
 "            <p>Na caxa de testu de m�s abaxo, amiesta una direici�n en cada "
 "llinia, entama la llinia\n"
 "            col car�uter ^ pa designar una \n"
-"            <a href=\"http://docs.python.org/library/re.html\">\n"
+"            <a href=\"https://docs.python.org/2/library/re.html\">\n"
 "            espresi�n regular de Python</a>. Cuando introduzas barres "
 "atenllaes de manzorga a mandrecha,\n"
 "            f�ilo como si tuvieres usando cadenes de Python (davezu nam�i "
@@ -7954,7 +7958,7 @@ msgstr "
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -7977,7 +7981,7 @@ msgid ""
 "             configuration variable."
 msgstr ""
 "La pe�era seg�n el tema, clasifica cada mensax recib�u\n"
-"             seg�n: les <a href=\"http://docs.python.org/library/re.html\">\n"
+"             seg�n: les <a href=\"https://docs.python.org/2/library/re.html\">\n"
 "             pe�eres d'espresiones regulares</a> qu'especifiques embaxo. Si "
 "les cabeceres\n"
 "             <code>Asuntu:</code> o <code>Pallabres clave</code>\n"
@@ -8612,7 +8616,7 @@ msgstr "Visitar Llista Soscritores"
 msgid "Once a month, your password will be emailed to you as a reminder."
 msgstr "Cada m�s, se unviar� la to clave per corr�u pa remembratela."
 
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 msgid "The current archive"
 msgstr "L'archivu actual"
 
@@ -8980,7 +8984,7 @@ msgstr "Fin de "
 msgid "Posting of your message titled \"%(subject)s\""
 msgstr "El mensax unvi�u ten�a como asuntu \"%(subject)s\""
 
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "[Nun se di� nenguna raz�n]"
 
@@ -8992,28 +8996,28 @@ msgstr "Reunv
 msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr "Peticion de soscrici�n a la llista %(realname)s de %(addr)s"
 
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "Solicit� de soscrici�n"
 
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "Siguir esperando aprobaci�n"
 
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr "Solicit� de baxa de la llista %(realname)s de %(addr)s"
 
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr "Solicit� de desoscrici�n"
 
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr "Mensax orixinal"
 
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr "La peticion a la llista de corr�u %(realname)s refug�se"
 
@@ -9131,57 +9135,57 @@ msgstr ""
 msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr "Fai falta que confirmes p'abandonar la llista de corr�u %(listname)s"
 
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr " de %(remote)s"
 
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr ""
 "les soscriciones a %(realname)s necesiten l'aprobaci�n del alministrador"
 
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "Notificaci�n de soscrici�n a %(realname)s"
 
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr "les baxes de %(realname)s necesiten l'aprobaci�n del llendador"
 
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr "Notificaci�n de desoscrici�n a %(realname)s"
 
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 #, fuzzy
 msgid "%(realname)s address change notification"
 msgstr "Notificaci�n de desoscrici�n a %(realname)s"
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "Cadena de confirmaci�n incorreuta"
 
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "Cadena de confirmaci�n incorreuta"
 
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr "La soscrici�n a %(name)s requier aprobaci�n del alministrador"
 
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "Cadena de confirmaci�n incorreuta"
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "Introduz cadena de confirmaci�n"
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr "Cabera notificaci�n d'autorempuesta pa g�ei"
 
@@ -9274,15 +9278,15 @@ msgstr ""
 msgid "Original message suppressed by Mailman site configuration\n"
 msgstr ""
 
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr "Entreg�u per Mailman<br>versi�n %(version)s"
 
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr "Fecho en Python"
 
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr "Gnu Nun ye Unix"
 
@@ -10701,7 +10705,7 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
@@ -10741,7 +10745,7 @@ msgstr ""
 "La Usu de la espresi�n regular ye al estilu Perl5, usando'l modulu Python "
 "re. Les especificaciones completes tan en:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Al guetar les direiciones nun se distinguen may�scules de min�scules, ensin "
 "embargo, \n"
diff --git a/messages/ca/LC_MESSAGES/mailman.po b/messages/ca/LC_MESSAGES/mailman.po
index fcfbe658..e9e22f82 100644
--- a/messages/ca/LC_MESSAGES/mailman.po
+++ b/messages/ca/LC_MESSAGES/mailman.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mailman 2.1.11\n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: 2009-01-28 01:23+0100\n"
 "Last-Translator: David Planella <david.planella@gmail.com>\n"
 "Language-Team: Catalan <mailman@llistes.softcatala.org>\n"
@@ -214,7 +214,7 @@ msgstr "de vós"
 msgid "by the list administrator"
 msgstr "de l'administrador de la llista"
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "per raons desconegudes"
 
@@ -230,23 +230,23 @@ msgstr "inhabilitat"
 msgid "Bounce action notification"
 msgstr "Notificació de mesura de retorn"
 
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "inhabilitat"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr " El vostre darrer missatge retornat rebut és del %(date)s"
 
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
 msgid "(no subject)"
 msgstr "(sense assumpte)"
 
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr "[No hi ha detalls disponibles sobre retorns]"
 
@@ -260,7 +260,7 @@ msgstr "Administrador"
 
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -268,7 +268,7 @@ msgstr "La llista <em>%(safelistname)s</em> no existeix"
 
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -278,8 +278,8 @@ msgstr "Error"
 
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -291,7 +291,7 @@ msgid "Authorization failed."
 msgstr "Ha fallat l'autorització."
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr ""
 
@@ -310,7 +310,7 @@ msgstr ""
 "                serà inutilitzable."
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "Avís: "
 
@@ -472,7 +472,7 @@ msgstr "Atén les peticions pendents de moderació"
 msgid "Go to the general list information page"
 msgstr "Vés a la pàgina d'informació general de la llista"
 
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 msgid "Edit the public HTML pages and text files"
 msgstr "Edita les pàgines HTML i fitxers de text públics"
 
@@ -565,7 +565,7 @@ msgstr "Nom del tema:"
 msgid "Regexp:"
 msgstr "Expressió regular:"
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "Descripció:"
 
@@ -728,7 +728,7 @@ msgid "nodupes"
 msgstr "sense dupls"
 
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr "agrupats"
 
@@ -760,7 +760,7 @@ msgstr "R"
 msgid "notmetoo"
 msgstr "sense còpia"
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr "sense correu"
 
@@ -1105,152 +1105,152 @@ msgstr "Confirmeu la contrasenya del moderador:"
 msgid "Submit Your Changes"
 msgstr "Envia els canvis"
 
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr "Les contrasenyes del moderador no coincideixen"
 
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 #, fuzzy
 msgid "Poster passwords did not match"
 msgstr "La vostra contrasenya no coincideix."
 
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 msgid "Administrator passwords did not match"
 msgstr "Les contrasenyes de l'administrador no coincideixen"
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "Ja sou membre"
 
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr "&lt;línia en blanc&gt;"
 
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "Adreça de correu electrònic errònia/invàlida"
 
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr "Adreça hostil (caràcters il·legals)"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr "L'adreça està bandejada (coincideix amb %(pattern)s)"
 
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "Convidat satisfactòriament:"
 
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "Subscrit satisfactòriament:"
 
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "Error en convidar:"
 
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "Error en subscriure:"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "Subscripció cancel·lada satisfactòriament:"
 
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr "No es pot cancel·lar la subscripció d'adreces que no són membres:"
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 #, fuzzy
 msgid "You must provide both current and new addresses."
 msgstr "Primer has de fixar l'anterior adreça invàlida."
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 #, fuzzy
 msgid "%(schange_to)s is already a list member."
 msgstr " ja és un membre"
 
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 #, fuzzy
 msgid "%(schange_to)s is not a valid email address."
 msgstr "Heu d'especificar una adreça electrònica vàlida."
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 #, fuzzy
 msgid "%(schange_to)s is already a member"
 msgstr " ja és un membre"
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 #, fuzzy
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr "%(addr)s està bandejat (coincideix amb: %(patt)s)"
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 #, fuzzy
 msgid "%(list_name)s address change notice."
 msgstr "Notificació de la cancel·lació de la subscripció a %(realname)s"
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 #, fuzzy
 msgid "Notification sent to %(schange_from)s."
 msgstr "Notificacions"
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 #, fuzzy
 msgid "Notification sent to %(schange_to)s."
 msgstr "Notificacions"
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr "Valor erroni del senyal de moderació"
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 msgid "member mgt page"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "No subscrit"
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr "S'estan ignorant els canvis al membre suprimit: %(user)s"
 
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "Suprimit satisfactòriament:"
 
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "Error en cancel·lar la subscripció:"
 
@@ -1839,8 +1839,8 @@ msgstr ""
 "de\n"
 "    cancel·lació de subscripció."
 
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "Cancel·la la subscripció"
 
@@ -2463,47 +2463,51 @@ msgid "List name is required."
 msgstr "Es requereix el nom de la llista."
 
 # FIXME: l'HTML o el HTML? jm
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr "%(realname)s -- Edita l'html per %(template_info)s"
 
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr "Edita l'HTML: Error"
 
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr "%(safetemplatename)s: és una plantilla errònia"
 
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr "%(realname)s -- Edició de la pàgina HTML"
 
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr "Seleccioneu una pàgina a editar:"
 
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "Vegeu o editeu la informació de la configuració de la llista."
 
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "Quan hageu acabat de fer canvis..."
 
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "Envia els canvis"
 
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr "No hi pot haver una pàgina html buida."
 
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr "No s'ha modificat l'HTML."
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2520,19 +2524,19 @@ msgstr ""
 "accés al vostre servidor del Mailman a través de l'intèrpret d'ordres\n"
 "              "
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr "Vegeu "
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr "PMF 4.48"
 
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 msgid "Page Unchanged."
 msgstr "No s'ha modificat la pàgina."
 
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr "S'ha actualitzat l'HTML satisfactòriament."
 
@@ -2596,7 +2600,7 @@ msgstr ""
 msgid "Edit Options"
 msgstr "Edita les opcions"
 
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "Mostra aquesta pàgina en"
@@ -2605,34 +2609,34 @@ msgstr "Mostra aquesta pàgina en"
 msgid "This form requires JavaScript."
 msgstr ""
 
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "Error d'script CGI"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "No s'ha especificat cap adreça"
 
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "Adreça de correu electrònic errònia: %(safeuser)s"
 
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr "El membre no existeix: %(safeuser)s."
 
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 #, fuzzy
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr "S'ha enviat el correu electrònic de confirmació."
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 #, fuzzy
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
@@ -2642,7 +2646,7 @@ msgstr ""
 "                    s'ha enviat a l'administrador de la llista\n"
 "                    perquè l'aprovi."
 
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 #, fuzzy
 msgid ""
 "If you are a list member,\n"
@@ -2651,17 +2655,17 @@ msgstr ""
 "Se us ha enviat un recordatori de la vostra contrasenya per correu "
 "electrònic."
 
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "Ha fallat l'autenticació."
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr ""
 "Se us ha enviat un recordatori de la vostra contrasenya per correu "
 "electrònic."
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
@@ -2669,16 +2673,16 @@ msgstr ""
 "L'administrador de la llista no pot visualitzar les\n"
 "            altres subscripcions d'aquest usuari."
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr "Nota: "
 
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr "Subscripcions de la llista per %(safeuser)s a %(hostname)s"
 
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
@@ -2686,7 +2690,7 @@ msgstr ""
 "Feu clic en un enllaç per a visitar la vostra pàgina\n"
 "        d'opcions de la llista sol·licitada."
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
@@ -2697,15 +2701,15 @@ msgstr ""
 "            maneres, s'ha canviat la subscripció per a aquesta llista de "
 "correu."
 
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "Les adreces no coincideixen"
 
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr "Ja esteu fent servir aquesta adreça de correu electrònic"
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 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 "
@@ -2719,31 +2723,31 @@ msgstr ""
 "qualsevol altra llista que contingui l'adreça %(safeuser)s també serà "
 "canviada."
 
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "La nova adreça de correu electrònic ja es un membre: %(newaddr)s"
 
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "les adreces no poden estar en blanc"
 
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr "Un missatge de confirmació ha estat enviat a %(newaddr)s."
 
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "L'adreça proporcionada es errònia "
 
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "L'adreça proporcionada es errònia "
 
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s ja es un membre de la llista."
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
 "                      think this restriction is erroneous, please contact\n"
@@ -2754,11 +2758,11 @@ msgstr ""
 "                      contacteu amb el propietari de la llista a "
 "%(owneraddr)s."
 
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr "Nom de membre canviat satisfactòriament."
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 msgid ""
 "The list administrator may not change the\n"
 "                    password for a user."
@@ -2766,15 +2770,15 @@ msgstr ""
 "L'administrador de la llista no pot canviar\n"
 "                    la contrasenya d'un usuari."
 
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "La contrasenya no ha d'estar en blanc"
 
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "La contrasenya no coincideix!"
 
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 msgid ""
 "The list administrator may not change the\n"
 "            password for this user's other subscriptions.  However, the\n"
@@ -2786,12 +2790,12 @@ msgstr ""
 "llista \n"
 "            de correu"
 
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "Contrasenya canviada satisfactòriament."
 
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
@@ -2802,16 +2806,16 @@ msgstr ""
 "                la casella sota el botó <em>cancel·lar subscripció</em>.\n"
 "                La vostra subscripció no ha estat cancel·lada!"
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 #, fuzzy
 msgid "via the member options page"
 msgstr "Llista %(realname)s: pàgina d'entrada a les opcions de membre "
 
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "Resultats de la cancel·lació de la subscripció"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -2824,7 +2828,7 @@ msgstr ""
 "Rebràs una\n"
 "            notificació quan el moderador prengui una decisió."
 
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -2841,7 +2845,7 @@ msgstr ""
 "            subscripció contacta amb l'amo de la llista a\n"
 "            %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -2855,7 +2859,7 @@ msgstr ""
 "de\n"
 "                 correu sí que s'han canviat."
 
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -2869,7 +2873,7 @@ msgstr ""
 "totes \n"
 "            les altres opcions s'han establert satisfactòriament."
 
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -2883,63 +2887,63 @@ msgstr ""
 "establert\n"
 "            satisfactòriament."
 
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "Heu establert les teves opcions satisfactòriament."
 
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "Pot ser que encara rebeu un últim resum."
 
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>Sí, realment vull cancel·lar la subscripció</em>"
 
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "Canvia la meva contrasenya"
 
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "Llista les meves altres subscripcions"
 
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "Envia'm la meva contrasenya per correu electrònic"
 
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "contrasenya"
 
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "Surt"
 
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "Envia els meus canvis"
 
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "dies"
 
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "dia"
 
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr "%(days)d %(units)s"
 
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "Canvia la meva adreça i el meu nom"
 
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "<em>No hi ha temes definits </em>"
 
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
@@ -2949,19 +2953,19 @@ msgstr ""
 "Esteu subscrit a aquesta llista amb l'adreça <em>%(cpuser)s</em>, de la qual "
 "se n'han mantingut les majúscules i minúscules. "
 
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "Llista %(realname)s: pàgina d'entrada a les opcions de membre "
 
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "adreça electrònica i "
 
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr "Llista %(realname)s: opcions d'usuari per a %(safeuser)s"
 
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -2992,19 +2996,19 @@ msgstr ""
 "    efecte.\n"
 "    "
 
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "Adreça electrònica:"
 
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "Entra"
 
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -3019,11 +3023,11 @@ msgstr ""
 "    les instruccions en el missatge de confirmació per a obtenir-ne més \n"
 "    informació)."
 
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "Recordatori de la contrasenya"
 
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
@@ -3031,27 +3035,27 @@ msgstr ""
 "En fer clic en el botó <em>Recorda-me-la</em>, se us enviarà\n"
 "    la contrasenya per correu electrònic."
 
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "Recorda-me-la"
 
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr "<manca>"
 
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "El tema sol·licitat no és vàlid: %(topicname)s"
 
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "Detalls del filtre de temes"
 
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "Nom:"
 
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr "Patró (com a regexp):"
 
@@ -7193,7 +7197,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -7235,7 +7239,7 @@ msgstr ""
 "            <p>A les caixes de text d'abaix, afegeix una adreça per línia; "
 "comença la\n"
 "            línia amb ^ per a designar <a href=\n"
-"            \"http://www.python.org/doc/current/lib/module-re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >una expressió regular de Python</a>.  Quan escriguis barres "
 "inverses, fes-ho\n"
 "            com si estiguessis al Python (ex. normalment només es fa servir\n"
@@ -8051,7 +8055,7 @@ msgstr "Voleu que el filtre de tema estigui habilitat o inhabilitat?"
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -8075,7 +8079,7 @@ msgid ""
 msgstr ""
 "El filtre segons el tema, classifica cada missatge rebut segons:\n"
 "<a\n"
-"            href=\"http://www.python.org/doc/current/lib/module-re.html"
+"            href=\"https://docs.python.org/2/library/re.html"
 "\">els filtres\n"
 "            d'expressions</a> que especifiqui abaix.\n"
 "            Si les capçaleres <code>Subject:</code> o <code>Keywords</code>\n"
@@ -8704,7 +8708,7 @@ msgstr ""
 "Una vegada al mes, se us enviarà la vostra contrasenya per correu electrònic "
 "com a recordatori."
 
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 msgid "The current archive"
 msgstr "L'arxiu actual"
 
@@ -9081,7 +9085,7 @@ msgstr "Final de "
 msgid "Posting of your message titled \"%(subject)s\""
 msgstr "Enviament del vostre missatge anomenat «%(subject)s»"
 
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "[No s'ha donat cap motiu]"
 
@@ -9094,29 +9098,29 @@ msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr ""
 "Sol·licitud de subscripció nova per a la llista %(realname)s de %(addr)s"
 
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "Sol·licitud de subscripció"
 
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "Continua esperant l'aprovació"
 
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr ""
 "Sol·licitud de cancel·lació de subscripció nova a %(realname)s de %(addr)s"
 
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr "Sol·licitud de cancel·lació de subscripció"
 
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr "Missatge original"
 
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr "S'ha refusat la sol·licitud a la llista de correu %(realname)s"
 
@@ -9237,58 +9241,58 @@ msgstr ""
 "Es requereix la vostra confirmació per a abandonar la llista de correu "
 "%(listname)s"
 
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr " de %(remote)s"
 
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr "les subscripcions a %(realname)s requereixen l'aprovació del moderador"
 
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "Notificació de subscripció a %(realname)s"
 
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr ""
 "les cancel·lacions de subscripció requereixen l'aprovació del moderador"
 
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr "Notificació de la cancel·lació de la subscripció a %(realname)s"
 
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 #, fuzzy
 msgid "%(realname)s address change notification"
 msgstr "Notificació de la cancel·lació de la subscripció a %(realname)s"
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "Cadena de confirmació errònia."
 
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "Cadena de confirmació errònia."
 
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr ""
 "les subscripcions a %(name)s requereixen l'aprovació de l'administrador"
 
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "Cadena de confirmació errònia."
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "Introduïu la galeta de confirmació"
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr "Última notificació d'auto-resposta per avui"
 
@@ -9384,15 +9388,15 @@ msgstr ""
 
 # FIXME: Ve a ser el mateix que «Powered by», però juguen amb el fet que «delivery»
 # té més connotació de correu.
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr "Funciona amb el Mailman<br>versió %(version)s"
 
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr "Funciona amb el Python"
 
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr "GNU No és Unix"
 
@@ -10802,7 +10806,7 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
@@ -10844,7 +10848,7 @@ msgstr ""
 "modul Python. Les \n"
 "especificacions són a:\n"
 "\n"
-"http://www.python.org/doc/current/lib/module-re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Les coincidencies de les adreces son case-insensitive,  però les adreces "
 "case-preserved són\n"
diff --git a/messages/cs/LC_MESSAGES/mailman.po b/messages/cs/LC_MESSAGES/mailman.po
index 126d7aef..21eac4b7 100644
--- a/messages/cs/LC_MESSAGES/mailman.po
+++ b/messages/cs/LC_MESSAGES/mailman.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: a\n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: 2007-03-23 11:26+0100\n"
 "Last-Translator: Dan Ohnesorg <dan@ohnesorg.cz>\n"
 "Language-Team:  <cs@li.org>\n"
@@ -209,7 +209,7 @@ msgstr "na pokyn u
 msgid "by the list administrator"
 msgstr "administr�torem konference"
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "z nezn�m�ch d�vod�"
 
@@ -225,25 +225,25 @@ msgstr "zak
 msgid "Bounce action notification"
 msgstr "Ozn�men� o nedoru�itelnosti"
 
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "zak�z�no"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr ""
 " Posledn� p��sp�vek, kter� se vr�til jako nedoru�iteln� na Va�i adresu m� "
 "datum: %(date)s"
 
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
 msgid "(no subject)"
 msgstr "(no subject)"
 
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr "[��dn� dal�� informace nejsou dostupn�.]"
 
@@ -257,7 +257,7 @@ msgstr "Administr
 
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -265,7 +265,7 @@ msgstr "Nenalezl jsem konferenci <em>%(safelistname)s</em>."
 
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -275,8 +275,8 @@ msgstr "Chyba"
 
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -288,7 +288,7 @@ msgid "Authorization failed."
 msgstr "Selh�n� autorizace."
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr ""
 
@@ -306,7 +306,7 @@ msgstr ""
 "           zp�sob doru�en� zapnout."
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "Pozor: "
 
@@ -460,7 +460,7 @@ msgstr "P
 msgid "Go to the general list information page"
 msgstr "P�ejdi na str�nku se v�eobecn�mi informacemi o konferenci."
 
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 msgid "Edit the public HTML pages and text files"
 msgstr "Edituj HTML �ablony pro ve�ejn� p��stupn� str�nky konference."
 
@@ -554,7 +554,7 @@ msgstr "N
 msgid "Regexp:"
 msgstr "Regul�rn� v�raz:"
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "Popis:"
 
@@ -714,7 +714,7 @@ msgid "nodupes"
 msgstr "nodupes"
 
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr "digest"
 
@@ -746,7 +746,7 @@ msgstr "B"
 msgid "notmetoo"
 msgstr "not metoo"
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr "nomail"
 
@@ -1067,151 +1067,151 @@ msgstr "Potvr
 msgid "Submit Your Changes"
 msgstr "Ulo�it zm�ny"
 
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr "Hesla moder�tora se neshoduj�."
 
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 #, fuzzy
 msgid "Poster passwords did not match"
 msgstr "Va�e hesla se neshoduj�."
 
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 msgid "Administrator passwords did not match"
 msgstr "Hesla administr�tora se neshoduj�."
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "Je ji� ��astn�kem"
 
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr "&lt;pr�zdn� ��dek&gt;"
 
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "Neplatn� emailov� adresa"
 
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr "Neplatn� adresa (obsahuje nepovolen� znaky)"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr "Zak�zan� adresa (vyhovuje vzoru %(pattern)s)"
 
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "�sp�n� p�izv�ni:"
 
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "�sp�n� p�ihl�eni:"
 
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "Chyba p�i pozv�n�:"
 
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "Chyba p�i p�ihla�ov�n�:"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "�sp�n� odhl�eni:"
 
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr "Nemohu odhl�sit n�koho, kdo nen� ��astn�kem:"
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 msgid "You must provide both current and new addresses."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 #, fuzzy
 msgid "%(schange_to)s is already a list member."
 msgstr "je ��astn�kem konference"
 
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 #, fuzzy
 msgid "%(schange_to)s is not a valid email address."
 msgstr "Mus�te zadat platnou e-mailovou adresu."
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 #, fuzzy
 msgid "%(schange_to)s is already a member"
 msgstr "je ��astn�kem konference"
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 #, fuzzy
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr "%(addr)s je zak�z�na (vyhovuje vzoru: %(patt)s)"
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 #, fuzzy
 msgid "%(list_name)s address change notice."
 msgstr "%(realname)s zpr�va o odhl�en�"
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 #, fuzzy
 msgid "Notification sent to %(schange_from)s."
 msgstr "Notifikace"
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 #, fuzzy
 msgid "Notification sent to %(schange_to)s."
 msgstr "Notifikace"
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr "Chybn� hodnota p��znaku moderace."
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 msgid "member mgt page"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "Nen� p�ihl�en"
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr "Ignoruji zm�ny proveden� u odhl�en�ho ��astn�ka: %(user)s"
 
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "�sp�n� odstran�ni:"
 
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "Chyba p�i odhla�ov�n�"
 
@@ -1784,8 +1784,8 @@ msgstr ""
 "\n"
 "    <p>A nebo klikn�te na <em>Zru�it</em> a odhl�en� se neprovede."
 
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "Odhl�sit"
 
@@ -2374,47 +2374,51 @@ msgstr "Zas
 msgid "List name is required."
 msgstr "Jm�no konference je vy�adov�no."
 
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr "Konference %(realname)s -- Editovat �ablony pro %(template_info)s"
 
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr "Chyba p�i editaci HTML �ablon"
 
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr "%(safetemplatename)s: vadn� �ablona"
 
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr "Konference %(realname)s -- Editace HTML str�nek"
 
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr "Vyberte, kterou �ablonu si p�ejete editovat:"
 
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "Zobraz a/nebo modifikuj konfiguraci konference."
 
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "Kdy� jste skon�il se zm�nami...."
 
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "Ulo� zm�ny"
 
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr "Nen� mo�n� m�t pr�zdnou �ablonu pro generov�n� HTML str�nek."
 
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr "HTML �ablony nebyly zm�n�ny"
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2423,20 +2427,20 @@ msgid ""
 "             "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 #, fuzzy
 msgid "Page Unchanged."
 msgstr "HTML �ablony nebyly zm�n�ny"
 
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr "HTML �ablony byly �sp�n� aktualizov�ny."
 
@@ -2499,7 +2503,7 @@ msgstr ""
 msgid "Edit Options"
 msgstr "Editace vlastnost�"
 
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "Zobraz tuto str�nku v "
@@ -2508,34 +2512,34 @@ msgstr "Zobraz tuto str
 msgid "This form requires JavaScript."
 msgstr ""
 
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "Chyba v CGI skriptu"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "Nebyl zad�na adresa"
 
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "Neplatn� emailov� adresa: %(safeuser)s"
 
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr "Nenalezl jsem ��astn�ka: %(safeuser)s."
 
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 #, fuzzy
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr "Potvrzovac� email byl odesl�n."
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 #, fuzzy
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
@@ -2544,22 +2548,22 @@ msgstr ""
 "Va�e ��dost o p�ihl�en� byla p�ed�na administr�torovi konference ke "
 "zpracov�n�."
 
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 #, fuzzy
 msgid ""
 "If you are a list member,\n"
 "            your password has been emailed to you."
 msgstr "Bylo V�m zasl�no p�ipomenut� Va�eho hesla."
 
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "Autentizace selhala."
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr "Bylo V�m zasl�no p�ipomenut� Va�eho hesla."
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
@@ -2567,24 +2571,24 @@ msgstr ""
 "Spr�vce konference nem��e vid�t ostatn�\n"
 "    konference, do kter�ch u�ivatel p�ihl�en."
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr "Pozn�mka "
 
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr ""
 "Seznam konferenc�, ve kter�ch je p�ihl�en u�ivatel %(safeuser)s na serveru "
 "%(hostname)s"
 
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
 msgstr "Pro zobrazen� vlastnost� t�to konference klikn�te na odkaz."
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
@@ -2594,15 +2598,15 @@ msgstr ""
 "    tohoto u�ivatele v ostatn�ch konferenc�ch, kde je p�ihl�en.\n"
 "    Nicm�n� �daje platn� pro tuto konferenci byly zm�n�ny."
 
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "Adresy nesouhlas�!"
 
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr "Tuto emailovou adresu ji� pou��v�te"
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 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 "
@@ -2615,31 +2619,31 @@ msgstr ""
 "zm�nu adresy a tak budou po potvrzen� zm�n�ny adresy v ostatn�ch\n"
 "konferenc�ch, kter�ch je u�ivatel %(safeuser)s �lenem."
 
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "Nov� adresa je v konferenci ji� p�ihl�ena: %(newaddr)s"
 
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "Adresy nesm� z�stat nevypln�n�."
 
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr "Zpr�va s upozorn�n�m byla zasl�na na adresu %(newaddr)s"
 
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "Neplatn� emailov� adresa"
 
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "Neplatn� emailov� adresa"
 
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s ji� je p�ihl�en."
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
 "                      think this restriction is erroneous, please contact\n"
@@ -2649,11 +2653,11 @@ msgstr ""
 "kter� se nesm� p�ihl�sit do konference. Pokud m�te pocit, �e je to chyba\n"
 "kontaktujte spr�vce konference na adrese %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr "Jm�no bylo �sp�n� zm�n�no."
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 #, fuzzy
 msgid ""
 "The list administrator may not change the\n"
@@ -2662,15 +2666,15 @@ msgstr ""
 "Spr�vce konference nem��e vid�t ostatn�\n"
 "    konference, do kter�ch u�ivatel p�ihl�en."
 
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "Nejsou povolena pr�zdn� hesla."
 
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "Hesla nesouhlas�"
 
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 msgid ""
 "The list administrator may not change the\n"
 "            password for this user's other subscriptions.  However, the\n"
@@ -2680,12 +2684,12 @@ msgstr ""
 "    ve kter�ch je ��astn�k p�ihl�en. Nicm�n� heslo pro tuto konferenci\n"
 "    bylo zm�n�no."
 
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "Heslo bylo �sp�n� zm�n�no."
 
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
@@ -2695,16 +2699,16 @@ msgstr ""
 "Za�krtn�te pol��ko pod tla��tkem <em>Odhl�sit</em>.\n"
 "V tomto okam�iku je�t� nejste odhl�en!"
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 #, fuzzy
 msgid "via the member options page"
 msgstr "Konference %(realname)s: p�ihl�en� ��astn�ka pro editaci parametr�"
 
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "V�sledky odhl�en�"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -2714,7 +2718,7 @@ msgstr ""
 "V� po�adavek na odhl�en� byl p�ijat a p�ed�n moder�torovi ke schv�len�.\n"
 "            O v�sledku budete informov�n "
 
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -2729,7 +2733,7 @@ msgstr ""
 "kontaktujte spr�vce\n"
 "na adrese:        %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -2740,7 +2744,7 @@ msgstr ""
 "    ostatn� konference, kde je u�ivatel p�ihl�en. Nicm�n�\n"
 "    pravidla pro tuto konferenci byla zm�n�na."
 
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -2751,7 +2755,7 @@ msgstr ""
 "konferenci.\n"
 "Ale ostatn� volby, kter� jste nastavil, byly akceptov�ny."
 
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -2762,63 +2766,63 @@ msgstr ""
 "m�du.\n"
 "Ale ostatn� volby, kter� jste nastavil, byly akceptov�ny."
 
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "Va�e nastaven� bylo �sp�n� zm�n�no."
 
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "Je�t� mo�n� obdr��te jeden posledn� digest."
 
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>Ano; skute�n� se chci odhl�sit</em>"
 
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "Zm�nit heslo"
 
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "Zobraz ostatn� konference, ve kter�ch jsem p�ihl�en."
 
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "Za�li mi heslo emailem"
 
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "heslo"
 
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "Odhl�sit"
 
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "Prove� zm�ny"
 
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "dny"
 
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "den"
 
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr "%(days)d %(units)s"
 
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "Zm�� moj� adresu a jm�no"
 
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "<em>Nen� definov�no ��dn� t�ma</em>"
 
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
@@ -2829,19 +2833,19 @@ msgstr ""
 "p�smen\n"
 "<em>%(cpuser)s</em>."
 
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "Konference %(realname)s: p�ihl�en� ��astn�ka pro editaci parametr�"
 
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "emailov� adresa a "
 
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr "Nastaven� parametr� pro %(safeuser)s v konferenci %(realname)s"
 
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -2872,19 +2876,19 @@ msgstr ""
 "do kliknut� na odhl�sit."
 
 # In this entry insert a space at the end of string, it will be stripped.
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "Emailov� adresa:"
 
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "Heslo:"
 
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "P�ihl�sit"
 
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -2898,38 +2902,38 @@ msgstr ""
 "Nebo\n"
 "m��ete odhl�en� potvrdit mailem, podrobnosti budou uvedeny v t� zpr�v�."
 
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "P�ipom�nka hesla"
 
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
 msgstr ""
 "Kliknut�m na tla��tko <em>Po�li heslo</em> V�m bude zasl�na Va�e heslo."
 
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "Po�li heslo"
 
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr "<chyb�>"
 
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "T�ma, kter� po�adujete, neexistuje: %(topicname)s"
 
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "Parametry t�matick�ho filtru"
 
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "Jm�no:"
 
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr "Pravidlo (regul�rn� v�raz):"
 
@@ -6761,7 +6765,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -6800,7 +6804,7 @@ msgstr ""
 "            <p>Do n��e zobrazen�ch r�me�k� zapisujte na ka�d� ��dek jednu "
 "adresu.\n"
 "            Pokud chcete pou��t <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Regul�rn� v�raz Pythonu</a> za�n�te ��dek znakem ^. Pokud "
 "pot�ebujete zadat \n"
 "            zp�tn� lom�tko zadejte jej jako jednoduch� (tedy nen� pot�eba "
@@ -7540,7 +7544,7 @@ msgstr "M
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -7563,7 +7567,7 @@ msgid ""
 "             configuration variable."
 msgstr ""
 "T�matick� filtr zat��d� ka�dou p�ijatou zpr�vu s pou�it�m <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regul�rn�ch\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regul�rn�ch\n"
 "             v�raz�</a> , kter� zad�te n��e. Pokud zpr�va obsahuje v "
 "hlavi�ce \n"
 "             <code>Subject:</code> a nebo <code>Keywords:</code> v�raz "
@@ -8145,7 +8149,7 @@ msgstr "Zobraz seznam 
 msgid "Once a month, your password will be emailed to you as a reminder."
 msgstr "Jednou m�s��n� V�m bude heslo pro p�ipomenut� zasl�no."
 
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 msgid "The current archive"
 msgstr "aktu�ln� archiv"
 
@@ -8523,7 +8527,7 @@ msgstr "Konec: "
 msgid "Posting of your message titled \"%(subject)s\""
 msgstr "Va�e zpr�va ve v�ci %(subject)s\""
 
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "[Bez ud�n� d�vodu]"
 
@@ -8535,28 +8539,28 @@ msgstr "Forwardovat moderovanou zpr
 msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr "Po�adavek na p�ihl�en� do konference %(realname)s od %(addr)s"
 
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "��dost o p�ihl�en�"
 
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "Pokra�uj v �ek�n� na souhlas"
 
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr "Po�adavek na p�ihl�en� do konference %(realname)s od %(addr)s"
 
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr "��dost o odhl�en�"
 
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr "P�vodn� zpr�va"
 
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr "Po�adavek do konference %(realname)s byl zam�tnut."
 
@@ -8665,56 +8669,56 @@ msgstr "Pro p
 msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr "Pro odhl�en� z konference %(listname)s je nutn� ov��en�."
 
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr "od %(remote)s"
 
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr "p�ihl�ky do konference %(realname)s vy�aduj� souhlas moder�tora"
 
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "%(realname)s zpr�va o p�ihl�en�."
 
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr "odhl�en� z konference vy�aduje souhlas moder�tora"
 
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr "%(realname)s zpr�va o odhl�en�"
 
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 #, fuzzy
 msgid "%(realname)s address change notification"
 msgstr "%(realname)s zpr�va o odhl�en�"
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "Chybn� potvrzovac� �et�zec"
 
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "Chybn� potvrzovac� �et�zec"
 
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr "p�ihl�ky do konference %(name)s vy�aduj� souhlas moder�tora"
 
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "Chybn� potvrzovac� �et�zec"
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "Zadejte potvrzovac� �et�zec"
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr "Posledn� dne�n� automatick� odpov��"
 
@@ -8810,15 +8814,15 @@ msgstr ""
 msgid "Original message suppressed by Mailman site configuration\n"
 msgstr ""
 
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr "Doru�eno Mailmanem<br>verze %(version)s"
 
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr "Python Powered"
 
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr "Gnu's Not Unix"
 
@@ -9806,7 +9810,7 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
diff --git a/messages/da/LC_MESSAGES/mailman.po b/messages/da/LC_MESSAGES/mailman.po
index 4a471709..38fa87f5 100644
--- a/messages/da/LC_MESSAGES/mailman.po
+++ b/messages/da/LC_MESSAGES/mailman.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mailman\n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: 2013-10-16 13:55+0200\n"
 "Last-Translator: Tom G. Christensen <tgc@statsbiblioteket.dk>\n"
 "Language-Team: Dansk mailman <mm-da@statsbiblioteket.dk>\n"
@@ -207,7 +207,7 @@ msgstr "af dig"
 msgid "by the list administrator"
 msgstr "af listeadministrator"
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "af ukendt grund"
 
@@ -223,23 +223,23 @@ msgstr "stoppet"
 msgid "Bounce action notification"
 msgstr "Meddelelse om behandling af returmails"
 
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "stoppet"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr " Sidst modtagne returmail fra dig var dateret %(date)s"
 
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
 msgid "(no subject)"
 msgstr "(emnefelt tomt)"
 
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr "[Ingen returdetaljer tilg�ngelige]"
 
@@ -253,7 +253,7 @@ msgstr "Administrator"
 
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -261,7 +261,7 @@ msgstr "Listen findes ikke: <em>%(safelistname)s</em>"
 
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -271,8 +271,8 @@ msgstr "Fejl"
 
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -284,7 +284,7 @@ msgid "Authorization failed."
 msgstr "Godkendelse mislykkedes"
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr "Formularens levetid er udl�bet. (beskyttelse mod forfalskning)"
 
@@ -301,7 +301,7 @@ msgstr ""
 "ubrugelig!"
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "Advarsel: "
 
@@ -460,7 +460,7 @@ msgstr "Behandling af anmodninger"
 msgid "Go to the general list information page"
 msgstr "Listens webside"
 
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 msgid "Edit the public HTML pages and text files"
 msgstr "Rediger de offentlige HTML sider og tekst filer"
 
@@ -555,7 +555,7 @@ msgstr "Navnet p&aring; emnet:"
 msgid "Regexp:"
 msgstr "Regexp-udtryk:"
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "Beskrivelse:"
 
@@ -715,7 +715,7 @@ msgid "nodupes"
 msgstr "undg&aring; dubletter"
 
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr "sammendrag-modus"
 
@@ -747,7 +747,7 @@ msgstr "R"
 msgid "notmetoo"
 msgstr "ikke-mine"
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr "stop e-mail"
 
@@ -1088,153 +1088,153 @@ msgstr "Tast adgangskode til forh
 msgid "Submit Your Changes"
 msgstr "Gem &aelig;ndringer"
 
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr "Moderatoradgangskoder er ikke ens!"
 
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 msgid "Poster passwords did not match"
 msgstr "Adgangskoderne til forh�ndsgodkendelse af meddelelser er ikke ens."
 
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 msgid "Administrator passwords did not match"
 msgstr "Administratoradgangskoder er ikke ens!"
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "Allerede medlem"
 
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr "&lt;tom linie&gt;"
 
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "Forkert/ugyldig e-mailadresse"
 
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr "Forkert e-mailadresse (indeholder ugyldige tegn)"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr "Udelukket adresse (matchede %(pattern)s)"
 
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "Invitation er sendt til:"
 
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "Tilmelding er sket:"
 
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "Fejl under invitation:"
 
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "Fejl under tilmelding:"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "Framelding udf&oslash;rt:"
 
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr "Kan ikke framelde et ikke-eksisterende medlem:"
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 #, fuzzy
 msgid "You must provide both current and new addresses."
 msgstr "Du skal rette de ugyldige adresser f�rst."
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 #, fuzzy
 msgid "%(schange_to)s is already a list member."
 msgstr " er allerede medlem"
 
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 #, fuzzy
 msgid "%(schange_to)s is not a valid email address."
 msgstr "Du skal angive en gyldig e-mailadresse."
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 #, fuzzy
 msgid "%(schange_to)s is already a member"
 msgstr " er allerede medlem"
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 #, fuzzy
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr "%(addr)s er udelukket (matchede: %(patt)s)"
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 #, fuzzy
 msgid "%(list_name)s address change notice."
 msgstr "Meddelelse om framelding fra maillisten %(realname)s"
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 #, fuzzy
 msgid "Notification sent to %(schange_from)s."
 msgstr "Meddelelser"
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 #, fuzzy
 msgid "Notification sent to %(schange_to)s."
 msgstr "Meddelelser"
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr "Ugyldig v&aelig;rdi for moderationsflaget"
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 #, fuzzy
 msgid "member mgt page"
 msgstr "via medlemmets personlige side"
 
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "Ikke Tilmeldt"
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr ""
 "&Aelig;ndring af medlem, som er afmeldt er ikke udf&oslash;rt: %(user)s"
 
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "Framelding udf&oslash;rt:"
 
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "Fejl under framelding af:"
 
@@ -1810,8 +1810,8 @@ msgstr ""
 "<p>Eller klik <em>Afbryd og Annuller</em> for fortsat at v&aelig;re  medlem "
 "af listen."
 
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "Afmeld mig"
 
@@ -2419,47 +2419,51 @@ msgstr "Send p&aring;mindelse om adgangskode en gang pr. m&aring;ned?"
 msgid "List name is required."
 msgstr "Listens navn skal angives"
 
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr "%(realname)s -- Rediger html for %(template_info)s"
 
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr "Rediger HTML : Fejl"
 
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr "%(safetemplatename)s: Ugyldig template"
 
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr "%(realname)s -- Rediger HTML-kode for websider"
 
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr "V&aelig;lg den webside du vil redigere:"
 
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "Tilbage til listens administrationsside"
 
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "N&aring;r du er f&aelig;rdig med at udf&oslash;re &aelig;ndringer..."
 
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "Gem &AElig;ndringer"
 
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr "HTML-siden kan ikke v&aelig;re tom!"
 
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr "Ingen &aelig;ndringer i HTML-koden."
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2475,19 +2479,19 @@ msgstr ""
 "det at du har shell adgang til Mailman serveren.\n"
 "            "
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr "Vis"
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr "FAQ 4.48."
 
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 msgid "Page Unchanged."
 msgstr "Ingen &aelig;ndringer i HTML-koden."
 
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr "HTML-koden er opdateret."
 
@@ -2550,7 +2554,7 @@ msgstr ""
 msgid "Edit Options"
 msgstr "&AElig;ndre Indstillinger"
 
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "Se denne side p&aring;"
@@ -2559,34 +2563,34 @@ msgstr "Se denne side p&aring;"
 msgid "This form requires JavaScript."
 msgstr ""
 
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "CGI skriptfejl"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "Ingen e-mailadresse angivet"
 
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "Forkert/Ugyldig e-mailadresse: %(safeuser)s"
 
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr "Medlemmet findes ikke: %(safeuser)s."
 
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 #, fuzzy
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr "En e-mail med bekr&aelig;ftelse er afsendt."
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 #, fuzzy
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
@@ -2595,7 +2599,7 @@ msgstr ""
 "Din anmodning om at blive afmeldt maillisten\n"
 "       skal godkendes og er blevet videresendt til listeadministrator."
 
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 #, fuzzy
 msgid ""
 "If you are a list member,\n"
@@ -2605,31 +2609,31 @@ msgstr ""
 "                            s� er en e-mail med din adgangskode sendt til "
 "dig."
 
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "Login mislykkedes."
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr "En e-mail med din adgangskode er sendt til dig."
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
 msgstr ""
 "Liste administratoren m&aring; ikke se denne brugers andre listemedlemskaber."
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr "Bem&aelig;rk: "
 
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr "Listemedlemskab for %(safeuser)s p&aring; %(hostname)s"
 
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
@@ -2637,7 +2641,7 @@ msgstr ""
 "Klik p&aring; en liste for at komme til dine personlige indstillinger for "
 "listen."
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
@@ -2647,15 +2651,15 @@ msgstr ""
 "denne brugers andre medlemskaber. Medlemskabet p&aring; denne liste er dog "
 "blevet &aelig;ndret."
 
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "Adresserne er ikke ens!"
 
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr "Den e-mailadresse er du allerede tilmeldt listen med"
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 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 "
@@ -2668,31 +2672,31 @@ msgstr ""
 "godkendelse vil\n"
 "alle andre e-maillister som indeholder %(safeuser)s blive &aelig;ndret. "
 
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "Den nye adressen er allerede tilmeldt: %(newaddr)s"
 
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "Adressefelterne m&aelig; ikke v&aelig;re tomme"
 
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr "En bekr&aelig;ftelse er sendt i en e-mail til %(newaddr)s. "
 
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "Ugyldig e-mailadresse angivet"
 
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "Ulovlig e-mailadresse angivet"
 
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s er allerede medlem af listen."
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
 "                      think this restriction is erroneous, please contact\n"
@@ -2702,26 +2706,26 @@ msgstr ""
 "Hvis du mener at dette er en fejl, kan du kontakte listens ejer p&aring; "
 "%(owneraddr)s."
 
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr "Navnet er &aelig;ndret. "
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 msgid ""
 "The list administrator may not change the\n"
 "                    password for a user."
 msgstr ""
 "Liste administratoren m&aring; ikke &aelig;ndre adgangskode for en bruger."
 
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "Felterne til adgangskode m&aring; ikke v&aelig;re tomme"
 
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "Adgangskoderne er ikke ens!"
 
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 msgid ""
 "The list administrator may not change the\n"
 "            password for this user's other subscriptions.  However, the\n"
@@ -2731,12 +2735,12 @@ msgstr ""
 "brugers andre medlemskaber.\n"
 "Adgangskoden p&aring; denne liste er dog blevet &aelig;ndret."
 
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "Adgangskoden er &aelig;ndret."
 
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
@@ -2746,15 +2750,15 @@ msgstr ""
 "i boksen under <em>Afmeld mig</em> knappen.\n"
 "Du er IKKE fjernet fra listen!"
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 msgid "via the member options page"
 msgstr "via medlemmets personlige side"
 
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "Resultat af afmelding"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -2766,7 +2770,7 @@ msgstr ""
 "Du vil modtage en meddelelse s&aring; snart der er truffet en afg&oslash;"
 "relse."
 
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -2781,7 +2785,7 @@ msgstr ""
 "Kontakt venligst listens ejer p&aring; adressen %(owneraddr)s, hvis du har "
 "sp&oslash;rgsm&aring;l ang&aring;ende din afmelding."
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -2792,7 +2796,7 @@ msgstr ""
 "brugers andre medlemskaber. Indstillingerne for denne liste er dog blevet "
 "&aelig;ndret."
 
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -2804,7 +2808,7 @@ msgstr ""
 "Dit valg af sammendrag-modus blev derfor ikke gennemf&oslash;rt, men alle "
 "andre &aelig;ndringer er gennemf&oslash;rt"
 
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -2816,63 +2820,63 @@ msgstr ""
 "Dit fravalg af sammendrag-modus blev derfor ikke gennemf&oslash;rt, men alle "
 "dine andre &aelig;ndringer er gennemf&oslash;rt."
 
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "Dine valg af indstillinger er nu gennemf&oslash;rt.."
 
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "Du vil m&aring;ske modtage en sidste samle-email."
 
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>Ja, jeg vil afmelde mig listen</em>"
 
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "Skift Adgangskode"
 
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "Vis andre lister jeg er medlem af"
 
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "Send Mig Min Adgangskode"
 
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "adgangskode"
 
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "Log ud"
 
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "Gem &aelig;ndringer"
 
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "dage"
 
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "dag"
 
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr "%(days)d %(units)s"
 
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "&Aelig;ndre Min Adresse og Mit Navn"
 
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "</em>Ingen emner er defineret</em>"
 
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
@@ -2881,19 +2885,19 @@ msgstr ""
 "\n"
 "Du er medlem af denne liste med e-mailadressen <em>%(cpuser)s</em>."
 
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "%(realname)s: login til personlige indstillinger"
 
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "e-mailadresse og "
 
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr "%(realname)s: personlige indstillinger for %(safeuser)s"
 
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -2924,19 +2928,19 @@ msgstr ""
 "ellers vil ingen af dine &aelig;ndringer blive gemt.\n"
 " "
 
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "E-mailadresse:"
 
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "Adgangskode:"
 
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "Log ind"
 
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -2951,11 +2955,11 @@ msgstr ""
 "Du kan ogs&aring; bekr&aelig;fte afmeldingen via e-mail. F&oslash;lg "
 "instruktionen i den e-mail du f&aring;r tilsendt."
 
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "Send mig min Adgangskode"
 
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
@@ -2963,27 +2967,27 @@ msgstr ""
 "Klik p&aring; <em>Send Adgangskode</em> for at f&aring; din adgangskode "
 "tilsendt i en e-mail."
 
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "Send Adgangskode"
 
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr "<mangler>"
 
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "Emnet er ikke gyldigt: %(topicname)s"
 
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "Mere information om emnefilteret"
 
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "Navn:"
 
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr "Filter (regexp-udtryk):"
 
@@ -7059,7 +7063,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -7094,7 +7098,7 @@ msgstr ""
 "\n"
 "<p>I tekstboksene nedenfor kan du tilf&oslash;je en e-mailadresse pr. "
 "linie.\n"
-"Du kan ogs&aring; tilf&oslash;je  <a href=\"http://docs.python.org/library/"
+"Du kan ogs&aring; tilf&oslash;je  <a href=\"https://docs.python.org/2/library/"
 "re.html\">Python regexp-udtryk</a>.\n"
 "Begynd i s&aring; fald linien med tegnet ^ for at markere at det er et "
 "s&aring;dant udtryk.\n"
@@ -7881,7 +7885,7 @@ msgstr ""
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -7904,7 +7908,7 @@ msgid ""
 "             configuration variable."
 msgstr ""
 "Emnefilteret kategoriserer hver e-mail som kommer til listen,\n"
-"efter <a href=\"http://docs.python.org/library/re.html\">de regexp-udtryk</"
+"efter <a href=\"https://docs.python.org/2/library/re.html\">de regexp-udtryk</"
 "a>\n"
 "du skriver nedenfor. Hvis felterne <code>Subject:</code> eller "
 "<code>Keywords:</code>\n"
@@ -8488,7 +8492,7 @@ msgstr ""
 "En gang om m&aring;neden vil du som en p&aring;mindelse modtage din "
 "adgangskode i en e-mail."
 
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 msgid "The current archive"
 msgstr "Arkivet"
 
@@ -8865,7 +8869,7 @@ msgstr "Slut p
 msgid "Posting of your message titled \"%(subject)s\""
 msgstr "Din meddelelse med emnet \"%(subject)s\""
 
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "[Ingen begrundelse]"
 
@@ -8877,28 +8881,28 @@ msgstr "Videresending af modereret meddelelse"
 msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr "Ny anmodning om medlemskab p� listen %(realname)s fra %(addr)s"
 
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "Anmodning om tilmelding"
 
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "Forts&aelig;t med at vente p&aring; moderators godkendelse"
 
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr "Ny Anmodning fra %(addr)s om framelding fra listen %(realname)s"
 
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr "Anmodning om framelding"
 
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr "Oprindelig meddelelse"
 
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr "Anmodning til maillisten %(realname)s ikke godkendt"
 
@@ -9012,56 +9016,56 @@ msgstr "Du skal bekr
 msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr "Du skal bekr�fte at du gerne vil forlade %(listname)s mail listen"
 
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr " fra %(remote)s"
 
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr "tilmelding til %(realname)s kr�ver godkendelse af moderator"
 
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "Meddelelse om tilmelding til maillisten %(realname)s"
 
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr "Framelding kr�ver godkendelse af moderator"
 
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr "Meddelelse om framelding fra maillisten %(realname)s"
 
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 #, fuzzy
 msgid "%(realname)s address change notification"
 msgstr "Meddelelse om framelding fra maillisten %(realname)s"
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "Ugyldig identifikator for bekr&aelig;ftelse!"
 
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "Ugyldig identifikator for bekr&aelig;ftelse!"
 
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr "tilmelding til %(name)s kr�ver godkendelse af administrator"
 
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "Ugyldig identifikator for bekr&aelig;ftelse!"
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "efter dit �nske"
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr "Sidste automatiske svar i dag"
 
@@ -9156,15 +9160,15 @@ msgid "Original message suppressed by Mailman site configuration\n"
 msgstr ""
 "Den oprindelige meddelelse er undertrykt pga. Mailmans site konfiguration\n"
 
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr "Leveret af Mailman<br>version %(version)s"
 
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr "Programmeret i Python"
 
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr "GNU er ikke Unix"
 
@@ -10566,7 +10570,7 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
@@ -10607,7 +10611,7 @@ msgstr ""
 "benyttes.\n"
 "Komplet specifikation findes p�:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Adresser sammenlignes uden forskel p� sm� og store bogstaver, men vises med\n"
 "store/sm� bogstaver som de er stavet.\n"
@@ -14161,7 +14165,7 @@ msgstr ""
 
 #~ msgid ""
 #~ "<li>Find members by\n"
-#~ "                <a href=\"http://docs.python.org/library/re.html#regular-"
+#~ "                <a href=\"https://docs.python.org/2/library/re.html#regular-"
 #~ "expression-syntax\"\n"
 #~ "                >Python regular expression</a> (<em>regexp</em>)<br>"
 #~ msgstr ""
diff --git a/messages/de/LC_MESSAGES/mailman.po b/messages/de/LC_MESSAGES/mailman.po
index e5d793d9..16fe0caa 100644
--- a/messages/de/LC_MESSAGES/mailman.po
+++ b/messages/de/LC_MESSAGES/mailman.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mailman\n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: 2016-09-15 14:32-0700\n"
 "Last-Translator: Mirian Margiani <mirian@margiani.ch>\n"
 "Language-Team: German <mailman-i18n@python.org>\n"
@@ -229,7 +229,7 @@ msgstr "selber"
 msgid "by the list administrator"
 msgstr "durch den Administrator der Liste"
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "Aus unbekannten Gr�nden "
 
@@ -248,19 +248,19 @@ msgid "Bounce action notification"
 msgstr "Bounce-Benachrichtigung"
 
 # Mailman/Bouncer.py:158 Mailman/Bouncer.py:162
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "deaktiviert"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr " Die letzte Unzustellbarkeitsmeldung von Ihnen kam am %(date)s"
 
 # Mailman/Handlers/CalcRecips.py:37 Mailman/Handlers/CookHeaders.py:55
 # Mailman/Handlers/Hold.py:240 Mailman/Handlers/Hold.py:274
 # Mailman/Handlers/ToDigest.py:213 Mailman/ListAdmin.py:202
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
@@ -268,7 +268,7 @@ msgid "(no subject)"
 msgstr "(kein Betreff)"
 
 # Mailman/Cgi/admin.py:273 Mailman/Cgi/listinfo.py:139 bin/list_lists:103
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr "[keine Bounce-Details verf�gbar]"
 
@@ -289,7 +289,7 @@ msgstr "Administrator"
 # Mailman/Cgi/subscribe.py:57
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -299,7 +299,7 @@ msgstr "Keine Liste mit Namen <em>%(safelistname)s</em> vorhanden."
 # Mailman/Cgi/subscribe.py:47 Mailman/Cgi/subscribe.py:56
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -310,8 +310,8 @@ msgstr "Fehler"
 # Mailman/Cgi/options.py:52
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -325,7 +325,7 @@ msgid "Authorization failed."
 msgstr "Zugang verweigert."
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr ""
 "Die G�ltigkeitsdauer des Formular ist abgelaufen. (request forgery check)"
@@ -346,7 +346,7 @@ msgstr ""
 
 # Mailman/Cgi/admin.py:1337
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "Achtung: "
 
@@ -527,7 +527,7 @@ msgid "Go to the general list information page"
 msgstr "Zur allgemeinen Listen-Informationsseite gehen"
 
 # Mailman/Cgi/admin.py:371
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 msgid "Edit the public HTML pages and text files"
 msgstr "Texte und �ffentliche HTML-Seiten anpassen"
 
@@ -638,7 +638,7 @@ msgid "Regexp:"
 msgstr "Regul�rer Ausdruck:"
 
 # Mailman/Cgi/admin.py:652 Mailman/Cgi/options.py:799
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "Beschreibung:"
 
@@ -818,7 +818,7 @@ msgstr "Keine Duplikate"
 
 # Mailman/Cgi/admin.py:818
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr "Sammlung"
 
@@ -853,7 +853,7 @@ msgstr "B"
 msgid "notmetoo"
 msgstr "Keine eigenen"
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr "Keine E-Mail"
 
@@ -1252,120 +1252,120 @@ msgid "Submit Your Changes"
 msgstr "�nderungen speichern"
 
 # Mailman/Cgi/admin.py:1111
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr "Die Moderatoren-Passw�rter stimmen nicht �berein"
 
 # Mailman/Cgi/subscribe.py:140
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 msgid "Poster passwords did not match"
 msgstr "Die Genehmigungs-Passw�rter stimmen nicht �berein"
 
 # Mailman/Cgi/admin.py:1123
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 msgid "Administrator passwords did not match"
 msgstr "Die Administrator-Passw�rter stimmen nicht �berein"
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
 # Mailman/Cgi/admin.py:1228
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "Bereits Mitglied"
 
 # Mailman/Cgi/admin.py:1231
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr "&lt;Leerzeile&gt;"
 
 # Mailman/Cgi/admin.py:1232 Mailman/Cgi/admin.py:1235
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "Ung�ltige E-Mail-Adresse"
 
 # Mailman/Cgi/admin.py:1238
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr "Unzul�ssige E-Mail-Adresse (illegale Zeichen!)"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr "Blockierte Adresse (passte auf %(pattern)s)"
 
 # Mailman/Cgi/admin.py:1242
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "Erfolgreich eingeladen:"
 
 # Mailman/Cgi/admin.py:1276
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "Erfolgreich eingetragen: "
 
 # Mailman/Cgi/admin.py:1328
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "Fehler beim Einladen:"
 
 # Mailman/Cgi/admin.py:1328
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "Fehler beim Abonnieren:"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
 # Mailman/Cgi/admin.py:1276
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "Erfolgreich beendete Abonnements:"
 
 # Mailman/Cgi/admin.py:1281
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr "Nichtmitglieder k�nnen nicht aus der Mailingliste ausgetragen werden:"
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 msgid "You must provide both current and new addresses."
 msgstr "Sie m�ssen sowohl die aktuelle und eine neue Adresse angeben."
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr "Die aktuelle und die neue Adresse m�ssen unterschiedlich sein."
 
 # Mailman/Cgi/admindb.py:364
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 msgid "%(schange_to)s is already a list member."
 msgstr "%(schange_to)s ist bereits Mitglied."
 
 # Mailman/Cgi/subscribe.py:103
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 msgid "%(schange_to)s is not a valid email address."
 msgstr "Die E-Mail-Adresse %(schange_to)s ist ung�ltig."
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr "%(schange_from)s ist kein Mitglied"
 
 # Mailman/Cgi/admindb.py:364
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 msgid "%(schange_to)s is already a member"
 msgstr "%(schange_to)s ist bereits Mitglied"
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr "%(schange_to)s ist durch das Muster %(spat)s blockiert"
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr "Adresse %(schange_from)s zu %(schange_to)s ge�ndert"
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
@@ -1374,42 +1374,42 @@ msgstr ""
 "%(list_name)s wurde zu %(change_to)s ge�ndert.\n"
 
 # Mailman/MailList.py:739
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 msgid "%(list_name)s address change notice."
 msgstr "Adress�nderungsbenachrichtigungen der Liste %(list_name)s"
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 msgid "Notification sent to %(schange_from)s."
 msgstr "Eine Benachrichtigung wurde an %(schange_from)s gesendet."
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 msgid "Notification sent to %(schange_to)s."
 msgstr "Eine Benachrichtigung wurde an %(schange_to)s gesendet."
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr "Ung�ltiger Wert der Moderationseinstellung"
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 msgid "member mgt page"
 msgstr ""
 
 # Mailman/Cgi/admin.py:1301
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "Nicht abonniert:"
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr "�nderungen f�r gel�schtes Mitglied %(user)s ignoriert"
 
 # Mailman/Cgi/admin.py:1242
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "Erfolgreich entfernt:"
 
 # Mailman/Cgi/admin.py:1328
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "Fehler beim Beenden des Abonnement:"
 
@@ -2059,8 +2059,8 @@ msgstr ""
 
 # Mailman/Cgi/confirm.py:388 Mailman/Cgi/options.py:530
 # Mailman/Cgi/options.py:665 Mailman/Cgi/options.py:675
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "K�ndigung des Abos"
 
@@ -2719,56 +2719,60 @@ msgid "List name is required."
 msgstr "Der Name der Liste ist erforderlich"
 
 # Mailman/Cgi/edithtml.py:95
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr "%(realname)s -- html f�r %(template_info)s bearbeiten"
 
 # Mailman/Cgi/edithtml.py:99
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr "HTML bearbeiten: Fehler"
 
 # Mailman/Cgi/edithtml.py:100
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr "%(safetemplatename)s: Ung�ltige Vorlage"
 
 # Mailman/Cgi/edithtml.py:105 Mailman/Cgi/edithtml.py:106
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr "%(realname)s -- Bearbeitung der HTML-Seiten"
 
 # Mailman/Cgi/edithtml.py:107
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr "W�hlen Sie die Seite zur Bearbeitung aus:"
 
 # Mailman/Cgi/edithtml.py:133
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "Ansehen oder bearbeiten der Listenkonfiguration."
 
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
 # Mailman/Cgi/edithtml.py:142
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "Wenn Sie mit den �nderungen fertig sind..."
 
 # Mailman/Cgi/edithtml.py:143
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "�nderungen �bermitteln"
 
 # Mailman/Cgi/edithtml.py:150
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr "Sie k�nnen keine leere HTML-Seite verwenden"
 
 # Mailman/Cgi/edithtml.py:151
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr "HTML unver�ndert"
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2782,21 +2786,21 @@ msgstr ""
 "speichern wollen, so ben�tigen Sie Shell-Zugriff auf den Mailman-Server um "
 "dort die Dateien direkt zu editieren."
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr "Siehe"
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr "FAQ 4.48."
 
 # Mailman/Cgi/edithtml.py:151
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 msgid "Page Unchanged."
 msgstr "Seite unver�ndert"
 
 # Mailman/Cgi/edithtml.py:159
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr "HTML erfolgreich aktualisiert"
 
@@ -2870,7 +2874,7 @@ msgid "Edit Options"
 msgstr "Optionen ver�ndern"
 
 # Mailman/Cgi/listinfo.py:183 Mailman/Cgi/roster.py:109
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "Anzeige dieser Seite auf / View this page in"
@@ -2880,37 +2884,37 @@ msgid "This form requires JavaScript."
 msgstr ""
 
 # Mailman/Cgi/options.py:49 Mailman/Cgi/options.py:64
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "CGI Skript Fehler"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr "Ung�ltige Anfrage: %(method)s"
 
 # Mailman/Cgi/admindb.py:338 Mailman/ListAdmin.py:258
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "[Keine E-Mail-Adresse angegeben / kein Login erfolgt]"
 
 # Mailman/Cgi/admin.py:1232 Mailman/Cgi/admin.py:1235
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "Ung�ltige E-Mail-Adresse: %(safeuser)s"
 
 # Mailman/Cgi/options.py:93
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr " %(safeuser)s ist nicht Abonnent."
 
 # Mailman/Cgi/options.py:133
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr "Eine E-Mail zur Best�tigung wurde verschickt."
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
 "             forwarded to the list administrator for approval."
@@ -2919,7 +2923,7 @@ msgstr ""
 "             Listenadministrator weitergeleitet."
 
 # Mailman/Cgi/options.py:144 Mailman/Cgi/options.py:181
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 msgid ""
 "If you are a list member,\n"
 "            your password has been emailed to you."
@@ -2928,34 +2932,34 @@ msgstr ""
 "            wurde Ihnen ihr Passwort zugesandt."
 
 # Mailman/Cgi/options.py:161
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "Authorisierung fehlgeschlagen."
 
 # Mailman/Cgi/options.py:144 Mailman/Cgi/options.py:181
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr "An Sie wurde eine E-Mail mit Ihrem Passwort geschickt."
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
 msgstr ""
 "Der Listenadministrator darf nicht anderen Abonnements eines Nutzers sehen. "
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr "Bachten Sie: "
 
 # Mailman/Cgi/options.py:187
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr "Abonnierte Mailinglisten f�r %(safeuser)s auf %(hostname)s "
 
 # Mailman/Cgi/options.py:190
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
@@ -2963,7 +2967,7 @@ msgstr ""
 "Klicken Sie auf einen Link, um Ihre Optionen f�r die entsprechende Liste zu "
 "ver�ndern."
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
@@ -2974,16 +2978,16 @@ msgstr ""
 "ge�ndert."
 
 # Mailman/Cgi/options.py:231
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "Die Adressen sind nicht identisch!"
 
 # Mailman/Cgi/options.py:236
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr "Sie verwenden bereits diese E-Mail-Adresse"
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 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 "
@@ -2999,36 +3003,36 @@ msgstr ""
 " %(safeuser)s entsprechend angepa�t."
 
 # Mailman/Cgi/admindb.py:364
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "Die neue Adresse ist bereits Mitglied: %(newaddr)s"
 
 # Mailman/Cgi/options.py:242
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "Die Adresse darf nicht leer sein"
 
 # Mailman/Cgi/options.py:258
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr "Eine Best�tigung wurde an %(newaddr)s geschickt. "
 
 # Mailman/Cgi/options.py:267
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "Ung�ltige E-Mail-Adresse"
 
 # Mailman/Cgi/options.py:269
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "E-Mail-Adresse ist nicht erlaubt"
 
 # Mailman/Cgi/options.py:271
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s ist bereits Abonnent der Liste."
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
 "                      think this restriction is erroneous, please contact\n"
@@ -3040,28 +3044,28 @@ msgstr ""
 "%(owneraddr)s."
 
 # Mailman/Cgi/options.py:280
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr "Mitgliedsname erfolgreich ge�ndert."
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 msgid ""
 "The list administrator may not change the\n"
 "                    password for a user."
 msgstr "Der Listenadministrator darf nicht das Passwort eines Nutzers �ndern. "
 
 # Mailman/Cgi/options.py:291
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "Die Passw�rter d�rfen nicht leer sein"
 
 # Mailman/Cgi/options.py:296
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "Die Passw�rter sind nicht identisch !"
 
 # Mailman/Cgi/options.py:462
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 msgid ""
 "The list administrator may not change the\n"
 "            password for this user's other subscriptions.  However, the\n"
@@ -3074,13 +3078,13 @@ msgstr ""
 "diese Liste wurden das Passwort ge�ndert."
 
 # Mailman/Cgi/options.py:312
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "Passwort erfolgreich ge�ndert."
 
 # Mailman/Cgi/options.py:321
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
@@ -3091,17 +3095,17 @@ msgstr ""
 "erfolgreich !"
 
 # Mailman/Cgi/options.py:619
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 #, fuzzy
 msgid "via the member options page"
 msgstr "Mailingliste %(realname)s: Login f�r Mitglieder"
 
 # Mailman/Cgi/options.py:349
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "Ergebnis der K�ndigung"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -3113,7 +3117,7 @@ msgstr ""
 "�ber seine Entscheidung. "
 
 # Mailman/Cgi/options.py:352
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -3127,7 +3131,7 @@ msgstr ""
 "eine weitere. Wenn Sie noch irgendwelche Fragen zu Ihrer K�ndigung haben, "
 "richten Sie bitte Ihre Fragen an den Eigent�mer der Liste, %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -3139,7 +3143,7 @@ msgstr ""
 "ge�ndert."
 
 # Mailman/Cgi/options.py:458
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -3151,7 +3155,7 @@ msgstr ""
 "Optionen wurden erfolgreich gesetzt."
 
 # Mailman/Cgi/options.py:462
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -3163,77 +3167,77 @@ msgstr ""
 "Optionen wurden erfolgreich gesetzt."
 
 # Mailman/Cgi/options.py:466
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "Sie haben Ihre Optionen erfolgreich gesetzt."
 
 # Mailman/Cgi/options.py:469
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "Sie erhalten eventuell eine letzte Nachrichtensammlung."
 
 # Mailman/Cgi/options.py:532
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>Ja, Ich m�chte das Abo wirklich k�ndigen</em>"
 
 # Mailman/Cgi/options.py:536
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "Mein Passwort �ndern"
 
 # Mailman/Cgi/options.py:539
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "Meine anderen Abonnements auflisten"
 
 # Mailman/Cgi/options.py:545
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "Mein Passwort per E-Mail an mich senden"
 
 # Mailman/Cgi/options.py:547
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "Passwort"
 
 # Mailman/Cgi/options.py:549
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "Logout"
 
 # Mailman/Cgi/options.py:551
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "Meine �nderungen �bermitteln"
 
 # Mailman/Cgi/options.py:561
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "Tage"
 
 # Mailman/Cgi/options.py:563
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "Tag"
 
 # Mailman/Cgi/options.py:564
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr "%(days)d %(units)s "
 
 # Mailman/Cgi/options.py:570
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "Meine E-Mail-Adresse und Namen �ndern "
 
 # Mailman/Cgi/options.py:598
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "<em>Keine Themen definiert</em>"
 
 # Mailman/Cgi/options.py:606
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
@@ -3244,22 +3248,22 @@ msgstr ""
 "<em>%(cpuser)s</em> abonniert."
 
 # Mailman/Cgi/options.py:619
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "Mailingliste %(realname)s: Login f�r Mitglieder"
 
 # Mailman/Cgi/options.py:621
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "und E-Mail-Adresse"
 
 # Mailman/Cgi/options.py:623
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr "Mailingliste %(realname)s: Optionen f�r das Mitglied %(safeuser)s "
 
 # Mailman/Cgi/options.py:636
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -3294,22 +3298,22 @@ msgstr ""
 "p>  "
 
 # Mailman/Cgi/options.py:656
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "E-Mail-Adresse:"
 
 # Mailman/Cgi/confirm.py:203 Mailman/Cgi/options.py:658
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "Passwort:"
 
 # Mailman/Cgi/options.py:660
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "Login"
 
 # Mailman/Cgi/options.py:669
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -3329,12 +3333,12 @@ msgstr ""
 " E-Mail-Konten weiterleiten lassen!</p>"
 
 # Mailman/Cgi/options.py:679
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "Passwort-Erinnerung"
 
 # Mailman/Cgi/options.py:683
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
@@ -3345,32 +3349,32 @@ msgstr ""
 "zugeschickt. "
 
 # Mailman/Cgi/options.py:686
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "Passwort zumailen"
 
 # Mailman/Cgi/options.py:776
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr "<fehlend>"
 
 # Mailman/Cgi/options.py:787
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "Angefordertes Thema ist nicht in Ordnung: %(topicname)s"
 
 # Mailman/Cgi/options.py:792
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "Themenfilter Details"
 
 # Mailman/Cgi/options.py:795
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "Name:"
 
 # Mailman/Cgi/options.py:797
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr "Suchmuster (als regul�rer Ausdruck):"
 
@@ -5229,8 +5233,8 @@ msgid ""
 "Should Mailman notify you, the list owner, when bounces\n"
 "             cause a member's bounce score to be incremented?"
 msgstr ""
-"Soll Mailman den Listeninhaber benachrichtigen, wenn ein\n"
-"             Nutzer wegen permanenter Bounces deaktiviert wird?"
+"Soll Mailman den Listeninhaber benachrichtigen, wenn sich\n"
+"             die Bounce-Zahl eines Mitglieds erh&ouml;ht?"
 
 #: Mailman/Gui/Bounce.py:149
 msgid ""
@@ -7641,7 +7645,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -7675,7 +7679,7 @@ msgstr ""
 "\n"
 "<p>F�gen Sie eine E-Mail-Adresse pro Zeile hinzu.\n"
 "Beginnen Sie mit einem ^, um\n"
-" <a href=\"http://docs.python.org/library/re.html\">regul�re\n"
+" <a href=\"https://docs.python.org/2/library/re.html\">regul�re\n"
 " Ausdr�cke(RegExp)</a> einzuleiten. Geben Sie einen Backslash so an, wie in\n"
 " normale Python-Strings (i.d.R. ein einfacher, normaler Backslash).\n"
 "\n"
@@ -7775,7 +7779,7 @@ msgstr ""
 "               <p>Seien Sie vorsichtig. Ist der Wert zu tief, kann es schon "
 "durch eine\n"
 "               einzelne Nachricht, die an mehrere Listen geschrieben wird, "
-"ausgel�st werden.\n"
+"ausgel�st werden."
 
 #: Mailman/Gui/Privacy.py:250
 msgid ""
@@ -8067,7 +8071,7 @@ msgstr ""
 "rfc822\", welche nur\n"
 "             die Originalnachricht enth�lt, wenn keiner der obigen Teile "
 "eingef�gt\n"
-"             werden kann.\n"
+"             werden kann."
 
 #: Mailman/Gui/Privacy.py:374
 msgid ""
@@ -8131,7 +8135,7 @@ msgstr ""
 "auch\n"
 "               f�r Domains gelten, die hier als gleichwertig angegeben "
 "werden. Andere\n"
-"               Optionen wie 'ack' oder 'not&nbsp;metoo' allerdings nicht.\n"
+"               Optionen wie 'ack' oder 'not&nbsp;metoo' allerdings nicht."
 
 #: Mailman/Gui/Privacy.py:400
 msgid "Non-member filters"
@@ -8478,7 +8482,7 @@ msgstr ""
 "(ausser\n"
 "             f�r administrative E-Mails von Mailman). So k�nnen Sie "
 "effektiv\n"
-"             Nachrichten mit b�swilligen Dateien etc. aussortieren.\n"
+"             Nachrichten mit b�swilligen Dateien etc. aussortieren."
 
 #: Mailman/Gui/Privacy.py:570
 msgid "Legacy anti-spam filters"
@@ -8575,7 +8579,7 @@ msgstr "Themenfilter einschalten oder ausschalten?"
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -8598,7 +8602,7 @@ msgid ""
 "             configuration variable."
 msgstr ""
 "Der Themenfilter kategorisiert jede eingehende E-Mail-Nachricht gem�ss <a "
-"href=\"http://docs.python.org/library/re.html\">Filterregeln mit regul�ren "
+"href=\"https://docs.python.org/2/library/re.html\">Filterregeln mit regul�ren "
 "Ausdr�cken</a>, die Sie weiter unten festlegen k�nnen. Wenn die "
 "<code>Subject:</code> oder <code>Keywords:</code> Header der Nachricht mit "
 "dem Suchthema �bereinstimmen, wird die Nachricht in einem thematischen "
@@ -8841,7 +8845,7 @@ msgstr ""
 "zu verwenden,\n"
 "             aber es f�gt allen Nachrichten, die ans Usenet weitergeleitet "
 "werden, einen\n"
-"             <tt>Approved</tt>-Header hinzu.\n"
+"             <tt>Approved</tt>-Header hinzu."
 
 #: Mailman/Gui/Usenet.py:94
 msgid "Prefix <tt>Subject:</tt> headers on postings gated to news?"
@@ -9234,7 +9238,7 @@ msgid "Once a month, your password will be emailed to you as a reminder."
 msgstr "Zur Erinnerung wird Ihnen monatlich Ihr Passwort gemailt."
 
 # Mailman/HTMLFormatter.py:358
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 msgid "The current archive"
 msgstr "Das aktuelle Archiv"
 
@@ -9656,7 +9660,7 @@ msgid "Posting of your message titled \"%(subject)s\""
 msgstr "Ver�ffentlichung Ihrer Nachricht betreffend \"%(subject)s\""
 
 # Mailman/Cgi/admindb.py:338 Mailman/ListAdmin.py:258
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "[Kein Grund angegeben]"
 
@@ -9670,33 +9674,33 @@ msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr "Neuer Abonnementantrag f�r die Liste %(realname)s von %(addr)s"
 
 # Mailman/ListAdmin.py:367
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "Abonnementantrag"
 
 # Mailman/Cgi/confirm.py:490 Mailman/Cgi/confirm.py:588
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "Weitermachen und Erlaubnis abwarten"
 
 # Mailman/Cgi/confirm.py:345
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr "Neuer Abonnement-Antrag f�r Liste %(realname)s von %(addr)s"
 
 # Mailman/Cgi/options.py:349
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr "Listen-Abbestellungsantrag"
 
 # Mailman/ListAdmin.py:399
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr "Urspr�ngliche Nachricht"
 
 # Mailman/ListAdmin.py:402
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr "Die Aufforderung an die Mailingliste %(realname)s wurde zur�ckgewiesen"
 
@@ -9835,67 +9839,67 @@ msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr "Ihre Best�tigung ist n�tig um die Liste %(listname)s abzubestellen."
 
 # Mailman/MailList.py:614 Mailman/MailList.py:886
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr " von %(remote)s"
 
 # Mailman/MailList.py:649
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr ""
 "Das Abonnieren von %(realname)s erfordert die Best�tigung des Moderators"
 
 # Mailman/MailList.py:711 bin/add_members:258
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "%(realname)s Abonnierungsbenachrichtigung"
 
 # Mailman/Cgi/confirm.py:268
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr "Abbestellungen erfordern die Best�tigung des Moderators"
 
 # Mailman/MailList.py:739
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr "%(realname)s Abbestellungbenachrichtigung"
 
 # Mailman/MailList.py:739
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 msgid "%(realname)s address change notification"
 msgstr "Adress�nderungsbenachrichtigung f�r %(realname)s"
 
 # Mailman/Cgi/confirm.py:140
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "Fehlerhafte Best�tigung"
 
 # Mailman/Cgi/confirm.py:140
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "Fehlerhafte Best�tigung"
 
 # Mailman/MailList.py:860
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr ""
 "Das Abonnieren von %(name)s erfordert die Best�tigung des Aministrators"
 
 # Mailman/Cgi/confirm.py:140
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "Fehlerhafte Best�tigung"
 
 # Mailman/Cgi/confirm.py:148
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "Bitte geben Sie den Best�tigungs-Code an"
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr "Letzte automatische Benachrichtigung f�r heute"
 
@@ -9990,17 +9994,17 @@ msgid "Original message suppressed by Mailman site configuration\n"
 msgstr "Original Nachricht durch Mailmain Konfiguration unterdr�ckt\n"
 
 # Mailman/htmlformat.py:611
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr "Zugestellt von Mailman<br>version %(version)s"
 
 # Mailman/htmlformat.py:612
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr "Python Powered"
 
 # Mailman/htmlformat.py:613
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr "Gnu's Not Unix (Gnu's sind keine Unickse)"
 
@@ -11453,7 +11457,7 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
@@ -11492,7 +11496,7 @@ msgstr ""
 "Die vom Python re-Modul benutzte Syntax f�r regul�re Ausdr�cke entspricht\n"
 "der von Perl5. Die kompletten Spezifikationen sind erh�ltlich unter:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Die Adresssuche ignoriert Gross-/Kleinschreibung, zeigt jedoch unter-\n"
 "schiedliche Schreibweisen der Adressen an.\n"
diff --git a/messages/docstring.files b/messages/docstring.files
index 672133e7..825d094e 100644
--- a/messages/docstring.files
+++ b/messages/docstring.files
@@ -1,49 +1,49 @@
-bin/list_members
-bin/list_admins
-bin/mmsitepass
-bin/transcheck
-bin/withlist
-bin/mailmanctl
-bin/check_db
-bin/genaliases
-bin/clone_member
-bin/sync_members
-bin/update
-bin/add_members
-bin/check_perms
-bin/rmlist
-bin/msgfmt.py
 bin/config_list
-bin/version
-bin/reset_pw.py
+bin/show_qfiles
+bin/msgfmt.py
+bin/update
+bin/check_db
+bin/fix_url.py
+bin/discard
 bin/inject
-bin/arch
+bin/list_admins
+bin/newlist
 bin/find_member
-bin/list_lists
+bin/transcheck
+bin/convert.py
+bin/mailmanctl
+bin/rb-archfix
 bin/change_pw
 bin/cleanarch
+bin/mmsitepass
+bin/rmlist
+bin/list_members
 bin/export.py
-bin/remove_members
-bin/fix_url.py
-bin/newlist
 bin/mailman-config
+bin/genaliases
+bin/qrunner
 bin/dumpdb
 bin/list_owners
-bin/discard
-bin/convert.py
-bin/qrunner
-bin/b4b5-archfix
-bin/show_qfiles
+bin/remove_members
 bin/unshunt
-bin/rb-archfix
-cron/mailpasswds
-cron/nightly_gzip
+bin/withlist
+bin/add_members
+bin/version
+bin/list_lists
+bin/arch
+bin/sync_members
+bin/reset_pw.py
+bin/clone_member
+bin/check_perms
+bin/b4b5-archfix
+cron/checkdbs
+cron/gate_news
 cron/senddigests
 cron/bumpdigests
 cron/cull_bad_shunt
 cron/disabled
-cron/gate_news
-cron/checkdbs
+cron/mailpasswds
+cron/nightly_gzip
 Mailman/Commands/cmd_confirm.py
 Mailman/Commands/cmd_echo.py
 Mailman/Commands/cmd_end.py
diff --git a/messages/el/LC_MESSAGES/mailman.po b/messages/el/LC_MESSAGES/mailman.po
index 282d8705..e67bfd2e 100644
--- a/messages/el/LC_MESSAGES/mailman.po
+++ b/messages/el/LC_MESSAGES/mailman.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tuxpaint-2.1pre\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: 2011-09-15 11:53+0800\n"
 "Last-Translator: Limperis Antonis <limperis@cti.gr>\n"
 "Language-Team: Greek <listmaster@sch.gr>\n"
@@ -208,7 +208,7 @@ msgstr "
 msgid "by the list administrator"
 msgstr "��� �� ����������� ��� ������"
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "��� ��������� ������"
 
@@ -224,25 +224,25 @@ msgstr "
 msgid "Bounce action notification"
 msgstr "���������� ��������� ���������� ���������"
 
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "����������������"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr ""
 " �� ��������� ������������� ������ �� ����� ������ ��� ���� ���� ���� "
 "%(date)s"
 
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
 msgid "(no subject)"
 msgstr "(��� ������� ����)"
 
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr "[��� �������� ���������� ������������ ��� ���������� ���������]"
 
@@ -256,7 +256,7 @@ msgstr "
 
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -264,7 +264,7 @@ msgstr "
 
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -274,8 +274,8 @@ msgstr "
 
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -287,7 +287,7 @@ msgid "Authorization failed."
 msgstr "� ������������� �������."
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr ""
 
@@ -308,7 +308,7 @@ msgstr ""
 "�� ��������������."
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "�������������: "
 
@@ -473,7 +473,7 @@ msgstr "
 msgid "Go to the general list information page"
 msgstr "������� ��� ������ ������ ����������� ��� ������"
 
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 msgid "Edit the public HTML pages and text files"
 msgstr "����������� ��� �������� HTML ������� ��� �������"
 
@@ -569,7 +569,7 @@ msgstr "
 msgid "Regexp:"
 msgstr "Regexp:"
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "���������:"
 
@@ -729,7 +729,7 @@ msgid "nodupes"
 msgstr "��� �����"
 
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr "������"
 
@@ -761,7 +761,7 @@ msgstr "
 msgid "notmetoo"
 msgstr "��� ���"
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr "����� mail"
 
@@ -1116,151 +1116,151 @@ msgstr "
 msgid "Submit Your Changes"
 msgstr "�������� ��� �������"
 
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr "�� ������� ��� ���������� ��� ����������"
 
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 msgid "Poster passwords did not match"
 msgstr "�� ������� ����������� ��� ����������."
 
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 msgid "Administrator passwords did not match"
 msgstr "�� ������� ��� ����������� ��� ����������"
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "����� ��� �����"
 
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr "&lt;���� ������&gt;"
 
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "����/��� ������ ��������� emai"
 
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr "�� �������� ��������� (�� ��������� ����������)"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr "������������ ��������� (matched %(pattern)s)"
 
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "� ����� ����� �� ��������:"
 
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "� ������� ����� �� ��������:"
 
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "����� ���� ���������:"
 
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "����� ���� �������:"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "����������� ��������:"
 
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr "�� ������ �� ����� �������� ��-�����:"
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 #, fuzzy
 msgid "You must provide both current and new addresses."
 msgstr "�� ������ �� ���������� ��� ����������� ����� ��������� �����."
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 #, fuzzy
 msgid "%(schange_to)s is already a list member."
 msgstr " ����� ��� �����"
 
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 #, fuzzy
 msgid "%(schange_to)s is not a valid email address."
 msgstr "������ �� ������ ��� ������ ��������� ������������ ������������."
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 #, fuzzy
 msgid "%(schange_to)s is already a member"
 msgstr " ����� ��� �����"
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 #, fuzzy
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr "%(addr)s ������������ (���������: %(patt)s)"
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 #, fuzzy
 msgid "%(list_name)s address change notice."
 msgstr "���������� ��������� ��� ��� %(realname)s"
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 #, fuzzy
 msgid "Notification sent to %(schange_from)s."
 msgstr "������������"
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 #, fuzzy
 msgid "Notification sent to %(schange_to)s."
 msgstr "������������"
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr "���������� ���� �������������� ����������"
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 msgid "member mgt page"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "��� ������� �������"
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr "�� ������� ��� ����������� ����� �� ���������: %(user)s"
 
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "� �������� ����� �� ��������:"
 
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "����� ��� ��������:"
 
@@ -1861,8 +1861,8 @@ msgstr ""
 "������� ��� ���������\n"
 "     ��������."
 
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "��������"
 
@@ -2489,47 +2489,51 @@ msgstr "
 msgid "List name is required."
 msgstr "���������� �� ����� ��� ������."
 
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr "%(realname)s -- ����������� ��� html ��� %(template_info)s"
 
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr "����������� HTML : �����"
 
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr "%(safetemplatename)s: �� ������ template"
 
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr "%(realname)s -- ����������� HTML �������"
 
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr "������� ������� ��� �����������:"
 
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "���������� � ����������� ��� ����������� ��� �� ���������� ��� ������."
 
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "���� ���������� �� ��� �������..."
 
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "�������� �������"
 
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr "�� ������ �� ������� ���� html ������."
 
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr "� HTML ��� ������."
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2545,19 +2549,19 @@ msgstr ""
 "������ �� ����� �������� ��� ������� ���������� Mailman.\n"
 "             "
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr "���"
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 msgid "Page Unchanged."
 msgstr "� ��������� ������."
 
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr "� HTML ������ �� ��������."
 
@@ -2624,7 +2628,7 @@ msgstr ""
 msgid "Edit Options"
 msgstr "�������� ������������"
 
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "����� ���� �� ������ ��"
@@ -2633,34 +2637,34 @@ msgstr "
 msgid "This form requires JavaScript."
 msgstr ""
 
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "����� ��� CGI script"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "�� ������� ���������"
 
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "�� ������ Email ���������: %(safeuser)s"
 
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr "��� ������� ������ �����: %(safeuser)s."
 
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 #, fuzzy
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr "�� email ��� ��� ����������� ���� ������."
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 #, fuzzy
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
@@ -2669,22 +2673,22 @@ msgstr ""
 "�� ������ ��� �� �������� ��� ����\n"
 "                    ��������� ��� ������� ��� ����������� ��� ������."
 
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 #, fuzzy
 msgid ""
 "If you are a list member,\n"
 "            your password has been emailed to you."
 msgstr "��� ���� ������ ����������� ��� ���������� ��� �������."
 
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "� ����������� �������."
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr "��� ���� ������ ����������� ��� ���������� ��� �������."
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
@@ -2692,16 +2696,16 @@ msgstr ""
 "� ������������ ��� ������ ������ �� ��� ������ �� ��� ��� �����\n"
 "            �������� ��� ����� ��� ������."
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr "��������:"
 
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr "�������� ��� ����� ��� %(safeuser)s ��� %(hostname)s"
 
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
@@ -2709,7 +2713,7 @@ msgstr ""
 "������� �� ��� link ��� �� ������������ �� ������ ��� �������� ���\n"
 "        ��� �� ������������ ����� ������������ ������������."
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
@@ -2719,15 +2723,15 @@ msgstr ""
 "            � ��� ����������� ��� ����� �������� ��� ������. ��������, �\n"
 "            ������� �� ����� ��� ����� ���� �������."
 
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "�� ����������� ��� ����������!"
 
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr "�������������� ��� ���� �� ��������� ������������ ������������"
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 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 "
@@ -2741,31 +2745,31 @@ msgstr ""
 "����� ����� �����������, ���� ���� ����� � ����� �������� �� ���������\n"
 "%(safeuser)s �� ��������. "
 
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "� ��� ��������� ����� ��� �����: %(newaddr)s"
 
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "�� ����������� �� ������ �� ����� �����"
 
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr "��� ������ ������������ ���� ������ ��� %(newaddr)s. "
 
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "� email ��������� ��� ������ ��� ����� ������"
 
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "������ �� ������ email ���������"
 
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s ����� ��� ����� ��� ������."
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
 "                      think this restriction is erroneous, please contact\n"
@@ -2775,11 +2779,11 @@ msgstr ""
 "�� �������� ��� � ����������� ����� �����������, �������� �������������\n"
 "�� ��� ���������� ��� ������ ��� %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr "�� ����� ��� ������ ��������� �� ��������."
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 msgid ""
 "The list administrator may not change the\n"
 "                    password for a user."
@@ -2787,15 +2791,15 @@ msgstr ""
 "� ������������ ��� ������ ������ �� ��� ������ �� \n"
 "            ��� ������ ��������� ��� ��� ������."
 
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "�� ������� �� ������� �� ����� �����"
 
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "�� ������� ��� ����������!"
 
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 msgid ""
 "The list administrator may not change the\n"
 "            password for this user's other subscriptions.  However, the\n"
@@ -2805,12 +2809,12 @@ msgstr ""
 "            ������ ��������� ��� ����� �������� ��� ������. ��������, �\n"
 "            ������� ��������� ��� ����� ��� ����� ���� �������."
 
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "� ������� ������ �� ��������."
 
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
@@ -2820,16 +2824,16 @@ msgstr ""
 "                �������� checkbox �� ������ <em>��������</em>.  ���\n"
 "                ����� ���������!"
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 #, fuzzy
 msgid "via the member options page"
 msgstr "%(realname)s �����: ������ �������� ��� ��� �������� ��� �����"
 
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "������������ ���������"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -2840,7 +2844,7 @@ msgstr ""
 "            ��������� ����� ������������ ��� ������ ��� �������.  �� ������\n"
 "            ���������� ����� �� ������������ ������ ��� ������� ����."
 
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -2858,7 +2862,7 @@ msgstr ""
 "������������� �� ���� ����������\n"
 "            ��� ������ ��� %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -2869,7 +2873,7 @@ msgstr ""
 "                �������� ��� ��� ����� �������� ��� ������. ��������, ��\n"
 "            �������� ��� ����� ��� ����� ���� �������."
 
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -2880,7 +2884,7 @@ msgstr ""
 "��� ������, ����� ���� �� �������� �������� ��� ���������. ������\n"
 " �� ����� �������� ��� ����� ������� �� ��������."
 
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -2893,63 +2897,63 @@ msgstr ""
 "���� �������.\n"
 "  ������ �� ����� �������� ��� ����� ������� �� ��������."
 
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "�� �������� ��� ��������� �� ��������."
 
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "������ �� ������ ����� ��� ��������� ������������� ������."
 
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>���, ���� �������� �� ��������</em>"
 
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "������ ��� ������� ��������� ���"
 
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "������� ��� ��������� ���������� ���"
 
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "�������� ��� ������� ��������� ��� �� email �� ����"
 
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "������� ���������"
 
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "����������"
 
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "�������� ��� ������� ���"
 
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "������"
 
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "�����"
 
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr "%(days)d %(units)s"
 
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "������ ��� ���������� ��� ��� �������� ���"
 
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "<em>��� ��������� ������</em>"
 
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
@@ -2960,19 +2964,19 @@ msgstr ""
 "���� \n"
 "<em>%(cpuser)s</em>."
 
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "%(realname)s �����: ������ �������� ��� ��� �������� ��� �����"
 
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "email ��������� ��� "
 
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr "%(realname)s �����: �������� ������ ��� �� ������ %(safeuser)s"
 
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -3007,19 +3011,19 @@ msgstr ""
 "    Internet, ����������� ����� ��� ��� ������� ��� ��� �� �������������.\n"
 "    "
 
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "Email ���������"
 
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "������� ���������"
 
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "�������"
 
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -3034,11 +3038,11 @@ msgstr ""
 "    ��������� (������ ������ �� ����� ����������� ���� email. ����� ��� "
 "������� ��� ������ ������������."
 
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "���������� ������� ���������"
 
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
@@ -3046,27 +3050,27 @@ msgstr ""
 "�������� �� ������ <em>����������</em>, �� ���\n"
 "    ������ � ������� ��� �� emailed."
 
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "����������"
 
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr "<��� �������>"
 
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "�� ��������� ���� ��� ����� ������: %(topicname)s"
 
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "������������ ��� �� ������ �������"
 
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "�����:"
 
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr "������ (�� regexp):"
 
@@ -7390,7 +7394,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -7434,7 +7438,7 @@ msgstr ""
 "            <p>��� �������� ������� ��������, ��������� ��� ��������� �� "
 "���� ������.  ������� \n"
 "            �� ������ �� ��� ��������� ^ ��� �� �������� ��� <a href="
-"\"http://docs.python.org/library/re.html\">Python regular expression</a>. "
+"\"https://docs.python.org/2/library/re.html\">Python regular expression</a>. "
 "���� �������� �������� �������� (backslashes), \n"
 "����� �� ��� \n"
 "            �� ���������������� ����� ������������� Python  (�.�. �������� "
@@ -8277,7 +8281,7 @@ msgstr ""
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -8300,7 +8304,7 @@ msgid ""
 "             configuration variable."
 msgstr ""
 "�� ������ ������� �������������� ���� ����������� ������\n"
-"             ������� �� �� <a href=\"http://docs.python.org/library/re.html"
+"             ������� �� �� <a href=\"https://docs.python.org/2/library/re.html"
 "\">������\n"
 "             ��������� ���������</a> ��� ��������� ��� ����. �� �� "
 "������������\n"
@@ -8948,7 +8952,7 @@ msgstr ""
 "��� ���� �� ����, � ������� ��������� �� ��� ������������ �� email ��� \n"
 "����������"
 
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 msgid "The current archive"
 msgstr "�� ������ �������� ������"
 
@@ -9322,7 +9326,7 @@ msgstr "
 msgid "Posting of your message titled \"%(subject)s\""
 msgstr "�������� ��� ��������� ��� �� ����� \"%(subject)s\""
 
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "[�� ������� �����]"
 
@@ -9334,28 +9338,28 @@ msgstr "
 msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr "��� ������ �������� ���� ����� %(realname)s ��� %(addr)s"
 
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "������ ��������"
 
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "�������� �������� ��������"
 
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr "��� ������ ��������� ��� ��� %(realname)s ��� %(addr)s"
 
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr "������ ���������"
 
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr "������ ������"
 
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr "�� ������ ���� �� ����� %(realname)s �����������"
 
@@ -9476,56 +9480,56 @@ msgstr "
 msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr "��� ����� ����� ��� %(listname)s ������"
 
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr " ��� ��� ip %(remote)s"
 
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr "� ������� ���� %(realname)s ������� ��� ������� ��� ����������"
 
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "���������� �������� ���� %(realname)s"
 
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr "� �������� ������� ��� ������� ��� ����������"
 
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr "���������� ��������� ��� ��� %(realname)s"
 
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 #, fuzzy
 msgid "%(realname)s address change notification"
 msgstr "���������� ��������� ��� ��� %(realname)s"
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "�� ������ ���������� ������������"
 
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "�� ������ ���������� ������������"
 
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr "� ������� ����  %(name)s ������� ��� ������� ��� �����������"
 
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "�� ������ ���������� ������������"
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "�������� �� cookie ������������"
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr "��������� ���������� ��������� ��������� ��� ������"
 
@@ -9620,15 +9624,15 @@ msgstr ""
 msgid "Original message suppressed by Mailman site configuration\n"
 msgstr ""
 
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr "���������� ���� ��� Mailman<br>������ %(version)s"
 
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr "Python Powered"
 
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr "Gnu's ��� Unix"
 
@@ -11084,7 +11088,7 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
@@ -11128,7 +11132,7 @@ msgstr ""
 "�� �������\n"
 "������������ ���������� ���:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "�� ������������ ����������� ����� (case-insensitive), ���� �� (case-"
 "preserved) �����������\n"
diff --git a/messages/eo/LC_MESSAGES/mailman.po b/messages/eo/LC_MESSAGES/mailman.po
index 0e1735d1..53cf1a9e 100644
--- a/messages/eo/LC_MESSAGES/mailman.po
+++ b/messages/eo/LC_MESSAGES/mailman.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.1.27\n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: 2018-06-02 08:56\n"
 "Last-Translator: Rubén Fernández Asensio <rubeno@esperanto.cat>\n"
 "Language-Team: Esperanto <listestro@esperanto.cat>\n"
@@ -203,7 +203,7 @@ msgstr ""
 msgid "by the list administrator"
 msgstr ""
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr ""
 
@@ -219,23 +219,23 @@ msgstr ""
 msgid "Bounce action notification"
 msgstr ""
 
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "Ŝanĝu adreson"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr ""
 
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
 msgid "(no subject)"
 msgstr ""
 
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr ""
 
@@ -249,7 +249,7 @@ msgstr ""
 
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -257,7 +257,7 @@ msgstr ""
 
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -267,8 +267,8 @@ msgstr ""
 
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -280,7 +280,7 @@ msgid "Authorization failed."
 msgstr ""
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr ""
 
@@ -294,7 +294,7 @@ msgid ""
 msgstr ""
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr ""
 
@@ -427,7 +427,7 @@ msgstr ""
 msgid "Go to the general list information page"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 msgid "Edit the public HTML pages and text files"
 msgstr ""
 
@@ -514,7 +514,7 @@ msgstr ""
 msgid "Regexp:"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr ""
 
@@ -670,7 +670,7 @@ msgid "nodupes"
 msgstr ""
 
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr ""
 
@@ -702,7 +702,7 @@ msgstr ""
 msgid "notmetoo"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr ""
 
@@ -978,143 +978,143 @@ msgstr ""
 msgid "Submit Your Changes"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 msgid "Poster passwords did not match"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 msgid "Administrator passwords did not match"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 msgid "You must provide both current and new addresses."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 msgid "%(schange_to)s is already a list member."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 msgid "%(schange_to)s is not a valid email address."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 msgid "%(schange_to)s is already a member"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 msgid "%(list_name)s address change notice."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 msgid "Notification sent to %(schange_from)s."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 msgid "Notification sent to %(schange_to)s."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 msgid "member mgt page"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr ""
 
@@ -1680,8 +1680,8 @@ msgstr ""
 "    <p>Aŭ elektu <em>Nuligu mian malabonpeton</em> por  nuligi\n"
 "    ĉi tiun malabonpeton."
 
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "Malabonigu min"
 
@@ -2233,47 +2233,51 @@ msgstr ""
 msgid "List name is required."
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2282,19 +2286,19 @@ msgid ""
 "             "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 msgid "Page Unchanged."
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr ""
 
@@ -2358,7 +2362,7 @@ msgstr ""
 msgid "Edit Options"
 msgstr "Sanĝu agordojn"
 
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "Vidu ĉi tiun paĝon en"
@@ -2367,33 +2371,33 @@ msgstr "Vidu ĉi tiun paĝon en"
 msgid "This form requires JavaScript."
 msgstr ""
 
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "Eraro de la recepto CGI"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr "Nevalida pet-maniero: %(method)s"
 
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "Neniu adreso indikita"
 
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "Retpoŝtadreso nevalida: %(safeuser)s"
 
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr "Membro neekzistanta: %(safeuser)s."
 
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr "Se vi abonas la liston, konfirmilo estas sendita."
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
 "             forwarded to the list administrator for approval."
@@ -2401,7 +2405,7 @@ msgstr ""
 "Se vi abonas la liston, via malabonpeto estas sendita al la\n"
 "             listestro por ke ĝi estu aprobata."
 
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 msgid ""
 "If you are a list member,\n"
 "            your password has been emailed to you."
@@ -2409,15 +2413,15 @@ msgstr ""
 "Se vi abonas la liston,\n"
 "            via pasvorto estas sendita."
 
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "Ensaluto malsukcesis."
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr "Memorigo de via pasvorto estas sendita."
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
@@ -2425,16 +2429,16 @@ msgstr ""
 "La listestro eble ne vidos la aliajn\n"
 "            abonojn de tiu ĉi uzanto."
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr "Rimarku"
 
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr "Abonoj de %(safeuser)s ĉe %(hostname)s"
 
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
@@ -2442,7 +2446,7 @@ msgstr ""
 "Premu ligilon por viziti la agordopaĝon de\n"
 "        la elektita listo."
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
@@ -2452,15 +2456,15 @@ msgstr ""
 "           de la aliaj abonoj de tiu ĉi uzanto. Tamen, la abono\n"
 "           je tiu ĉi dissendolisto estas ŝanĝita."
 
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "La adresoj ne estas samaj!"
 
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr "Vi jam uzas ĉi tiun retpoŝtadreson"
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 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 "
@@ -2473,31 +2477,31 @@ msgstr ""
 "Post konfirmo, ĉiuj aliaj dissendolistoj enhavantaj la adreson\n"
 "%(safeuser)s ŝanĝiĝos. "
 
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "La nova adreso jam estas abonanto: %(newaddr)s"
 
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "La adreso ne povas esti neniu"
 
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr "Konfirmilo estas sendita al %(newaddr)s."
 
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "Retpoŝtadreso malĝusta"
 
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "Retpoŝtadreso nevalida"
 
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s jam abonas la liston."
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
 "                      think this restriction is erroneous, please contact\n"
@@ -2507,11 +2511,11 @@ msgstr ""
 "Se vi opinias tiun malpermeson erara, bonvolu kontakti la listestron\n"
 "ĉe %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr "La nomo de la abonanto estas sukcese ŝanĝita. "
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 msgid ""
 "The list administrator may not change the\n"
 "                    password for a user."
@@ -2519,15 +2523,15 @@ msgstr ""
 "La listestro ne povas ŝanĝi la pasvorton\n"
 "                    de uzanto."
 
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "La pasvorto ne povas esti neniu"
 
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "La pasvortoj ne estas la samaj!"
 
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 msgid ""
 "The list administrator may not change the\n"
 "            password for this user's other subscriptions.  However, the\n"
@@ -2537,12 +2541,12 @@ msgstr ""
 "            de la aliaj abonoj de tiu ĉi uzanto. Tamen, la\n"
 "            pasvorto je tiu ĉi dissendolisto estas ŝanĝita."
 
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "Pavorto sukcese ŝanĝita."
 
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
@@ -2552,16 +2556,16 @@ msgstr ""
 "                la konfirmujon sub la butono <em>Malabonigu</em>. Vi\n"
 "                ankoraŭ ne estas malabonigita!"
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 #, fuzzy
 msgid "via the member options page"
 msgstr "Listo %(realname)s: ensaluto en la agordo-paĝon de la abonanto"
 
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "Rezultoj de la malabono"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -2572,7 +2576,7 @@ msgstr ""
 "            de la listo por ke ĝi estu aprobata. Vi ricevos\n"
 "            sciigon post la decido de la moderigantoj."
 
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -2586,7 +2590,7 @@ msgstr ""
 "            Se vi havas demandon pri via malabono, bonvolu kontakti\n"
 "            la listestron ĉe %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -2597,7 +2601,7 @@ msgstr ""
 "            de la aliaj abonoj de tiu ĉi uzanto. Tamen, la\n"
 "            agordojn je tiu ĉi dissendolisto estas ŝanĝitaj."
 
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -2609,7 +2613,7 @@ msgstr ""
 "aliaj\n"
 "            agordoj estas sukcese ŝaltitaj."
 
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -2621,63 +2625,63 @@ msgstr ""
 "aliaj\n"
 "            agordoj estas sukcese ŝaltitaj."
 
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "Vi sukcese agordis vian abonon."
 
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "Vi eble ricevos unu lastan resumon."
 
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>Jes, mi vere volas malaboni</em>"
 
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "Ŝanĝu mian pasvorton"
 
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "Listigu miajn aliajn abonojn"
 
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "Sendu mian pasvorton per retpoŝto"
 
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "pasvorto"
 
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "Elsalutu"
 
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "Konfirmu miajn ŝanĝojn"
 
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "tagoj"
 
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "tago"
 
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr "%(days)d %(units)s"
 
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "Ŝanĝu mian retpoŝtadreson kaj nomon"
 
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "<em>Neniu temo difinita</em>"
 
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
@@ -2687,19 +2691,19 @@ msgstr ""
 "Vi abonas la liston per la adreso sen ŝanĝo de grandliteroj\n"
 "<em>%(cpuser)s</em>."
 
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "Listo %(realname)s: ensaluto en la agordo-paĝon de la abonanto"
 
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "retpoŝtadreson kaj "
 
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr "Listo %(realname)s: abon-agordoj por uzanto %(safeuser)s"
 
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -2727,19 +2731,19 @@ msgstr ""
 "    kuketojn en via retumilo; se ne, neniun ŝanĝon vi povos efektivigi.\n"
 "    "
 
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "Retpoŝtadreso:"
 
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "Pasvorto:"
 
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "Ensaluti"
 
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -2753,11 +2757,11 @@ msgstr ""
 "    malabonon (vi ankaŭ povas konfirmi per retpoŝto; legu la instrukciojn\n"
 "    en la konfirmilo)."
 
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "Rememorigo de la pasvorto"
 
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
@@ -2765,27 +2769,27 @@ msgstr ""
 "Preminte la butonon <em>Rememorigu</em> vi\n"
 "    ricevos vian pasvorton per retpoŝto."
 
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "Rememorigu"
 
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr "<mankanta>"
 
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "La temo ne estas valida: %(topicname)s"
 
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "Detaloj de la tem-filtro"
 
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "Nomo:"
 
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr "Serĉ-vorto (kiel regula esprimo):"
 
@@ -5939,7 +5943,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -6519,7 +6523,7 @@ msgstr ""
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -7026,13 +7030,13 @@ msgstr "Vizitu la listanaron"
 msgid "Once a month, your password will be emailed to you as a reminder."
 msgstr "Unu fojon monate, via pasvorto estos sendata al vi kiel memorigilo."
 
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 msgid "The current archive"
 msgstr "La nuna arĥivo"
 
 #: Mailman/Handlers/Acknowledge.py:59
 msgid "%(realname)s post acknowledgement"
-msgstr "rekono de mesaĝo de %(realname)s"
+msgstr "Rekono de mesaĝo de %(realname)s"
 
 #: Mailman/Handlers/Approve.py:45
 msgid ""
@@ -7402,7 +7406,7 @@ msgstr "Fino de "
 msgid "Posting of your message titled \"%(subject)s\""
 msgstr "Sendo de via mesaĝo titolita \"%(subject)s\""
 
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "[Neniu kialo indikita]"
 
@@ -7414,28 +7418,28 @@ msgstr "Plusendo de moderigita mesaĝo"
 msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr ""
 
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr ""
 
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "Ankoraŭ atendas aprobon"
 
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr ""
 
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr ""
 
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr ""
 
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr ""
 
@@ -7527,55 +7531,55 @@ msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr ""
 "Via konfirmo estas bezonata por malaboni la dissendoliston %(listname)s"
 
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr " de %(remote)s"
 
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr "aboni la liston %(realname)s postulas aprobon de moderiganto"
 
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
-msgstr "sciigo de abono de %(realname)s"
+msgstr "Sciigo de abono de %(realname)s"
 
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr "malabonoj postulas aprobon de moderiganto"
 
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
-msgstr "sciigo de malabono de %(realname)s"
+msgstr "Sciigo de malabono de %(realname)s"
 
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 msgid "%(realname)s address change notification"
-msgstr "sciigo de adresoŝanĝo de %(realname)s"
+msgstr "Sciigo de adresoŝanĝo de %(realname)s"
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "Konfirmokodo nevalida"
 
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "Konfirmokodo nevalida"
 
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr "aboni la liston %(name)s postulas aprobon de listestro"
 
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "Konfirmokodo nevalida"
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "Enskribu la konfirmo-kuketon"
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr "Lasta sciigo de aŭtomata respondo por hodiaŭ"
 
@@ -7599,35 +7603,43 @@ msgstr ""
 
 #: Mailman/Queue/CommandRunner.py:98
 msgid "Ignoring non-text/plain MIME parts"
-msgstr ""
+msgstr "Malatentante ne-simplajn MIME partojn"
 
 #: Mailman/Queue/CommandRunner.py:177
 msgid ""
 "The results of your email command are provided below.\n"
 "Attached is your original message.\n"
 msgstr ""
+"La rezultoj de via poŝt-ordono aperas ĉi-sube.\n"
+"Estas alkroĉita via originala mesaĝo.\n"
 
 #: Mailman/Queue/CommandRunner.py:182
 msgid "- Results:"
-msgstr ""
+msgstr "- Rezultoj:"
 
 #: Mailman/Queue/CommandRunner.py:188
 msgid ""
 "\n"
 "- Unprocessed:"
 msgstr ""
+"\n"
+"- Netraktita:"
 
 #: Mailman/Queue/CommandRunner.py:192
 msgid ""
 "No commands were found in this message.\n"
 "To obtain instructions, send a message containing just the word \"help\".\n"
 msgstr ""
+"Neniu ordono estis trovita en ĉi tiu mesaĝo.\n"
+"Por ricevi instrukciojn, sendu mesaĝon enhavantan nur la vorton\"help\".\n"
 
 #: Mailman/Queue/CommandRunner.py:197
 msgid ""
 "\n"
 "- Ignored:"
 msgstr ""
+"\n"
+"- Malatentita:"
 
 #: Mailman/Queue/CommandRunner.py:199
 msgid ""
@@ -7635,28 +7647,31 @@ msgid ""
 "- Done.\n"
 "\n"
 msgstr ""
+"\n"
+"- Finita.\n"
+"\n"
 
 #: Mailman/Queue/CommandRunner.py:223
 msgid "The results of your email commands"
-msgstr ""
+msgstr "La rezultoj de viaj poŝt-ordonoj"
 
 #: Mailman/Queue/CommandRunner.py:229
 msgid "Message body suppressed by Mailman site configuration\n"
-msgstr ""
+msgstr "La mesaĝ-enhavon forigis la agordoj de la servilo Mailman\n"
 
 #: Mailman/Queue/CommandRunner.py:231
 msgid "Original message suppressed by Mailman site configuration\n"
-msgstr ""
+msgstr "La originalan mesaĝon forigis la agordoj de la servilo Mailman\n"
 
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr ""
 
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr ""
 
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr ""
 
@@ -8633,7 +8648,7 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
diff --git a/messages/es/LC_MESSAGES/mailman.po b/messages/es/LC_MESSAGES/mailman.po
index 4798d8d2..76b50694 100644
--- a/messages/es/LC_MESSAGES/mailman.po
+++ b/messages/es/LC_MESSAGES/mailman.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mailman\n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: 2006-02-15 12:02+0100\n"
 "Last-Translator: David Mart�nez Moreno <ender@rediris.es>\n"
 "Language-Team: Espa�ol <es@li.org>\n"
@@ -204,7 +204,7 @@ msgstr "por ti mismo"
 msgid "by the list administrator"
 msgstr "por el administrador de la lista"
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "debido a alg�n motivo desconocido"
 
@@ -220,23 +220,23 @@ msgstr "inhabilitada"
 msgid "Bounce action notification"
 msgstr "Notificaci�n de rebote"
 
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "inhabilitada"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr "El �ltimo rebote recibido de usted fue hace %(date)s"
 
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
 msgid "(no subject)"
 msgstr "(sin asunto)"
 
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr "[No hay detalles de rebotes disponibles]"
 
@@ -250,7 +250,7 @@ msgstr "Administrador"
 
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -258,7 +258,7 @@ msgstr "La lista <em>%(safelistname)s</em> no existe"
 
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -268,8 +268,8 @@ msgstr "Error"
 
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -281,7 +281,7 @@ msgid "Authorization failed."
 msgstr "Autorizaci�n infructuosa."
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr ""
 
@@ -300,7 +300,7 @@ msgstr ""
 "               su lista de distribuci�n no podr� usarse."
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "Advertencia: "
 
@@ -462,7 +462,7 @@ msgstr "Ocuparse de las peticiones pendientes de moderar"
 msgid "Go to the general list information page"
 msgstr "Ir a la p�gina de informaci�n general sobre la lista."
 
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 msgid "Edit the public HTML pages and text files"
 msgstr ""
 "Editar el c�digo HTML de las p�ginas de acceso\n"
@@ -559,7 +559,7 @@ msgstr "Nombre del tema:"
 msgid "Regexp:"
 msgstr "Expresi�n regular:"
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "Descripci�n"
 
@@ -719,7 +719,7 @@ msgid "nodupes"
 msgstr "sin duplicados"
 
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr "agrupado"
 
@@ -751,7 +751,7 @@ msgstr "B"
 msgid "notmetoo"
 msgstr "a m� no"
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr "sin correo"
 
@@ -1090,153 +1090,153 @@ msgstr "Confirme la clave del moderador:"
 msgid "Submit Your Changes"
 msgstr "Enviar los cambios"
 
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr "Las claves del Moderador no coinciden"
 
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 #, fuzzy
 msgid "Poster passwords did not match"
 msgstr "Sus claves no coinciden."
 
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 msgid "Administrator passwords did not match"
 msgstr "Las claves del Administrador no coinciden"
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "Ya est� suscrito"
 
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr "&lt;l�nea en blanco&gt;"
 
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "Direcci�n de correo electr�nico incorrecta/inv�lida"
 
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr "Direcci�n hostil (caracteres no v�lidos)"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr "Direcci�n vetada (coincidencia %(pattern)s)"
 
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "Invitados satisfactoriamente:"
 
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "Subscritos satisfactoriamente:"
 
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "Error invitando a suscribirse:"
 
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "Error dando de alta la suscripci�n:"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "Ha anulado su suscripci�n satisfactoriamente:"
 
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr ""
 "No puedo anular la suscripci�n de direcciones que no est�n registradas:"
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 #, fuzzy
 msgid "You must provide both current and new addresses."
 msgstr "Primero tienes que corregir la direcci�n inv�lida precedente."
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 #, fuzzy
 msgid "%(schange_to)s is already a list member."
 msgstr " ya es un suscriptor"
 
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 #, fuzzy
 msgid "%(schange_to)s is not a valid email address."
 msgstr "Debe proporcionar una direcci�n de correo electr�nico v�lida."
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 #, fuzzy
 msgid "%(schange_to)s is already a member"
 msgstr " ya es un suscriptor"
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 #, fuzzy
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr "%(addr)s est� vetada (concordancia: %(patt)s)"
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 #, fuzzy
 msgid "%(list_name)s address change notice."
 msgstr "Notificaci�n de desuscripci�n a %(realname)s"
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 #, fuzzy
 msgid "Notification sent to %(schange_from)s."
 msgstr "Notificaciones"
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 #, fuzzy
 msgid "Notification sent to %(schange_to)s."
 msgstr "Notificaciones"
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr "Valor incorrecto del flag de moderaci�n"
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 msgid "member mgt page"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "No est� suscrito"
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr "Ignorando los cambios del usuario borrado: %(user)s"
 
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "Ha sido borrado satisfactoriamente"
 
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "Error dando de baja la suscripci�n:"
 
@@ -1820,8 +1820,8 @@ msgstr ""
 "    <p>O pulse <em>Cancelar y descartar</em> para cancelar esta solicitud\n"
 "    de baja."
 
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "Borrarse de la lista"
 
@@ -2438,47 +2438,51 @@ msgstr "
 msgid "List name is required."
 msgstr "Nombre de la m�quina que prefiere la lista."
 
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr "%(realname)s -- Editar el c�digo html para %(template_info)s"
 
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr "Editar HTML : Error"
 
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr "%(safetemplatename)s: Plantilla inv�lida"
 
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr "%(realname)s -- Edici�n del c�digo HTML de las P�ginas"
 
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr "Seleccione la p�gina a editar:"
 
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "Ver o editar la informaci�n de configuraci�n de la lista."
 
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "Cuando haya terminado de hacer los cambios..."
 
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "Confirmar los cambios"
 
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr "No se puede tener una p�agina html vac�a."
 
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr "El c�digo HTML no se ha cambiado"
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2487,20 +2491,20 @@ msgid ""
 "             "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 #, fuzzy
 msgid "Page Unchanged."
 msgstr "El c�digo HTML no se ha cambiado"
 
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr "Se ha cambiado el c�digo HTML satisfactoriamente"
 
@@ -2567,7 +2571,7 @@ msgstr ""
 msgid "Edit Options"
 msgstr "Editar opciones"
 
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "Ver esta p�gina en "
@@ -2576,34 +2580,34 @@ msgstr "Ver esta p
 msgid "This form requires JavaScript."
 msgstr ""
 
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "Error del gui�n CGI"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "No se ha indicado una direcci�n"
 
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "Direcci�n de correo electr�nico incorrecta: %(safeuser)s"
 
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr "No existe tal suscriptor: %(safeuser)s."
 
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 #, fuzzy
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr "Se ha enviado el mensaje de confirmaci�n."
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 #, fuzzy
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
@@ -2612,7 +2616,7 @@ msgstr ""
 "La solicitud de baja ha sido reenviada al administrador de la\n"
 "lista para que le de el visto bueno."
 
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 #, fuzzy
 msgid ""
 "If you are a list member,\n"
@@ -2620,16 +2624,16 @@ msgid ""
 msgstr ""
 "Se le ha mandado un recordatorio de su clave por correo electr�nico.<p>"
 
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "La autentificaci�n ha sido infructuosa."
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr ""
 "Se le ha mandado un recordatorio de su clave por correo electr�nico.<p>"
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
@@ -2637,16 +2641,16 @@ msgstr ""
 "El administrador de la lista puede que no vea las otras\n"
 "            suscripciones de este usuario."
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr "Nota: "
 
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr "suscripciones de %(safeuser)s en %(hostname)s"
 
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
@@ -2654,7 +2658,7 @@ msgstr ""
 "D�le con el rat�n a un enlace para visitar su p�gina\n"
 "        de opciones en la lista de distribuci�n solicitada."
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
@@ -2665,15 +2669,15 @@ msgstr ""
 "            de este usuario en otras suscripciones.\n"
 "            No obstante, se han cambiado los datos para esta."
 
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "Las direcciones no coinciden!"
 
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr "Ya est�s usando esa direcci�n de correo electr�nico"
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 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 "
@@ -2687,31 +2691,31 @@ msgstr ""
 "cambiar� cualquier otra lista de distribuci�n que contenga la direcci�n\n"
 "%(safeuser)s. "
 
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "La direcci�n nueva ya est� dada de alta: %(newaddr)s"
 
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "Las direcciones no deber�n estar en blanco"
 
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr "Se le ha enviado un mensaje de confirmaci�n a %(newaddr)s"
 
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "Ha proporcionado una direcci�n de correo incorrecta"
 
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "Se ha proporcionado una direcci�n de correo ilegal"
 
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s ya est� suscrito a la lista."
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
 "                      think this restriction is erroneous, please contact\n"
@@ -2722,12 +2726,12 @@ msgstr ""
 "            por favor, p�ngase en contacto con el propietario\n"
 "            de la lista en %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr ""
 "Se ha cambiado el nombre y apellidos del suscriptor satisfactoriamente."
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 #, fuzzy
 msgid ""
 "The list administrator may not change the\n"
@@ -2736,15 +2740,15 @@ msgstr ""
 "El administrador de la lista puede que no vea las otras\n"
 "            suscripciones de este usuario."
 
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "Las claves nodeber�n estar en blanco"
 
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "Las claves no coinciden!"
 
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 msgid ""
 "The list administrator may not change the\n"
 "            password for this user's other subscriptions.  However, the\n"
@@ -2754,12 +2758,12 @@ msgstr ""
 "      de este usuario en otras suscripciones. No obstante,\n"
 "      se ha cambiado la clave en esta lista de distribuci�n."
 
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "Se ha cambiado la clave satisfactoriamente."
 
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
@@ -2769,16 +2773,16 @@ msgstr ""
 "                verificaci�n que est� debajo del bot�n\n"
 "                <em>Desuscribirs</em>. No ha sido dado de baja!."
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 #, fuzzy
 msgid "via the member options page"
 msgstr "Lista %(realname)s: p�gina de entrada de preferencias de suscriptor"
 
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "Resultados de la desuscripci�n"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -2790,7 +2794,7 @@ msgstr ""
 "            para su aprobaci�n. Recibir� una notificaci�\n"
 "            una vez que el moderador haya tomado una decisi�n"
 
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -2806,7 +2810,7 @@ msgstr ""
 "        baja, por favor p�ngase en contacto con los propietarios de\n"
 "        la lista en  %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -2818,7 +2822,7 @@ msgstr ""
 "            otras suscripciones. No obstante, se han cambiado\n"
 "            los datos de la suscripci�n en esta lista."
 
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -2829,7 +2833,7 @@ msgstr ""
 "esta lista, sin embargo el resto de sus opciones han sido definidas con\n"
 "�xito."
 
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -2841,63 +2845,63 @@ msgstr ""
 "la opci�n de entrega no se ha activado. Sin embargo, el resto \n"
 "de sus opciones se ha cambiado correctamente."
 
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "Ha definido sus opciones con �xito."
 
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "Puede que obtenga una �ltima recopilaci�n."
 
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>Si, realmente quiero darme de baja</em>"
 
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "Cambiar mi contrase�a"
 
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "Listar mis otras suscripciones"
 
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "Enviarme mi contrase�a por email"
 
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "contrase�a"
 
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "Salir"
 
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "Confirmar mis cambios"
 
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "d�as"
 
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "d�a"
 
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr "%(days)d %(units)s"
 
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "Cambiar mi direcci�n y mi nombre"
 
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "<em>No se han definido temas</em>"
 
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
@@ -2907,19 +2911,19 @@ msgstr ""
 "Est� suscrito a la lista con la direcci�n <em>%(cpuser)s</em> respetando "
 "may�sculas y min�sculas."
 
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "Lista %(realname)s: p�gina de entrada de preferencias de suscriptor"
 
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "direcci�n de correo electr�nico y su "
 
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr "Lista %(realname)s: opciones de suscripci�n de %(safeuser)s"
 
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -2959,19 +2963,19 @@ msgstr ""
 "    entre satisfactoriamente)."
 
 # In this entry insert a space at the end of string, it will be stripped.
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "Direcci�n de correo-e: "
 
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "Clave:"
 
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "Entrar"
 
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -2986,11 +2990,11 @@ msgstr ""
 "    realizar esta acci�n por correo electr�nico, lea\n"
 "    las instrucciones en el mensaje de confirmaci�n)."
 
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "Recordatorio de la clave"
 
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
@@ -2998,27 +3002,27 @@ msgstr ""
 "Al pulsar con el rat�n el bot�n <em>Recordar</em>,\n"
 "    se le mandar� la clave por correo electr�nico."
 
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "Recordar"
 
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr "<perdido>"
 
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "El tema solicitado no es v�lido: %(topicname)s"
 
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "Detalles del filtrado de t�picos"
 
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "Nombre:"
 
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr "Patr�n (como una expresi�n regular):"
 
@@ -7183,7 +7187,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -7224,7 +7228,7 @@ msgstr ""
 "            <p>En la caja de texto de m�s abajo, agrega una direcci�n en "
 "cada l�nea, empieza la l�nea\n"
 "            con el car�cter ^ para designar una \n"
-"            <a href=\"http://docs.python.org/library/re.html\">\n"
+"            <a href=\"https://docs.python.org/2/library/re.html\">\n"
 "            expresi�n regular de Python</a>. Cuando metas barras inclinadas "
 "de izquierda a derecha (\"\\\"),\n"
 "            hazlo como si estuvieras usando cadenas de Python en bruto "
@@ -8025,7 +8029,7 @@ msgstr "
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -8048,7 +8052,7 @@ msgid ""
 "             configuration variable."
 msgstr ""
 "El filtro seg�n el tema, clasifica cada mensaje recibido\n"
-"             seg�n: los <a href=\"http://docs.python.org/library/re.html\">\n"
+"             seg�n: los <a href=\"https://docs.python.org/2/library/re.html\">\n"
 "             filtros de expresiones regulares</a> que especifique abajo. Si "
 "las cabeceras\n"
 "             <code>Subject:</code> (asunto) o <code>Keywords</code> "
@@ -8688,7 +8692,7 @@ msgid "Once a month, your password will be emailed to you as a reminder."
 msgstr ""
 "Cada m�s, se le enviar� su clave por correo electr�nico para recordarsela."
 
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 msgid "The current archive"
 msgstr "El archivo actual"
 
@@ -9063,7 +9067,7 @@ msgstr "Fin de "
 msgid "Posting of your message titled \"%(subject)s\""
 msgstr "El mensaje enviado ten�a como asunto \"%(subject)s\""
 
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "[No se ha dado ninguna raz�n]"
 
@@ -9075,28 +9079,28 @@ msgstr "Reenv
 msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr "Peticion de suscripcion a la lista %(realname)s de %(addr)s"
 
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "Solicitud de suscripci�n"
 
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "Seguir esperando aprobaci�n"
 
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr "Solicitud de baja a la lista %(realname)s de %(addr)s"
 
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr "Solicitud de desuscripci�n"
 
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr "Mensaje original"
 
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr "La peticion a la lista de distribucion %(realname)s ha sido rechazada"
 
@@ -9213,59 +9217,59 @@ msgstr ""
 "Hace falta su confirmaci�n para abandonar la lista de distribuci�n "
 "%(listname)s."
 
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr " de %(remote)s"
 
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr ""
 "las suscripciones a %(realname)s necesitan el visto bueno del administrador"
 
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "Notificaci�n de suscripci�n a %(realname)s"
 
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr "las bajas a %(realname)s necesitan el visto bueno del moderador"
 
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr "Notificaci�n de desuscripci�n a %(realname)s"
 
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 #, fuzzy
 msgid "%(realname)s address change notification"
 msgstr "Notificaci�n de desuscripci�n a %(realname)s"
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "Cadena de confirmaci�n incorrecta"
 
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "Cadena de confirmaci�n incorrecta"
 
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr ""
 "La suscripci�n a %(name)s requiere aprobaci�n por\n"
 "parte del administrador"
 
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "Cadena de confirmaci�n incorrecta"
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "Introduzca su cadena de confirmaci�n"
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr "�ltima notificaci�n de autorespuesta de hoy"
 
@@ -9358,15 +9362,15 @@ msgstr ""
 msgid "Original message suppressed by Mailman site configuration\n"
 msgstr ""
 
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr "Entregado via Mailman<br>versi�n %(version)s"
 
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr "Hecho en Python"
 
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr "Gnu No es Unix"
 
@@ -10794,7 +10798,7 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
@@ -10836,7 +10840,7 @@ msgstr ""
 "La sintaxis de la expresi�n regular es al estilo Perl5, usando el modulo "
 "Python re. Las especificaciones completas est�n en:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Al buscar las direcciones no se distinguen may�sculas de min�sculas, sin "
 "embargo, \n"
diff --git a/messages/et/LC_MESSAGES/mailman.po b/messages/et/LC_MESSAGES/mailman.po
index 999df215..57ec0d71 100644
--- a/messages/et/LC_MESSAGES/mailman.po
+++ b/messages/et/LC_MESSAGES/mailman.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mailman\n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: 2005-04-14 10:45+0300\n"
 "Last-Translator: Anti Veeranna <duke@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -203,7 +203,7 @@ msgstr "sinu poolt"
 msgid "by the list administrator"
 msgstr "listi administraatori poolt"
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "p�hjus teadmata"
 
@@ -219,23 +219,23 @@ msgstr "peatatud"
 msgid "Bounce action notification"
 msgstr "T�rge kirja saatmisel"
 
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "peatatud"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr " Viimase tagastuse kuup�evs %(date)s"
 
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
 msgid "(no subject)"
 msgstr "(teemat pole)"
 
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr "[Puudub l�hem info tagastuse kohta]"
 
@@ -249,7 +249,7 @@ msgstr "omaniku"
 
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -257,7 +257,7 @@ msgstr "Sellist listi pole: <em>%(safelistname)s</em>"
 
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -267,8 +267,8 @@ msgstr "Viga"
 
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -280,7 +280,7 @@ msgid "Authorization failed."
 msgstr "Autoriseerimine eba�nnestus."
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr ""
 
@@ -297,7 +297,7 @@ msgstr ""
 "kasutada siis l�litage v�hemalt �ks neist valikutest sisse."
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "Hoiatus: "
 
@@ -454,7 +454,7 @@ msgstr "Ootel modereerimisn
 msgid "Go to the general list information page"
 msgstr "Listi infoleht"
 
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 msgid "Edit the public HTML pages and text files"
 msgstr "Avalike HTML lehtede ja tekstifailide muutmine"
 
@@ -543,7 +543,7 @@ msgstr "Teema nimetus:"
 msgid "Regexp:"
 msgstr "Regulaaravaldis:"
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "Kirjeldus:"
 
@@ -704,7 +704,7 @@ msgid "nodupes"
 msgstr "v�ldi koopiat"
 
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr "kokkuv�te"
 
@@ -736,7 +736,7 @@ msgstr "T"
 msgid "notmetoo"
 msgstr "v.a. autor"
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr "peatatud"
 
@@ -1054,151 +1054,151 @@ msgstr "Kinnita toimetaja parooli:"
 msgid "Submit Your Changes"
 msgstr "Salvesta"
 
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr "Toimetaja paroolid erinesid �ksteisest"
 
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 #, fuzzy
 msgid "Poster passwords did not match"
 msgstr "Paroolid ei olnud �hesugused."
 
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 msgid "Administrator passwords did not match"
 msgstr "Omaniku paroolid erinesid �ksteisest"
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "On juba liige"
 
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr "&lt;t�hi rida&gt;"
 
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "Vigane meiliaadress"
 
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr "Keelatud m�rke sisaldav meiliaadress"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "Kutsed saadeti:"
 
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "Lisati aadressid:"
 
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "Viga kutsete saatmisel:"
 
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "Viga aadresside lisamisel:"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "Tellimus l�petati:"
 
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr "Neid liikmete nimekirjast puuduvaid aadresse ei saa ka eemaldada:"
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 #, fuzzy
 msgid "You must provide both current and new addresses."
 msgstr "Paranda k�igepealt eelnevad vigased aadressid."
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 #, fuzzy
 msgid "%(schange_to)s is already a list member."
 msgstr " on juba liige"
 
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 #, fuzzy
 msgid "%(schange_to)s is not a valid email address."
 msgstr "Pead sisestama korrektse e-posti aadressi."
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 #, fuzzy
 msgid "%(schange_to)s is already a member"
 msgstr " on juba liige"
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 #, fuzzy
 msgid "%(list_name)s address change notice."
 msgstr "%(realname)s tellimuse l�petamise teavitus"
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 #, fuzzy
 msgid "Notification sent to %(schange_from)s."
 msgstr "Teavitused"
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 #, fuzzy
 msgid "Notification sent to %(schange_to)s."
 msgstr "Teavitused"
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr "Vigane modereerimislipu v��rtus"
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 msgid "member mgt page"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "ei liidetud"
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr "kustutatud liikmele %(user)s rakendatud muudatusi eirati"
 
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "Edukalt eemaldatud:"
 
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "Viga aadressi kustutamisel:"
 
@@ -1760,8 +1760,8 @@ msgstr ""
 "\n"
 "<p>V�i kliki<em>T�hista</em> kui �mber m�tlesid."
 
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "Lahku listist"
 
@@ -2341,47 +2341,51 @@ msgstr "Kuu alguses saadetakse paroolide meeldetuletused?"
 msgid "List name is required."
 msgstr "Listi nimi on puudu. "
 
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr "%(realname)s - Muuda %(template_info)s HTMLi"
 
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr "HTMLi muutmine : Viga"
 
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr "%(safetemplatename)s: Vigane template"
 
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr "%(realname)s -- HTMLi muutmine"
 
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr "Vali muudetav leht:"
 
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "Listi seadistamine"
 
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "Kui olete redigeerimise l�petanud..."
 
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "Salvesta"
 
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr "T�hi HTML leht pole lubatud."
 
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr "HTML muutmata."
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2390,20 +2394,20 @@ msgid ""
 "             "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 #, fuzzy
 msgid "Page Unchanged."
 msgstr "HTML muutmata."
 
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr "HTML salvestatud."
 
@@ -2463,7 +2467,7 @@ msgstr ""
 msgid "Edit Options"
 msgstr "Muuda seadeid"
 
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "Vali keel"
@@ -2472,34 +2476,34 @@ msgstr "Vali keel"
 msgid "This form requires JavaScript."
 msgstr ""
 
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "CGI skripti viga"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "Aadress puudub"
 
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "Viga aadressis: %(safeuser)s"
 
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr "Sellist liiget pole: %(safeuser)s."
 
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 #, fuzzy
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr "Kinnitusmeil on saadetud."
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 #, fuzzy
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
@@ -2508,58 +2512,58 @@ msgstr ""
 "Teie tellimuse l�petamise soovd edastatati listi omanikule\n"
 "l�bivaatuseks."
 
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 #, fuzzy
 msgid ""
 "If you are a list member,\n"
 "            your password has been emailed to you."
 msgstr "Sinu parool saadeti sulle meiliga."
 
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "Autoriseerimine eba�nnestus."
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr "Sinu parool saadeti sulle meiliga."
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
 msgstr ""
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr ""
 
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr "%(safeuser)s listide tellimused serveris %(hostname)s"
 
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
 msgstr "Kliki m�nel lingil, et muuta oma listi tellimuse seadistusi."
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
 "            subscription for this mailing list has been changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "Aadressid ei olnud �hesugused!"
 
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr "Sa ju kasutad juba seda aadressi"
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 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 "
@@ -2572,31 +2576,31 @@ msgstr ""
 "igal pool, siis peale sinu kinnitust, vahetatakse aadress\n"
 "�ra k�igis listides mille liige %(safeuser)s preagu on."
 
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "%(newaddr)s on juba selle listi tellja."
 
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "Aadressid ei tohi olla t�hjad"
 
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr "Kinnitus saadeti aadressile %(newaddr)s."
 
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "Vigane meiliaadress"
 
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "Vigane meiliaadress"
 
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s on juba selle listi tellinud."
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 #, fuzzy
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
@@ -2607,11 +2611,11 @@ msgstr ""
 "see on eksitus, siis v�tke palun �hendust listi omanikuga aadressil \n"
 "%(owneraddr)s."
 
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr "Liikme nimi on vahetatud. "
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 #, fuzzy
 msgid ""
 "The list administrator may not change the\n"
@@ -2620,15 +2624,15 @@ msgstr ""
 "Listi administraator on �ksikkirjade saatmise keelanud ja seet�ttu\n"
 "ei saa sa neid tellida. K�ik teised sinu tehtud valikud aga salvestati."
 
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "Paroolid ei tohi olla t�hjad"
 
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "Paroolid ei olnud �hesugused!"
 
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 #, fuzzy
 msgid ""
 "The list administrator may not change the\n"
@@ -2638,12 +2642,12 @@ msgstr ""
 "Listi administraator on �ksikkirjade saatmise keelanud ja seet�ttu\n"
 "ei saa sa neid tellida. K�ik teised sinu tehtud valikud aga salvestati."
 
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "Parool on edukalt vahetatud."
 
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
@@ -2653,16 +2657,16 @@ msgstr ""
 "<em>L�peta tellimus</em> nupu all. Tellimus ei ole veel\n"
 "l�petatud!"
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 #, fuzzy
 msgid "via the member options page"
 msgstr "List %(realname)s: Logi sisse"
 
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "Tellimuse l�petamine"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -2673,7 +2677,7 @@ msgstr ""
 "l�bivaatuseks. Niipea kui ta on oma otsuse teinud,teatatakse\n"
 "sellest sulle."
 
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -2687,7 +2691,7 @@ msgstr ""
 "K�simustega p��rdu listi omaniku poole aadressil\n"
 "%(owneraddr)s"
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -2695,7 +2699,7 @@ msgid ""
 "                changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -2705,7 +2709,7 @@ msgstr ""
 "Listi omanik on kokkuv�tete koostamise keelanud ja seet�ttu\n"
 "ei saa sa neid tellida. K�ik teised valikud aga salvestati."
 
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -2715,63 +2719,63 @@ msgstr ""
 "Listi administraator on �ksikkirjade saatmise keelanud ja seet�ttu\n"
 "ei saa sa neid tellida. K�ik teised sinu tehtud valikud aga salvestati."
 
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "Sinu seadistused on salvestatud."
 
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "V�imalik, et saate veel �he viimase kokkuv�tte."
 
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>Jah, ma tahan tellimust katkestada</em>"
 
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "Vaheta parooli"
 
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "N�ita mulle mu teisi tellimusi"
 
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "Meili mulle mu parool"
 
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "parool"
 
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "Logi v�lja"
 
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "Salvesta"
 
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "p�eva"
 
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "p�ev"
 
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr "%(days)d %(units)s"
 
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "Muuda minu aadressi ja nime"
 
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "<em>�htegi teemat pole m��ratud</em>"
 
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
@@ -2781,19 +2785,19 @@ msgstr ""
 "See list on teil tellitud j�rgmise t�stutundliku (??) aadressiga\n"
 "<em>%(cpuser)s</em>."
 
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "List %(realname)s: Logi sisse"
 
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "meiliaadress ja "
 
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr "Listi %(realname)s seadistused liikmele %(safeuser)s"
 
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -2821,19 +2825,19 @@ msgstr ""
 "brauseril lubama sellest saidist k�psiseid vastu v�tta. Vastasel korral\n"
 "muudatusi ei salvestata."
 
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "E-posti aadress:"
 
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "Parool:"
 
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "Logi sisse"
 
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -2846,11 +2850,11 @@ msgstr ""
 "kklikkima (kinnitada saab ka meili teel, vastav juhend sisaldub samuti\n"
 "selles kirjas)."
 
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "Parooli meeldetuletus"
 
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
@@ -2858,27 +2862,27 @@ msgstr ""
 "Kui klikid nupul <em>Tuleta meelde</em>, saadetakse sinu\n"
 "parool su lle meiliga."
 
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "Tuleta meelde"
 
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr "<puudub>"
 
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "Soovitud teema on vigane: %(topicname)s"
 
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "Teemafiltri info"
 
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "Nimi:"
 
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr "Mall (regulaaravaldis):"
 
@@ -6616,7 +6620,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -6647,7 +6651,7 @@ msgstr ""
 "kehtestatud reeglitele</a>\n"
 "\n"
 "<p>Sisesta tekstikastidesse aadressid, �ks igale reale; ^ m�rk rea alguses\n"
-"t�histab <a href=\"http://docs.python.org/library/re.html\">Pythoni "
+"t�histab <a href=\"https://docs.python.org/2/library/re.html\">Pythoni "
 "regulaaravaldist</a>. Kurakaldkriipse sisesta nii nagu Pythoni stringe (s.t. "
 "kasuta ainult �hte kurakaldkriipsu).\n"
 "\n"
@@ -7357,7 +7361,7 @@ msgstr "Kas kategoriseerija on kasutusel?"
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -7379,8 +7383,8 @@ msgid ""
 "\">topics_bodylines_limit</a>\n"
 "             configuration variable."
 msgstr ""
-"Teemafilter kategoriseerib sissetulevaid kirju vastavalt <a href=\"http://"
-"docs.python.org/library/re.html\">regulaaravaldistele</a>. Kui sissetuleva "
+"Teemafilter kategoriseerib sissetulevaid kirju vastavalt <a href=\"https://"
+"docs.python.org/2/library/re.html\">regulaaravaldistele</a>. Kui sissetuleva "
 "kirja <code>Subject:</code> v�i <code>Keywords:</code> p�is vastab m�nele "
 "reeglile siis paigutatakse see vastavasse <em>registrisse</em>. Liikmell on "
 "v�imalik valida talle huvi pakkuvat registrit (v�i registreid). Kirju, mis "
@@ -7900,7 +7904,7 @@ msgstr "N
 msgid "Once a month, your password will be emailed to you as a reminder."
 msgstr "Kord kuus meilitakse sulle sinu parool."
 
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 msgid "The current archive"
 msgstr "Aktiivne arhiiv"
 
@@ -8262,7 +8266,7 @@ msgstr "L
 msgid "Posting of your message titled \"%(subject)s\""
 msgstr "Kiri teemal \"%(subject)s\""
 
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "[P�hjus puudub]"
 
@@ -8274,28 +8278,28 @@ msgstr "Modereeritud kirja edastus "
 msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr "Uus listi %(realname)s tellimuse soov aadressilt %(addr)s"
 
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "Tellimissoov"
 
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "J�tka ootamist."
 
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr "Uus listi %(realname)s tellimuse l�petamise soov aadressilt %(addr)s"
 
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr "Tellimuse l�petamise soov"
 
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr "Esialgne kiri"
 
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr "Taotlus listile %(realname)s l�kati tagasi"
 
@@ -8408,56 +8412,56 @@ msgstr "%(listname)s listi tellimiseks on tarvis sinu kinnitust"
 msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr " %(listname)s listist lahkumiseks on tarvis sinu kinnitust"
 
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr " from %(remote)s"
 
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr "Listi %(realname)s tellimiseks on vaja toimetaja n�usolekut."
 
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "%(realname)s tellimuse teavitus"
 
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr "tellimuse l�petamiseks on vaja omaniku n�usolekut."
 
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr "%(realname)s tellimuse l�petamise teavitus"
 
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 #, fuzzy
 msgid "%(realname)s address change notification"
 msgstr "%(realname)s tellimuse l�petamise teavitus"
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "Vigane kinnituskood"
 
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "Vigane kinnituskood"
 
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr "Listi %(name)s tellimiseks on vaja listi omaniku n�usolekut."
 
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "Vigane kinnituskood"
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "Sisesta kinnituskood"
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr "Viimane automaatvastus t�naseks"
 
@@ -8549,15 +8553,15 @@ msgstr ""
 msgid "Original message suppressed by Mailman site configuration\n"
 msgstr ""
 
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr "Kirja toimetas k�tte Mailman<br> versioon %(version)s"
 
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr "Python Powered"
 
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr "Gnu's Not Unix (Gnu ei ole Unix)"
 
@@ -9857,7 +9861,7 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
@@ -9898,7 +9902,7 @@ msgstr ""
 "moodul,\n"
 "mille t�ielik �levaade on aadressil:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Otsing on t�stutundetu kui aadressid kuvatakse nii nagu nad listis kirjas "
 "on.\n"
diff --git a/messages/eu/LC_MESSAGES/mailman.po b/messages/eu/LC_MESSAGES/mailman.po
index 1c13e21e..c93b3ad2 100644
--- a/messages/eu/LC_MESSAGES/mailman.po
+++ b/messages/eu/LC_MESSAGES/mailman.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mailman\n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: 2016-10-10 16:24+0200\n"
 "Last-Translator: Gari Araolaza <garaolaza@codesyntax.com>\n"
 "Language-Team: Euskara <eu@li.org>\n"
@@ -207,7 +207,7 @@ msgstr "zuk zeuk"
 msgid "by the list administrator"
 msgstr "zerrendaren kudeatzaileak"
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "Arrazoi ezezagunengatik"
 
@@ -223,23 +223,23 @@ msgstr "ezgaitua"
 msgid "Bounce action notification"
 msgstr "Errebote iragarpena"
 
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "ezgaitua"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr " Zugandik jasotako azken errebotea %(date)s-datakoa zen."
 
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
 msgid "(no subject)"
 msgstr "(gairik gabea)"
 
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr "[Ez dugu eskura erreboteen inguruko xehetasunik]"
 
@@ -253,7 +253,7 @@ msgstr "Kudeatzailearen"
 
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -261,7 +261,7 @@ msgstr "<em>%(safelistname)s</em> zerrendarik ez dago"
 
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -271,8 +271,8 @@ msgstr "Errorea"
 
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -284,7 +284,7 @@ msgid "Authorization failed."
 msgstr "Baimentzerakoan hutsa."
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr "Formularioa iraungi da. (eskaeraren ziurtasun froga)"
 
@@ -303,7 +303,7 @@ msgstr ""
 "                bidaliko."
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "Kontuz: "
 
@@ -461,7 +461,7 @@ msgstr "Moderatzeke dauden kontuak aztertu"
 msgid "Go to the general list information page"
 msgstr "Zerrendaren argibide orokorren orrialdera joan"
 
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 msgid "Edit the public HTML pages and text files"
 msgstr "HTML orrialde eta testu fitxategi publikoak editatu"
 
@@ -554,7 +554,7 @@ msgstr "Gaiaren izena:"
 msgid "Regexp:"
 msgstr "Espresio erregularra:"
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "Deskribapena:"
 
@@ -713,7 +713,7 @@ msgid "nodupes"
 msgstr "bikoitzik ez"
 
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr "bilduma"
 
@@ -745,7 +745,7 @@ msgstr "B"
 msgid "notmetoo"
 msgstr "niri ez"
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr "postagabea"
 
@@ -1083,106 +1083,106 @@ msgstr "Baieztatu moderatzailearen pasahitz berria:"
 msgid "Submit Your Changes"
 msgstr "Zure aldaketak bidali"
 
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr "Moderadore pasahitzak ez dira berdinak"
 
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 msgid "Poster passwords did not match"
 msgstr "Editorearen pasahitzak ez datoz bat."
 
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 msgid "Administrator passwords did not match"
 msgstr "Kudeatzailearen pasahitza ez da zuzena"
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "Dagoeneko harpidetuta"
 
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr "&lt;lerro zuria&gt;"
 
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "ePosta helbide okerra/baliogabea"
 
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr "Gaizkieratutako helbidea (karakterrak okerrak)"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr "Blokeatutako helbidea (matched %(pattern)s)"
 
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "Behar bezala gonbidatuta:"
 
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "Behar bezala harpidetuta:"
 
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "Errorea gonbidapenean:"
 
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "Errorea harpidetzan:"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "Behar Bezala Ezabatuta:"
 
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr "Harpidedun ez direnak ezin dute zerrenda utzi:"
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 msgid "You must provide both current and new addresses."
 msgstr "Helbide zaharra eta oraingoa, biak eman behar dituzu."
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr "Helbide zaharra eta oraingoa desberdinak izan behar dira"
 
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 msgid "%(schange_to)s is already a list member."
 msgstr "%(schange_to)s dagoeneko harpideduna da."
 
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 msgid "%(schange_to)s is not a valid email address."
 msgstr "%(schange_to)s ez da eposta helbide zuzena."
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr "%(schange_from)s ez da harpideduna"
 
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 msgid "%(schange_to)s is already a member"
 msgstr "%(schange_to)s dagoeneko harpideduna da"
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr ""
 "%(schange_to)s helbideak debekatutako  eredu honekin bat egiten du: %(spat)s"
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr "Helbidea %(schange_from)s-tik %(schange_to)s-ra aldatuta."
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
@@ -1190,39 +1190,39 @@ msgstr ""
 "%(change_from)s erabiltzailearen helbidea\n"
 "%(list_name)s zerrendan aldatu da. Berria: %(change_to)s.\n"
 
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 msgid "%(list_name)s address change notice."
 msgstr "%(list_name)s zerrendan helbidea aldatu izanaren jakinarazpena."
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 msgid "Notification sent to %(schange_from)s."
 msgstr "%(schange_from)s-i jakinarazpena bidali zaio."
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 msgid "Notification sent to %(schange_to)s."
 msgstr "Jakinarazpena bidali dugu hona: %(schange_to)s."
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr "Moderazio ikurraren balio okerra"
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 msgid "member mgt page"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "Harpidetu gabea"
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr "Ezabatutako harpidearen aldaketei jaramonik ez: %(user)s"
 
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "Arrakastaz ezabatua"
 
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "Zerrenda uztean errorea:"
 
@@ -1796,8 +1796,8 @@ msgstr ""
 "    <p>Edo sakatu <em>Bertan Behera Utzi</em> botoia\n"
 "    eskaera ezereztatzeko."
 
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "Zerrenda utzi"
 
@@ -2392,47 +2392,51 @@ msgstr "Eskatutako pasahitz gogorarazlea"
 msgid "List name is required."
 msgstr "Zerrenda izena beharrezkoa da"
 
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr "%(realname)s -- %(template_info)s-ren html-a editatu"
 
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr "HTML editatu : Errorea"
 
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr "%(safetemplatename)s txantiloi okerra"
 
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr "%(realname)s -- HTML Orrien Edizioa"
 
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr "Aukeratu editatzeko orrialdea:"
 
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "Zerrendaren hobespen argibideak ikus edo aldatu"
 
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "Aldaketak amaitzen dituzunean... "
 
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "Aldaketak Bidali"
 
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr "Ezinezkoa da html orri hutsak izatea."
 
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr "HTML Aldatugabea"
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2447,19 +2451,19 @@ msgstr ""
 "zerbitzarira shell-eko sarrera beharko duzu\n"
 "    "
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr "Ikus "
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr "Ohiko galderakk 4.48"
 
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 msgid "Page Unchanged."
 msgstr "HTML-a aldatu gabe"
 
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr "HTML kodea behar bezala aldatu da."
 
@@ -2523,7 +2527,7 @@ msgstr ""
 msgid "Edit Options"
 msgstr "Aukerak Editatu"
 
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "Orrialde hau hemen ikusi:"
@@ -2532,33 +2536,33 @@ msgstr "Orrialde hau hemen ikusi:"
 msgid "This form requires JavaScript."
 msgstr ""
 
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "CGI scriptaren errorea"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr "Eskaera metodo okerra: %(method)s"
 
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "Ez duzu helbiderik adierazi!"
 
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "ePosta helbide okerra: %(safeuser)s"
 
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr "Harpidedun ezezaguna: %(safeuser)s."
 
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr "Zerrendako harpideduna bazara, konfirmazio mezua bidali dugu."
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
 "             forwarded to the list administrator for approval."
@@ -2566,7 +2570,7 @@ msgstr ""
 "Zerrenda uzteko egindako eskaera kudeatzaileari bidali zaio gainbegira\n"
 "dezan."
 
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 msgid ""
 "If you are a list member,\n"
 "            your password has been emailed to you."
@@ -2574,15 +2578,15 @@ msgstr ""
 "Zerrendako harpideduna bazara,\n"
 "        pasahitza bidali dizugu epostaz."
 
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "Egiaztapenak huts egin du."
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr "Zure pasahitzaren gogorazle bat epostaz bidalia izan zaizu."
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
@@ -2590,17 +2594,17 @@ msgstr ""
 "Baliteke zerrendaren administratzaileak erabiltzaile honen\n"
 "            beste harpidetzak ezin ikustea."
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr "Oharra: "
 
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr ""
 "%(hostname)s zerbitzariko posta zerrendetako %(safeuser)s-ren hapidetza "
 
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
@@ -2608,7 +2612,7 @@ msgstr ""
 "Klikatu loturetako bat, hautatutako posta\n"
 "        zerrendaren aukeren orrialdera joateko."
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
@@ -2619,15 +2623,15 @@ msgstr ""
 "ere,\n"
 "            zerrenda honetako harpidetza aldatu da."
 
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "Helbideak ez datoz bat!"
 
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr "Dagoeneko ePosta helbide hori darabizu"
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 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 "
@@ -2640,31 +2644,31 @@ msgstr ""
 "ere eskatu duzu. Baieztatu ondoren, %(safeuser)s helbidea duten beste\n"
 "zerrenda guztiak ere aldatu egingo dira."
 
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "Helbide berria zerrendakide da dagoeneko: %(newaddr)s"
 
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "Helbideak ezin dira hutsik egon"
 
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr "Egiaztapen mezu bat bidali da %(newaddr)s helbidera. "
 
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "Emandako ePosta helbidea okerra da"
 
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "Emandako ePosta helbidea okerra da."
 
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s dagoeneko zerrendako partaide da."
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
 "                      think this restriction is erroneous, please contact\n"
@@ -2675,11 +2679,11 @@ msgstr ""
 "jabeari\n"
 "%(owneraddr)s helbidera."
 
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr "Zerrendakidearen izen-abizenak behar bezala aldatu dira."
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 msgid ""
 "The list administrator may not change the\n"
 "                    password for a user."
@@ -2687,15 +2691,15 @@ msgstr ""
 "Zerrendaren kudeatzaileak ezin du erabiltzaile baten\n"
 "                   pasahitza aldatu."
 
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "Pasahitzak ezin dira hutsik egon"
 
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "Pasahitzak ez datoz bat!"
 
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 msgid ""
 "The list administrator may not change the\n"
 "            password for this user's other subscriptions.  However, the\n"
@@ -2705,12 +2709,12 @@ msgstr ""
 "            beste zerrendetako pasahitza aldatu. Aldiz, zerrenda\n"
 "            honetako pasahitza aldatu du."
 
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "Pasahitza zuzen aldatu da."
 
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
@@ -2720,16 +2724,16 @@ msgstr ""
 "               egiaztapen eremua aktibatu egin behar duzu.\n"
 "               Oraindik ez duzu zerrenda utzi!"
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 #, fuzzy
 msgid "via the member options page"
 msgstr "%(realname)s zerrenda: erabiltzailearen aukeren sarrera orria"
 
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "Harpidetza uztearen emaitzak"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -2741,7 +2745,7 @@ msgstr ""
 "           Berak jakinaraziko dizu azkenengo erabakia\n"
 "           zein den."
 
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -2756,7 +2760,7 @@ msgstr ""
 "            idatzi, mesedez, zerrenda jabeari helbide honetara:\n"
 "            %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -2767,7 +2771,7 @@ msgstr ""
 "            beste harpidetzen aukerak aldatu ezin izatea. Hala ere,\n"
 "            zerrenda honetako aukerak aldatu dira."
 
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -2778,7 +2782,7 @@ msgstr ""
 "            egin du; zure hautaketa beraz, ez da onartu.  Dena dela, \n"
 "            gainontzeko aukerak behar bezala zehaztu dira."
 
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -2790,63 +2794,63 @@ msgstr ""
 "konfiguratu.\n"
 "            Dena dela, gainontzeko aukerak behar bezala daude."
 
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "Zure erabiltzaile-aukerak behar bezala egokitu dituzu."
 
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "Baliteke azken mezu-bilduma bat jasotzea."
 
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>Bai, zerrenda utzi nahi dut</em>"
 
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "Nire Pasahitza Aldatu"
 
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "Nire beste haridetzen zerrenda"
 
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "Bidali Pasahitza Nire ePosta Helbidera"
 
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "pasahitza"
 
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "Saioa amaitu"
 
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "Nire Aldaketak bidali"
 
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "egun"
 
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "egun"
 
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr "%(days)d %(units)s"
 
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "Aldatu Nire Helbidea eta Izena"
 
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "<em>Gaiak ez dira zehaztu</em>"
 
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
@@ -2856,19 +2860,19 @@ msgstr ""
 "Zerrenda honetara ondorengo helbidearekin harpidetuta zaude: (letra larri "
 "eta txikiak errespetatuta) <em>%(cpuser)s</em>"
 
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "%(realname)s zerrenda: erabiltzailearen aukeren sarrera orria"
 
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "ePosta helbidea eta "
 
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr "%(realname)s zerrenda: %(safeuser)s erabiltzailearen aukerak"
 
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -2899,19 +2903,19 @@ msgstr ""
 "    dira gauzatuko.\n"
 "    "
 
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "ePosta helbidea:"
 
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "Pasahitza:"
 
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "Saioa hasi"
 
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -2926,11 +2930,11 @@ msgstr ""
 "    berretsi dezakezu zerrenda uzteko asmoa; irakurri\n"
 "    konfirmazio mezuan emango zaizkizun argibideak)."
 
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "Pasahitz gogorarazlea"
 
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
@@ -2938,27 +2942,27 @@ msgstr ""
 "<em>Gogoratu<em> botoia klikatuz, zure \n"
 "    pasahitza ePostaz bidaliko zaizu."
 
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "Gogoratu"
 
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr "<galduta>"
 
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "Eskatuta gaia ez da zuzena: %(topicname)s"
 
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "Gaien iragazkiaren xehetasunak"
 
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "Izena:"
 
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr "Patroia (adierazpen erregularra):"
 
@@ -7007,7 +7011,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -7048,7 +7052,7 @@ msgstr ""
 "            <p>Beheko testu-kutxetan, gehitu helbide bat lerroko; lerroa "
 "hasi\n"
 "            ^ karakterearekin, <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python adierazpen erregularren</a> kasuan.  '\\' ikurrak "
 "sartzean,\n"
 "            Python lerro gordinak erabiltzen ari bazina bezala egin ezazu "
@@ -7832,7 +7836,7 @@ msgstr "Gaien iragazkiak gaituta ala ezgaituta beharko luke?"
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -7855,7 +7859,7 @@ msgid ""
 "             configuration variable."
 msgstr ""
 "Gaien iragazkiak, heltzen diren mezu guztiak sailkatu egiten ditu\n"
-"             behean adierazitako <a href=\"http://docs.python.org/library/re."
+"             behean adierazitako <a href=\"https://docs.python.org/2/library/re."
 "html\">adierazpen\n"
 "             erregularren iragazkiaren</a> arabera.\n"
 "             <code>Subject:</code> (gaia) edo <code>Keywords</code> (gako-"
@@ -8441,7 +8445,7 @@ msgstr "Harpidedun zerrenda ikusi"
 msgid "Once a month, your password will be emailed to you as a reminder."
 msgstr "Hilean behin mezu bat jasoko duzu zure pasahitza gogorarazten."
 
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 msgid "The current archive"
 msgstr "Oraingo fitxategia"
 
@@ -8807,7 +8811,7 @@ msgstr "Bilduma honen bukaera: "
 msgid "Posting of your message titled \"%(subject)s\""
 msgstr "Bidalitako mezuaren gaia: \"%(subject)s\""
 
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "[Ez da arrazoirik eman]"
 
@@ -8819,29 +8823,29 @@ msgstr "Mezu moderatua birbidali egin da"
 msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr "Harpidetza eskaera berria %(realname)s zerrendatik. Nork: %(addr)s"
 
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "Harpidetza eskaera"
 
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "Onespenaren zai jarraitu"
 
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr ""
 "Zerrenda uzteko eskaera berria %(realname)s zerrendatik. Nork: %(addr)s"
 
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr "Zerrenda uzteko eskaera"
 
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr "Jatorrizko Mezua"
 
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr "%(realname)s posta zerrendara egindako eskaera ez da onartu"
 
@@ -8951,55 +8955,55 @@ msgstr "%(listname)s : harpidetzeko zure konfirmazioa behar dugu"
 msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr "%(listname)s : harpidetza uzteko zure konfirmazioa behar dugu"
 
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr " %(remote)s-(e)tik"
 
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr "%(realname)s zerrendan harpidetzeko moderatzailearen onespena behar da"
 
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "%(realname)s harpidetza jakinarazpena"
 
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr "zerrenda uzteko moderatzailearen onespena behar da"
 
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr "%(realname)s zerrenda utzi izanaren jakinarazpena"
 
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 msgid "%(realname)s address change notification"
 msgstr "%(realname)s helbidea aldatu izanaren jakinarazpena"
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "Berrespen kate okerra"
 
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "Berrespen kate okerra"
 
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr "%(name)s zerrendako kide izateko, kudeatzailearen onespena behar da"
 
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "Berrespen kate okerra"
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "Sar ezazu berrespen cookie-a."
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr "Gaurko azkenengo jakinarazpen automatikoa"
 
@@ -9091,15 +9095,15 @@ msgstr "Mezuaren gorputza Mailmanen gune konfigurazioak ezabatu du\n"
 msgid "Original message suppressed by Mailman site configuration\n"
 msgstr "Mezuaren gorputza Mailmanen gune konfigurazioak ezabatu du\n"
 
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr "Mailmanen<br>%(version)s bertsioak banatuta"
 
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr "Phyton-ek hornitua"
 
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr "Gnu ez da Unix"
 
@@ -10286,7 +10290,7 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
diff --git a/messages/fa/LC_MESSAGES/mailman.po b/messages/fa/LC_MESSAGES/mailman.po
index 3f2fc962..c9bb39f0 100644
--- a/messages/fa/LC_MESSAGES/mailman.po
+++ b/messages/fa/LC_MESSAGES/mailman.po
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.14\n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: 2013-07-20 13:40+0330\n"
 "Last-Translator: \n"
 "Language-Team: fa <translate@ifsug.org>\n"
@@ -216,7 +216,7 @@ msgstr "توسط خود شما"
 msgid "by the list administrator"
 msgstr "توسط سرپرست فهرست"
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "به دلایل ناشناخته"
 
@@ -232,23 +232,23 @@ msgstr "از کار انداخته"
 msgid "Bounce action notification"
 msgstr "آگاه‌سازی از واگشت"
 
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "از کار انداخته"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr "آخرین مورد واگشتی دریافت شده از شما در این تاریخ بود:  %(date)s "
 
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
 msgid "(no subject)"
 msgstr "(بدون موضوع)"
 
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr "[هیچ جزئیات واگشتی موجود نیست]"
 
@@ -262,7 +262,7 @@ msgstr "سرپرست"
 
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -270,7 +270,7 @@ msgstr "چنین فهرستی وجود ندارد <em>%(safelistname)s</em>"
 
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -280,8 +280,8 @@ msgstr "خطا"
 
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -293,7 +293,7 @@ msgid "Authorization failed."
 msgstr "اجازه‌دهی شکست خورد"
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr "مهلت زمانی پرکردن این فرم گذشته است. (بررسی جعل درخواست)"
 
@@ -311,7 +311,7 @@ msgstr ""
 "               اساسا غیر قابل استفاده خواهد بود."
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "هشدار: "
 
@@ -470,7 +470,7 @@ msgstr "بررسی درخواست‌های در انتظار برای میان
 msgid "Go to the general list information page"
 msgstr "رفتن به صفحه‌ی اطلاعات عمومی فهرست"
 
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 msgid "Edit the public HTML pages and text files"
 msgstr "ویرایش پرونده‌های متنی و صفحه‌های زنگام عمومی"
 
@@ -563,7 +563,7 @@ msgstr "نام سرفصل:"
 msgid "Regexp:"
 msgstr "عبارت باقاعده:"
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "توضیح:"
 
@@ -723,7 +723,7 @@ msgid "nodupes"
 msgstr "غیر تکراری"
 
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr "یک‌جا"
 
@@ -758,7 +758,7 @@ msgstr "و"
 msgid "notmetoo"
 msgstr "خودم نه"
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr "ﺏﺩﻮﻧ ﺭﺍیﺎﻧﺎﻤﻫ"
 
@@ -1092,150 +1092,150 @@ msgstr "گذرواژه‌ی فرستنده را تایید کنید:"
 msgid "Submit Your Changes"
 msgstr "فرستادن تغییرات"
 
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr "گذرواژه‌های میان‌دار هم‌لنگه نبودند"
 
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 msgid "Poster passwords did not match"
 msgstr "گذرواژه‌های فرستنده هم‌لنگه نبودند."
 
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 msgid "Administrator passwords did not match"
 msgstr "گذرواژه‌های سرپرست هم‌لنگه نبودند"
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "پیشاپیش مشترک شده"
 
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr "&lt;خط خالی&gt;"
 
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "نشانی رایانامه‌ی نادرست یا نا معتبر"
 
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr "نشانی خصومت‌آمیز (نویسه‌های غیرمجاز)"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr "نشانی تحریم‌شده (با %(pattern)s جور در آمد)"
 
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "با موفقیت دعوت شد"
 
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "اشتراک با موفقیت انجام شد:"
 
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "خطا در دعوت:"
 
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "خطا در مشترک کردن:"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "با موفقیت لغو اشتراک شد:"
 
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr "نمی‌توان غیر-اعضا را لغو اشتراک کرد:"
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 msgid "You must provide both current and new addresses."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 #, fuzzy
 msgid "%(schange_to)s is already a list member."
 msgstr "پیشاپیش عضو است"
 
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 #, fuzzy
 msgid "%(schange_to)s is not a valid email address."
 msgstr "باید یک نشانی رایا‌نامه معتبر وارد کنید."
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 #, fuzzy
 msgid "%(schange_to)s is already a member"
 msgstr "پیشاپیش عضو است"
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 #, fuzzy
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr "%(addr)s تحریم است (جور در آمد با: %(patt)s)"
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 #, fuzzy
 msgid "%(list_name)s address change notice."
 msgstr "آگاه‌سازی از اشتراک%(realname)s "
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 #, fuzzy
 msgid "Notification sent to %(schange_from)s."
 msgstr "آگاه‌سازی‌ها"
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 #, fuzzy
 msgid "Notification sent to %(schange_to)s."
 msgstr "آگاه‌سازی‌ها"
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr "مقدار پرچم میان‌داری نادرست است"
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 msgid "member mgt page"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "مشترک نشده"
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr "چشم‌پوشی از تغییرات بر عضو حذف شده: %(user)s"
 
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "با موفقیت حذف شد"
 
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "خطای در لغو اشتراک"
 
@@ -1809,8 +1809,8 @@ msgstr ""
 "    <p>یا  <em>لغو و نادیده‌گرفتن</em>را کلیک کنید تا این لغو اشتراک  \n"
 "لغو شود."
 
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "لغو اشتراک"
 
@@ -2341,47 +2341,51 @@ msgstr "آیا یادآوری‌کننده‌ی ماهانه‌ی گذرواژه
 msgid "List name is required."
 msgstr "نام فهرست باید وارد شود"
 
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr "انتخاب صفحه برای ویرایش:"
 
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "دیدن یا ویرایش تنظیمات فهرست"
 
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "وقتی کار تغییرات‌تان تمام شد...."
 
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "فرستادن تغییرات"
 
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr "زنگام تغییر نکرده است"
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2390,19 +2394,19 @@ msgid ""
 "             "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr "رجوع شود به"
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr "پرسش‌های متداول ۴.۴۸."
 
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 msgid "Page Unchanged."
 msgstr "صفحه تغییر نکرده است."
 
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr ""
 
@@ -2452,7 +2456,7 @@ msgstr ""
 msgid "Edit Options"
 msgstr "گزینه‌های ویرایش"
 
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "این صفحه را ببینید در "
@@ -2461,34 +2465,34 @@ msgstr "این صفحه را ببینید در "
 msgid "This form requires JavaScript."
 msgstr ""
 
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr ""
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "نشانی‌ای وارد نشده است"
 
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "نشانی رایا‌نامه‌ی غیرمجاز: %(safeuser)s"
 
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr ""
 
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 #, fuzzy
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr "رایانامه‌ی تاییدیه، فرستاده شد"
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 #, fuzzy
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
@@ -2497,7 +2501,7 @@ msgstr ""
 "درخواست لغو اشتراک شما\n"
 "                    جهت تایید، به سرپرست فهرست پیش‌سو شده‌است."
 
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 #, fuzzy
 msgid ""
 "If you are a list member,\n"
@@ -2506,30 +2510,30 @@ msgstr ""
 "اگر عضوی از این فهرست باشید،\n"
 "                          هم اکنون گذرواژه‌تان برای شما فرستاده شده است."
 
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "اصالت‌سنجی شکست خورد."
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr "یادآوری‌کننده‌ی گذرواژه‌ی شما برایتان رایانامه شده است."
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
 msgstr ""
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr "یادداشت:"
 
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
@@ -2537,22 +2541,22 @@ msgstr ""
 "روی یک لینک کلیک کنید تا صفحه‌ی گزینه‌های مربوط به\n"
 "        فهرست پستی مورد نظر خود را ببینید."
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
 "            subscription for this mailing list has been changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "نشانی‌ها همخوان نبودند"
 
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr "شما پیشاپیش در حال استفاده از این نشانی رایا‌نامه هستید"
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 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 "
@@ -2561,68 +2565,68 @@ msgid ""
 "%(safeuser)s will be changed. "
 msgstr ""
 
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "نشانی‌ها نمی تواند خالی باشد"
 
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr "یک پیام تایید برای  %(newaddr)s فرستاده شد."
 
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "نشانی رایانامه‌ی وارد شده، نادرست است"
 
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "نشانی رایا‌نامه وارد شده، غیرمجاز است"
 
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s پیشاپیش، عضو این فهرست می‌باشد."
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
 "                      think this restriction is erroneous, please contact\n"
 "                      the list owners at %(owneraddr)s."
 msgstr ""
 
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr "نام عضو با موفقیت عوض شد."
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 msgid ""
 "The list administrator may not change the\n"
 "                    password for a user."
 msgstr ""
 
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "گذرواژه‌ها نباید خالی باشد"
 
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "گذرواژه‌ها مطابقت ندارد!"
 
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 msgid ""
 "The list administrator may not change the\n"
 "            password for this user's other subscriptions.  However, the\n"
 "            password for this mailing list has been changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "گذرواژه با موفقیت عوض شد."
 
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
@@ -2632,16 +2636,16 @@ msgstr ""
 "                دکمه‌ی <em>لغو اشتراک</em> تایید کنید.  \n"
 "                شما هنوز لغو اشتراک نشده اید!"
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 #, fuzzy
 msgid "via the member options page"
 msgstr "فهرست %(realname)s: صفحه‌ی ورود به گزینه‌های اعضا"
 
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "نتایج لغو اشتراک"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -2649,7 +2653,7 @@ msgid ""
 "            decision."
 msgstr ""
 
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -2667,7 +2671,7 @@ msgstr ""
 "تماس بگیرید:\n"
 "            %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -2675,7 +2679,7 @@ msgid ""
 "                changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -2683,7 +2687,7 @@ msgid ""
 "            other options have been set successfully."
 msgstr ""
 
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -2691,82 +2695,82 @@ msgid ""
 "            your other options have been set successfully."
 msgstr ""
 
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "شما با موفقیت گزینه‌های خود را مشخص کردید."
 
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "ممکن است فقط یک رایانامه‌ی یک‌جای دیگر دریافت کنید."
 
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>بله، واقعاً می‌خواهم لغو اشتراک کنم</em>"
 
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "تغییر گذرواژه‌ی من"
 
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "دیگر اشتراک‌های من"
 
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "گذرواژه‌ی مرا برایم رایانامه کن"
 
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "گذرواژه"
 
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "خروج از سیستم"
 
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "فرستادن تغییرات مورد نظر من"
 
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "روز"
 
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "روز"
 
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "نشانی و نام مرا تغییر بده"
 
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "<em>هیچ سرفصل تعریف نشده است</em>"
 
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
 "<em>%(cpuser)s</em>."
 msgstr ""
 
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "فهرست %(realname)s: صفحه‌ی ورود به گزینه‌های اعضا"
 
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "نشانی رایا‌نامه و "
 
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -2796,19 +2800,19 @@ msgstr ""
 "    عمل‌نخواهدکرد.\n"
 "    "
 
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "نشانی رایا‌نامه:"
 
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "گذرواژه:"
 
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "ورود به سیستم"
 
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -2817,37 +2821,37 @@ msgid ""
 "    message)."
 msgstr ""
 
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "یادآوری گذرواژه"
 
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
 msgstr ""
 
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "یادآوری کن"
 
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr ""
 
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "سرفصل درخواست‌شده، معتبر نیست: %(topicname)s"
 
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "جزئیات پالایه‌ی سرفصل"
 
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "نام:"
 
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr ""
 
@@ -5840,7 +5844,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -6422,7 +6426,7 @@ msgstr ""
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -6903,7 +6907,7 @@ msgstr "دیدن فهرست مشترک‌ها"
 msgid "Once a month, your password will be emailed to you as a reminder."
 msgstr "ماهی یک بار، گذرواژه‌ی شما جهت یادآوری، برای‌تان رایانامه خواهد شد."
 
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 msgid "The current archive"
 msgstr "بایگانی جاری"
 
@@ -7230,7 +7234,7 @@ msgstr "پایان "
 msgid "Posting of your message titled \"%(subject)s\""
 msgstr "فرستادن پیام شما با عنوان \"%(subject)s\""
 
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "[هیچ دلیلی داده نشده]"
 
@@ -7242,28 +7246,28 @@ msgstr "پیش‌سوکردن پیام میان‌داری شده"
 msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr "درخواست اشتراک جدید در فهرست %(realname)s از طرف %(addr)s"
 
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "درخواست اشتراک"
 
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "ادامه‌دادن انتظار برای تایید"
 
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr "درخواست لغو اشتراک جدید از طرف  %(realname)s توسط %(addr)s"
 
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr "درخواست لغو اشتراک"
 
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr "پیام اصلی"
 
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr "درخواست فرستاده‌شده به فهرست پستی %(realname)s پس‌زده‌شد"
 
@@ -7354,56 +7358,56 @@ msgstr "برای پیوستن به فهرست پستی  %(listname)s نیاز ب
 msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr "برای ترک فهرست پستی %(listname)s نیاز به تایید شما وجود دارد."
 
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr ""
 
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr "برای اشتراک در %(realname)s نیاز به تایید میان‌دار است"
 
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "آگاه‌سازی از اشتراک%(realname)s "
 
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr "برای لغو اشتراک، تایید میان‌دار لازم است."
 
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr ""
 
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 #, fuzzy
 msgid "%(realname)s address change notification"
 msgstr "آگاه‌سازی از اشتراک%(realname)s "
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "کد تاییدیه نادرست"
 
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "کد تاییدیه نادرست"
 
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr "برای اشتراک در %(name)s نیاز به تایید سرپرست است."
 
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "کد تاییدیه نادرست"
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "کلوچک تاییدیه را وارد کنید"
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr "آخرین آگاه‌سازی پاسخ‌گویی خودکار امروز"
 
@@ -7487,15 +7491,15 @@ msgstr "متن این پیام توسط تنظیمات میلمن مردود د
 msgid "Original message suppressed by Mailman site configuration\n"
 msgstr ""
 
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr ""
 
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr "نیروگرفته با پیتون"
 
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr ""
 
@@ -8475,7 +8479,7 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
diff --git a/messages/fi/LC_MESSAGES/mailman.po b/messages/fi/LC_MESSAGES/mailman.po
index 2a306b91..d7c873ae 100644
--- a/messages/fi/LC_MESSAGES/mailman.po
+++ b/messages/fi/LC_MESSAGES/mailman.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.15\n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: 2010-07-26 10:25+0300\n"
 "Last-Translator: Joni T�yryl� <joni.toyryla@stonelake.fi>\n"
 "Language-Team: Finnish Language Team\n"
@@ -212,7 +212,7 @@ msgstr "sinun toimesta"
 msgid "by the list administrator"
 msgstr "listan yll�pit�j�n toimesta"
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "tuntemattomasta syyst�"
 
@@ -228,16 +228,16 @@ msgstr "ei k
 msgid "Bounce action notification"
 msgstr "Viestin palautusilmoitus"
 
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "ei k�yt�ss�"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr " Viimeisin palautus osoitteestasi oli p�iv�tty  %(date)s"
 
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
@@ -245,7 +245,7 @@ msgid "(no subject)"
 msgstr "(ei otsikkoa)"
 
 # # habazi: (private comment) jatkoin t�st� t��ll� cyclonella..
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr "[Palautetietoja ei ole saatavilla]"
 
@@ -259,7 +259,7 @@ msgstr "Yll
 
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -267,7 +267,7 @@ msgstr "Listaa <em>%(safelistname)s</em> ei ole olemassa."
 
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -277,8 +277,8 @@ msgstr "Virhe"
 
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -290,7 +290,7 @@ msgid "Authorization failed."
 msgstr "Kirjautuminen ep�onnistui."
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr ""
 
@@ -309,7 +309,7 @@ msgstr ""
 "               on k�ytt�kelvoton."
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "Varoitus: "
 
@@ -468,7 +468,7 @@ msgstr "Hoida odottavat pyynn
 msgid "Go to the general list information page"
 msgstr "Mene listan yleisesittelysivulle"
 
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 msgid "Edit the public HTML pages and text files"
 msgstr "Muokkaa julkisia HTML sivuja"
 
@@ -561,7 +561,7 @@ msgstr "Aiheen nimi:"
 msgid "Regexp:"
 msgstr "P��ttyy:"
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "Kuvaus:"
 
@@ -721,7 +721,7 @@ msgid "nodupes"
 msgstr "nodupes"
 
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr "kokoelma"
 
@@ -753,7 +753,7 @@ msgstr "B"
 msgid "notmetoo"
 msgstr "ei (metoo)"
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr "ei viestej�"
 
@@ -1078,154 +1078,154 @@ msgstr "Vahvista p
 msgid "Submit Your Changes"
 msgstr "L�het� muutoksesi"
 
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr "P��k�ytt�j�n salasanat eiv�t t�sm�nneet"
 
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 #, fuzzy
 msgid "Poster passwords did not match"
 msgstr "Salasanasi eiv�t t�sm��."
 
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 msgid "Administrator passwords did not match"
 msgstr "Yll�pit�j�n salasanat eiv�t t�sm�nneet"
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "Jo j�sen"
 
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr "&lt;tyhj� rivi&gt;"
 
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "V��r�/Virheellinen s�hk�postiosoite"
 
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr "Vahingollinen osoite (v��ri� kirjaimia)"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr ""
 "Osoite on kiellettyjen osoitteiden listalla (t�sm�si kaavaan %(pattern)s)"
 
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "Kutsuttu onnistuneesti:"
 
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "Onnistuneesti liitetty:"
 
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "Virhe kutsuttaessa:"
 
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "Virhe liitt�ess�:"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "Erotettu onnistuneesti:"
 
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr "Ei voi erottaa ei-j�seni�:"
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 #, fuzzy
 msgid "You must provide both current and new addresses."
 msgstr "Sinun t�ytyy ensiksi korjata edelt�v�t virheelliset osoitteet."
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 #, fuzzy
 msgid "%(schange_to)s is already a list member."
 msgstr " on jo j�sen"
 
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 #, fuzzy
 msgid "%(schange_to)s is not a valid email address."
 msgstr "Sinun t�ytyy antaa kunnollinen s�hk�postiosoite."
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 #, fuzzy
 msgid "%(schange_to)s is already a member"
 msgstr " on jo j�sen"
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 #, fuzzy
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr "%(addr)s on kielletty (banned) (t�sm�si kaavaan: %(patt)s)"
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 #, fuzzy
 msgid "%(list_name)s address change notice."
 msgstr "ilmoitus listalta %(realname)s poistumisesta"
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 #, fuzzy
 msgid "Notification sent to %(schange_from)s."
 msgstr "Ilmoitukset"
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 #, fuzzy
 msgid "Notification sent to %(schange_to)s."
 msgstr "Ilmoitukset"
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr "Virheellinen muutosasetuksen arvo"
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 #, fuzzy
 msgid "member mgt page"
 msgstr "j�senen valintasivun kautta"
 
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "Ei liitetty"
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr "Ei k�sitell� muutoksia poistetulle k�ytt�j�lle: %(user)s"
 
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "Poistettu onnistuneesti:"
 
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "Virhe eroamisessa:"
 
@@ -1791,8 +1791,8 @@ msgstr ""
 "    <p>Tai paina <em>Peruuta</em> peruuttaaksesi t�m�n\n"
 "irtisanoutumispyynn�n."
 
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "Irtisano"
 
@@ -2390,47 +2390,51 @@ msgstr "L
 msgid "List name is required."
 msgstr "Listan nimi vaaditaan."
 
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr "%(realname)s -- Muokkaa html-koodia %(template_info)s lle"
 
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr "Muokkaa HTML : Virhe"
 
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr "%(safetemplatename)s: Viallinen mallipohja"
 
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr "%(realname)s -- HTML sivun muokkaus"
 
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr "Valitse muokattava sivu:"
 
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "N�yt� tai muokkaa listan m��ritystietoja."
 
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "Kun olet tehnyt muutokset..."
 
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "L�het� muutokset"
 
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr "Hmtl-sivu ei voi olla tyhj�."
 
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr "HTML:�� ei muutettu."
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2444,19 +2448,19 @@ msgstr ""
 "tehd� sen mik�li sinulla on p��sy Mailman palvelimelle.\n"
 "             "
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr "Katso "
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr "UKK 4.48"
 
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 msgid "Page Unchanged."
 msgstr "Sivua ei muutettu."
 
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr "HMTL on muutettu onnistuneesti."
 
@@ -2519,7 +2523,7 @@ msgstr ""
 msgid "Edit Options"
 msgstr "Muokkaa valintoja"
 
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "N�yt� t�m� sivu"
@@ -2528,57 +2532,57 @@ msgstr "N
 msgid "This form requires JavaScript."
 msgstr ""
 
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "CGI ajon virhe"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "Osoitetta ei annettu"
 
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "Virheellinen s�hk�postiosoite: %(safeuser)s"
 
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr "Ei sellaista j�sent�: %(safeuser)s."
 
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 #, fuzzy
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr "Vahvistuss�hk�posti on l�hetetty."
 
 # #######
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 #, fuzzy
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
 "             forwarded to the list administrator for approval."
 msgstr "Irtisanomispyynt�si on l�hetetty listan yll�pit�j�n hyv�ksytt�v�ksi."
 
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 #, fuzzy
 msgid ""
 "If you are a list member,\n"
 "            your password has been emailed to you."
 msgstr "Muistutus salasanastasi on l�hetetty s�hk�postiisi."
 
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "Tunnistautuminen ep�onnistui."
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr "Muistutus salasanastasi on l�hetetty s�hk�postiisi."
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
@@ -2586,16 +2590,16 @@ msgstr ""
 "Listan yll�pit�j�t eiv�t voi katsella k�ytt�j�n\n"
 "            tietoja toisissa postituslistoissa."
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr "Viesti: "
 
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr "%(safeuser)s, listojen j�senyydet palvelimella %(hostname)s"
 
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
@@ -2603,7 +2607,7 @@ msgstr ""
 "Napsauta linkki� menn�ksesi t�m�n postituslistan\n"
 "        valintasivulle."
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
@@ -2613,15 +2617,15 @@ msgstr ""
 "            tai osoitteita toisissa postituslistoissa. Kuitenkin\n"
 "            muutokset ovat p�ivitetty t�h�n listaan."
 
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "Osoitteet eiv�t t�sm�nneet!"
 
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr "K�yt�t jo sit� s�hk�postiosoitetta"
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 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 "
@@ -2635,32 +2639,32 @@ msgstr ""
 "my�s\n"
 "kaikki muut listat jotka sis�lt�v�t osoitteen %(safeuser)s muutetaan."
 
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "%(newaddr)s on jo listan j�sen."
 
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "Osoitteet eiv�t voi olla tyhji�"
 
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr "Vahvistusviesti on l�hetetty osoitteeseen %(newaddr)s"
 
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "V��r� s�hk�postiosoite annettu"
 
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "Virheellinen s�hk�postiosoite"
 
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s on jo listan j�sen."
 
 # #######
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
 "                      think this restriction is erroneous, please contact\n"
@@ -2672,11 +2676,11 @@ msgstr ""
 "hyv� ja\n"
 " \t\t       ottakaa yhteytt� listan omistajiin %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr "J�senen nimen muutos on onnistunut."
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 msgid ""
 "The list administrator may not change the\n"
 "                    password for a user."
@@ -2684,15 +2688,15 @@ msgstr ""
 "Yll�pit�j� ei voi vaihtaa k�ytt�j�n\n"
 "                    salasanaa."
 
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "Salasanat eiv�t voi olla tyhji�"
 
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "Salasanat eiv�t t�sm��!"
 
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 msgid ""
 "The list administrator may not change the\n"
 "            password for this user's other subscriptions.  However, the\n"
@@ -2702,12 +2706,12 @@ msgstr ""
 "            muihin liittymisiin (subscriptions). T�st� "
 "huolimatta             postituslistan salasana on vaihdettu.."
 
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "Salasana muutettu."
 
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
@@ -2717,15 +2721,15 @@ msgstr ""
 "                alla oleva <em>Irtisano</em> n�pp�in.\n"
 "                Sinua ei ole irtisanottu!"
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 msgid "via the member options page"
 msgstr "j�senen valintasivun kautta"
 
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "Irtisanomisen tulokset"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -2737,7 +2741,7 @@ msgstr ""
 "            listan p��k�ytt�jien p��t�ksest�.\n"
 "            "
 
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -2752,7 +2756,7 @@ msgstr ""
 "            Jos sinulla on irtisanomistasi koskevia kysymyksi�, ota\n"
 "            yhteytt� listan omistajaan %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -2763,7 +2767,7 @@ msgstr ""
 "                t�m�n k�ytt�j�n asetuksia toisissa postituslistoissa.\n"
 "                Kuitenkin asetukset t�ss� postituslistassa ovat muutettu."
 
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -2774,7 +2778,7 @@ msgstr ""
 "            t�lt� listalta, joten jakelum��rityksi� ole asetettu. Sen \n"
 "            sijaan muut m��ritykset on asetettu."
 
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -2785,63 +2789,63 @@ msgstr ""
 "            t�lt� listalta, joten l�hetysm��rityst�si ei ole asetettu. \n"
 "            Sen sijaan muut m��ritykset on asetettu."
 
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "Valintasi on asetettu onnistuneesti."
 
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "Saatat saada viel� viimeisen lukemiston."
 
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>Kyll�, haluan varmasti irtisanoutua</em>"
 
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "Muuta salasanani"
 
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "N�yt� muut liitymistietoni"
 
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "L�het� salasanani s�hk�postina minulle"
 
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "salasana"
 
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "Kirjaudu ulos"
 
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "L�het� muutokseni"
 
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "p�iv��"
 
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "p�iv�"
 
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr "%(days)d %(units)s"
 
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "Muuta osoitteeni ja nimeni"
 
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "<em>Aihetta ei ole m��ritelty</em>"
 
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
@@ -2851,19 +2855,19 @@ msgstr ""
 "Olet liittynyt t�lle listalle aihekohtaisella osoitteella\n"
 "<em>%(cpuser)s</em>."
 
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "%(realname)s listan: j�senen sis��nkirjautumissivu"
 
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "s�hk�postiosoite ja"
 
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr "%(realname)s lista: j�senen %(safeuser)s valinnat"
 
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -2898,19 +2902,19 @@ msgstr ""
 "    (jonka n�et onnistuneen sis��nkirjautumisen j�lkeen).\n"
 "    "
 
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "S�hk�postiosoite:"
 
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "Salasana:"
 
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "Kirjaudu sis��n"
 
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -2924,13 +2928,13 @@ msgstr ""
 "    vahvistaa s�hk�postina; katso ohjeet vahvistusviestist�.\n"
 "    "
 
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "Salasanan muistuttaja"
 
 # Harrin osuus p��ttyy t�h�n
 # #######
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
@@ -2938,27 +2942,27 @@ msgstr ""
 "Klikkaamalla <em>Muistuta</em>-painiketta,\n"
 "    salasanasi l�hetet��n sinulle s�hk�postina."
 
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "Muistuta"
 
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr "<puuttuu>"
 
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "Pyydetty aihe ei kelpaa: %(topicname)s"
 
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "Aihesuodattimen tarkemmat tiedot"
 
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "Nimi:"
 
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr "Merkkijono (s��nn�llisen� lausekkeena):"
 
@@ -6999,7 +7003,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -7035,7 +7039,7 @@ msgstr ""
 "\n"
 "            <p>Alla olevissa tekstilaatikoissa, lis�� yksi osoite riville;\n"
 "            aloita rivi ^ merkill�, joka m��rittelee <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Pythonin yleisen ilmaisun</a>.  Jos kirjoitat takakeno- "
 "viivoja\n"
 "            merkitse ne kuin k�ytt�isit Pythonin raakamerkkijonoa (esim. jos "
@@ -7834,7 +7838,7 @@ msgstr "Pit
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -7858,7 +7862,7 @@ msgid ""
 msgstr ""
 "Aiheen suodattimet luokittelee jokaisen tulevan s�hk�postin\n"
 "             <a\n"
-"            href=\"http://docs.python.org/library/re.html\">tavallisen\n"
+"            href=\"https://docs.python.org/2/library/re.html\">tavallisen\n"
 "             ilmaisun suodattimen</a> mukaan kuten m��rittelet alla. Jos\n"
 "             viestin <code>Aihe:</code> tai <code>Avainsanat:</code> kent�t "
 "t�sm��v�t\n"
@@ -8466,7 +8470,7 @@ msgstr "Vieraile liittyj
 msgid "Once a month, your password will be emailed to you as a reminder."
 msgstr "Kerran kuussa, salasananmuistuttaja l�hett�� sinulle salasanasi"
 
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 msgid "The current archive"
 msgstr "Nykyinen arkisto"
 
@@ -8829,7 +8833,7 @@ msgstr "Loppu "
 msgid "Posting of your message titled \"%(subject)s\""
 msgstr "Viestisi, jonka otsikko on \"%(subject)s\""
 
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "[Syyt� ei annettu]"
 
@@ -8841,28 +8845,28 @@ msgstr "Yll
 msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr "Uusi liittymispyynt� listalle %(realname)s %(addr)s lta"
 
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "Liittymispyynt�"
 
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "Jatka hyv�ksymisen odottamista"
 
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr "Uusi irtisanomispyynt� listalle %(realname)s  %(addr)s lta"
 
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr "Irtisanoutumispyynt�"
 
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr "Alkuper�inen viesti"
 
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr "Pyynt� listalle %(realname)s on hyl�tty"
 
@@ -8975,56 +8979,56 @@ msgstr "Vahvista j
 msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr "Vahvista j�senyytesti postituslistalle %(listname)s ennen poistumista"
 
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr " l�hde: %(remote)s"
 
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr "listan %(realname)s tilaukset vaativat moderaattorin hyv�ksynn�n"
 
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "ilmoitus listan %(realname)s tilauksesta"
 
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr "listalta poistuminen vaatii moderaattorin hyv�ksynn�n"
 
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr "ilmoitus listalta %(realname)s poistumisesta"
 
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 #, fuzzy
 msgid "%(realname)s address change notification"
 msgstr "ilmoitus listalta %(realname)s poistumisesta"
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "V��r� vahvistusmerkkijono"
 
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "V��r� vahvistusmerkkijono"
 
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr "listan %(name)s tilaaminen vaatii yll�pit�j�n hyv�ksynn�n"
 
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "V��r� vahvistusmerkkijono"
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "Sy�t� vahvistusev�ste"
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr "Viimeinen automaattinen paluuviesti -ilmoitus t�lle p�iv�lle"
 
@@ -9116,15 +9120,15 @@ msgstr ""
 msgid "Original message suppressed by Mailman site configuration\n"
 msgstr ""
 
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr "Toimitettu Mailmanilla<br>versio %(version)s"
 
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr "Python Powered"
 
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr "Gnu's Not Unix"
 
@@ -10523,7 +10527,7 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
@@ -10564,7 +10568,7 @@ msgstr ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
diff --git a/messages/fr/LC_MESSAGES/mailman.po b/messages/fr/LC_MESSAGES/mailman.po
index 3e91b546..a498a50b 100644
--- a/messages/fr/LC_MESSAGES/mailman.po
+++ b/messages/fr/LC_MESSAGES/mailman.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mailman 2.1b6\n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: 2003-01-22 12:50-0500\n"
 "Last-Translator: Pascal George <george@lyon.inserm.fr>\n"
 "Language-Team: fr <traduc@traduc.org>\n"
@@ -205,7 +205,7 @@ msgstr "par vous"
 msgid "by the list administrator"
 msgstr "par l'administrateur de la liste"
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "pour des raisons inconnues"
 
@@ -221,23 +221,23 @@ msgstr "d
 msgid "Bounce action notification"
 msgstr "Avis de mesure de rejet"
 
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "d�sactiv�"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr " Le dernier rejet en provenance de votre adresse date du %(date)s"
 
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
 msgid "(no subject)"
 msgstr "(sans objet)"
 
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr "[Aucun d�tail du rejet disponible]."
 
@@ -251,7 +251,7 @@ msgstr "Administrateur"
 
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -259,7 +259,7 @@ msgstr "Liste <em>%(safelistname)s</em> inexistante"
 
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -269,8 +269,8 @@ msgstr "Erreur"
 
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -282,7 +282,7 @@ msgid "Authorization failed."
 msgstr "Echec de l'autorisation."
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr ""
 
@@ -301,7 +301,7 @@ msgstr ""
 "votre liste de diffusion sera inutilisable."
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "Attention : "
 
@@ -461,7 +461,7 @@ msgstr "Basculer vers les requ
 msgid "Go to the general list information page"
 msgstr "Allez � la page des informations g�n�rales de la liste"
 
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 msgid "Edit the public HTML pages and text files"
 msgstr "Modifier les pages HTML publiques et les fichiers texte"
 
@@ -555,7 +555,7 @@ msgstr "Nom du th
 msgid "Regexp:"
 msgstr "Expression reguli�re :"
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "Description :"
 
@@ -715,7 +715,7 @@ msgid "nodupes"
 msgstr "sansdoublons"
 
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr "group�"
 
@@ -747,7 +747,7 @@ msgstr "R"
 msgid "notmetoo"
 msgstr "pas moi"
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr "noncourriel"
 
@@ -1074,154 +1074,154 @@ msgstr "Confirmer le nouveau mot de passe de mod
 msgid "Submit Your Changes"
 msgstr "Soumettre vos modifications"
 
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr "Les mots de passe de mod�ration ne correspondent pas"
 
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 #, fuzzy
 msgid "Poster passwords did not match"
 msgstr "Vos mots de passe ne correspondent pas."
 
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 msgid "Administrator passwords did not match"
 msgstr "Les mots de passe administrateur ne correspondent pas"
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "D�j� abonn�"
 
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr "&lt;ligne vide&gt;"
 
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "Adresse courriel Mauvaise/Invalide"
 
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr "Adresse hostile (caract�res ill�gaux)"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "Invit� avec succ�s :"
 
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "Abonnement r�ussi :"
 
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "Erreur lors de l'invitation :"
 
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "Erreur lors de l'abonnement :"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "R�siliation r�ussie :"
 
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr "Ne peut r�silier l'abonnement de non-abonn�s :"
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 #, fuzzy
 msgid "You must provide both current and new addresses."
 msgstr ""
 "Vous devez d'abord r�gler le probl�me de l'adresse invalide pr�c�dente."
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 #, fuzzy
 msgid "%(schange_to)s is already a list member."
 msgstr " est d�j� abonn�"
 
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 #, fuzzy
 msgid "%(schange_to)s is not a valid email address."
 msgstr "Vous devez fournir une adresse courriel valide."
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 #, fuzzy
 msgid "%(schange_to)s is already a member"
 msgstr " est d�j� abonn�"
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 #, fuzzy
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr "%(addr)s est interdite (correspondance: %(patt)s)"
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 #, fuzzy
 msgid "%(list_name)s address change notice."
 msgstr "notification de r�siliation de %(realname)s"
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 #, fuzzy
 msgid "Notification sent to %(schange_from)s."
 msgstr "Avis"
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 #, fuzzy
 msgid "Notification sent to %(schange_to)s."
 msgstr "Avis"
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr "Valeur de l'indicateur de mod�ration incorrecte"
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 msgid "member mgt page"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "Pas abonn�"
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr ""
 "Les modifications apport�es � l'abonn� supprim� sont ignor�es : %(user)s"
 
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "Abonnement r�sili� avec succ�s :"
 
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "Erreur lors de la r�siliation :"
 
@@ -1798,8 +1798,8 @@ msgstr ""
 "\t<p>Ou cliquez sur <em>Annuler et ignorer</em> pour annuler cette\n"
 "\trequ�te de r�siliation."
 
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "R�silier"
 
@@ -2410,47 +2410,51 @@ msgstr "Envoyer les rappels mensuels de mot de passe ?"
 msgid "List name is required."
 msgstr "Le nom de la liste est requis."
 
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr "%(realname)s -- Modifier html pour %(template_info)s"
 
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr "Modifier HTML : Erreur"
 
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr "%(safetemplatename)s : mod�le invalide"
 
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr "%(realname)s -- Modification de Page HTML"
 
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr "S�lectionner la page � modifier :"
 
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "Voir ou modifier les informations de configuration de la liste."
 
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "Quand vous aurez fini de faire les modifications..."
 
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "Valider les modifications"
 
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr "Impossible d'avoir une page html vide"
 
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr "HTML inchang�"
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2459,19 +2463,19 @@ msgid ""
 "             "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 msgid "Page Unchanged."
 msgstr "Page inchang�e"
 
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr "HTML mis � jour avec succ�s."
 
@@ -2534,7 +2538,7 @@ msgstr ""
 msgid "Edit Options"
 msgstr "Modifier les Options"
 
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "Visualisez cette page en"
@@ -2543,34 +2547,34 @@ msgstr "Visualisez cette page en"
 msgid "This form requires JavaScript."
 msgstr ""
 
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "Erreur de script CGI"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "Aucune adresse fournie"
 
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "Adresse courriel invalide : %(safeuser)s"
 
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr "Abonn� inconnu : %(safeuser)s."
 
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 #, fuzzy
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr "Le courriel de confirmation a �t� envoy�."
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 #, fuzzy
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
@@ -2579,22 +2583,22 @@ msgstr ""
 "Votre requ�te de r�siliation d'abonnement a �t� envoy�e �\n"
 "                    l'administrateur de la liste pour approbation."
 
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 #, fuzzy
 msgid ""
 "If you are a list member,\n"
 "            your password has been emailed to you."
 msgstr "Un rappel de votre mot de passe vous a �t� envoy�."
 
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "Echec de l'authentification."
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr "Un rappel de votre mot de passe vous a �t� envoy�."
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
@@ -2602,16 +2606,16 @@ msgstr ""
 "L'administrateur de la liste n'a peut-�tre pas vu \n"
 "\t     les autres abonnements de cet utilisateur."
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr "Note :"
 
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr "Les abonnements de %(safeuser)s sur %(hostname)s"
 
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
@@ -2619,7 +2623,7 @@ msgstr ""
 "Cliquez sur un lien pour afficher la page de vos\n"
 "        options pour la liste demand�e."
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
@@ -2629,15 +2633,15 @@ msgstr ""
 "\t     ou les adresses des autres abonnements de cet utilisateur.\n"
 "\t     N�anmoins l'abonnement pour cette liste a �t� modifi�."
 
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "Les adresses ne correspondent pas !"
 
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr "Vous utilisez d�j� cette adresse courriel."
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 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 "
@@ -2651,31 +2655,31 @@ msgstr ""
 "listes de diffusion contenant l'adresse %(safeuser)s\n"
 "seront modifi�es."
 
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "La nouvelle adresse est d�j� abonn�e : %(newaddr)s"
 
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "Les adresses ne doivent pas �tre vides"
 
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr "Un message de confirmation a �t� envoy� � %(newaddr)s. "
 
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "Mauvaise adresse courriel fournie"
 
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "Adresse courriel fournie invalide"
 
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s est d�j� abonn� � la liste."
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
 "                      think this restriction is erroneous, please contact\n"
@@ -2685,11 +2689,11 @@ msgstr ""
 "cette mesure est erron�e, veuillez contacter le propri�taire de la\n"
 "liste � l'adresse %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr "Nom de l'abonn� modifi� avec succ�s. "
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 #, fuzzy
 msgid ""
 "The list administrator may not change the\n"
@@ -2698,15 +2702,15 @@ msgstr ""
 "L'administrateur de la liste n'a peut-�tre pas vu \n"
 "\t     les autres abonnements de cet utilisateur."
 
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "Les mots de passe ne peuvent pas �tre vides"
 
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "Les mots de passe ne correspondent pas !"
 
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 msgid ""
 "The list administrator may not change the\n"
 "            password for this user's other subscriptions.  However, the\n"
@@ -2716,12 +2720,12 @@ msgstr ""
 "            le mot de passe des autres abonnements de cet utilisateur.\n"
 "            N�anmoins le mot de passe pour cette liste a �t� modifi�."
 
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "Mot de passe modifi� avec succ�s."
 
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
@@ -2731,16 +2735,16 @@ msgstr ""
 "                � cocher sous le bouton <em>R�silier</em>. Votre abonnement\n"
 "                n'a pas �t� r�sili� !"
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 #, fuzzy
 msgid "via the member options page"
 msgstr "Liste %(realname)s : Page de login d'abonn�"
 
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "R�sultats de la r�siliation"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -2751,7 +2755,7 @@ msgstr ""
 "            de la liste pour approbation. Vous recevrez un avis d�s que les\n"
 "            mod�rateurs de la liste auront pris une d�cision."
 
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -2767,7 +2771,7 @@ msgstr ""
 "veuillez contacter\n"
 "            le gestionnaire de la liste � l'adresse %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -2778,7 +2782,7 @@ msgstr ""
 "\t         les options des autres abonnements de cet utilisateur.\n"
 "\t         N�anmoins les options pour cette liste ont �t� modifi�es."
 
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -2789,7 +2793,7 @@ msgstr ""
 "            vos options de distribution ne seront donc pas modifi�es,\n"
 "            contrairement aux autres."
 
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -2800,63 +2804,63 @@ msgstr ""
 "            pour cette liste, par suite toutes les options autre que\n"
 "            celle-ci ont �t�s sauvegard�es avec succ�s."
 
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "Vos options ont �t�s param�tr�es avec succ�s."
 
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "Vous recevrez un dernier lot."
 
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>Oui, je veux vraiment r�silier mon abonnement</em>"
 
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "Modifier mon mot de passe"
 
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "Afficher mes autres abonnements"
 
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "Envoyez-moi mon mot de passe par courriel"
 
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "mot de passe"
 
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "D�connecter"
 
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "Valider mes modifications"
 
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "jours"
 
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "jour"
 
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr "%(units)s %(days)d"
 
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "Modifier mon adresse et mon nom"
 
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "<em>Aucun th�me d�fini</em>"
 
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
@@ -2866,19 +2870,19 @@ msgstr ""
 "Vous �tes abonn� � cette liste avec une adresse de type pr�servation de la\n"
 "casse <em>%(cpuser)s</em>."
 
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "Liste %(realname)s : Page de login d'abonn�"
 
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "adresse courriel et "
 
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr "Liste %(realname)s : options d'abonn� de l'utilisateur %(safeuser)s"
 
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -2908,19 +2912,19 @@ msgstr ""
 "de vos modifications ne prendra effet.\n"
 "\t"
 
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "Adresse courriel :"
 
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "Connecter"
 
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -2933,11 +2937,11 @@ msgstr ""
 "cliquer pour achever le processus de r�siliation (vous pourrez �galement\n"
 "le faire par courriel; lisez les instructions dans ledit message)."
 
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "Rappel de mot de passe"
 
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
@@ -2945,27 +2949,27 @@ msgstr ""
 "En cliquant sur le bouton <em>Rappel</em>, votre mot de passe vous sera\n"
 "envoy� par courriel."
 
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "Rappel"
 
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr "<absent>"
 
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "Le th�me demand� n'est pas valide : %(topicname)s"
 
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "D�tails du filtre de th�me"
 
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "Nom :"
 
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr "mod�le (sous forme d'expression reguli�re) :"
 
@@ -7053,7 +7057,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -7095,7 +7099,7 @@ msgstr ""
 "            <p>Dans la zone de texte ci-dessous, ajouter une adresse par "
 "ligne;\n"
 "            commencer la ligne avec le caract�re ^ pour designer une <a\n"
-"            href=\"http://docs.python.org/library/re.html\">expression\n"
+"            href=\"https://docs.python.org/2/library/re.html\">expression\n"
 "            r�guli�re Python</a>. Si vous utilisez des backslashs, faites-le "
 "comme\n"
 "            si vous utilisiez des cha�nes Python brutes (i.e. en utilisant "
@@ -7918,7 +7922,7 @@ msgstr "Le filtre de th
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -7942,7 +7946,7 @@ msgid ""
 msgstr ""
 "Le filtre de th�me place chaque courriel qui arrive dans une cat�gorie\n"
 "             sur la base <a\n"
-"             href=\"http://docs.python.org/library/re.html\">\n"
+"             href=\"https://docs.python.org/2/library/re.html\">\n"
 "             des filtres d'expressions r�guli�res</a> que vous avez d�finis "
 "ci-dessous.\n"
 "             Si l'en-t�te <code>Objet:</code> ou <code>Mots Cl�s:</code> "
@@ -8569,7 +8573,7 @@ msgstr "Visualisez la liste des abonn
 msgid "Once a month, your password will be emailed to you as a reminder."
 msgstr "Votre recevrez un rappel mensuel de votre mot de passe par courriel."
 
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 msgid "The current archive"
 msgstr "L'archive en cours"
 
@@ -8940,7 +8944,7 @@ msgstr "Fin de "
 msgid "Posting of your message titled \"%(subject)s\""
 msgstr "Envoi de votre message ayant comme objet \"%(subject)s\""
 
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "[aucun motif fourni]"
 
@@ -8952,30 +8956,30 @@ msgstr "Faire suivre un message mod
 msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr "Nouvelle demande d'abonnement � la liste %(realname)s de %(addr)s"
 
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "Requ�te d'abonnement"
 
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "Laissez en attente d'approbation"
 
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr ""
 "Nouvelle demande de r�siliation de l'abonnement � la liste\n"
 "%(realname)s par %(addr)s"
 
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr "Demande de r�siliation d'abonnement"
 
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr "Message d'origine"
 
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr "Requ�te � destination de la liste %(realname)s rejet�e"
 
@@ -9089,57 +9093,57 @@ msgstr "Votre confirmation est n
 msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr "Votre confirmation est n�cessaire pour quitter la liste %(listname)s"
 
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr " � partir de %(remote)s"
 
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr "les abonnements � %(realname)s n�cessitent l'approbation du mod�rateur"
 
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "notification d'abonnement de %(realname)s"
 
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr "Les r�siliations d'abonnements n�cessitent l'approbation du mod�rateur"
 
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr "notification de r�siliation de %(realname)s"
 
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 #, fuzzy
 msgid "%(realname)s address change notification"
 msgstr "notification de r�siliation de %(realname)s"
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "Mauvaise cha�ne de confirmation"
 
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "Mauvaise cha�ne de confirmation"
 
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr ""
 "L'abonnement � la liste %(name)s requiert une approbation de l'administrateur"
 
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "Mauvaise cha�ne de confirmation"
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "Entrez le cookie de confirmation"
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr "Dernier avis d'envoi de r�ponse automatique pour la journ�e"
 
@@ -9232,15 +9236,15 @@ msgstr ""
 msgid "Original message suppressed by Mailman site configuration\n"
 msgstr ""
 
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr "Delivr� par Mailman <br>version %(version)s"
 
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr "Python Powered"
 
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr "Gnus's Not Unix"
 
@@ -10622,7 +10626,7 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
@@ -10661,7 +10665,7 @@ msgstr ""
 "utilis�es. La syntaxe des expressions r�guli�res est celle de Perl5\n"
 "avec l'utilisation du module re de Python. Les sp�cifications\n"
 "compl�tes sont disponible �\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "La comparaison des adresses se fait avec non respect de la casse tandis\n"
 "que les r�sultats trouv�s seront affich�s avec leurs casses\n"
diff --git a/messages/gl/LC_MESSAGES/mailman.po b/messages/gl/LC_MESSAGES/mailman.po
index 50687c61..5cef74e6 100644
--- a/messages/gl/LC_MESSAGES/mailman.po
+++ b/messages/gl/LC_MESSAGES/mailman.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mailman_src\n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: 2007-10-19 14:01+0200\n"
 "Last-Translator: Frco. Javier Rial Rodríguez <fjrial@cesga.es>\n"
 "Language-Team: Galician <mancomun@mancomun.org>\n"
@@ -206,7 +206,7 @@ msgstr "por si propio"
 msgid "by the list administrator"
 msgstr "polo administrador da rolda"
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "debido a algún motivo que se descoñece"
 
@@ -222,23 +222,23 @@ msgstr "inhabilitada"
 msgid "Bounce action notification"
 msgstr "Notificación de rebote"
 
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "inhabilitada"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr "A última devolución que se recibiu foi hai %(date)s"
 
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
 msgid "(no subject)"
 msgstr "(sen asunto)"
 
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr "[Non hai detalles de devolucións dispoñíbeis]"
 
@@ -252,7 +252,7 @@ msgstr "Administrador"
 
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -260,7 +260,7 @@ msgstr "A rolda <em>%(safelistname)s</em> non existe"
 
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -270,8 +270,8 @@ msgstr "Erro"
 
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -283,7 +283,7 @@ msgid "Authorization failed."
 msgstr "Produciuse un erro na autorización"
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr ""
 
@@ -303,7 +303,7 @@ msgstr ""
 "empregar."
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "Aviso: "
 
@@ -462,7 +462,7 @@ msgstr "Ocuparse das solicitudes pendentes de moderar"
 msgid "Go to the general list information page"
 msgstr "Ir á páxina de información xeral sobre a rolda."
 
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 msgid "Edit the public HTML pages and text files"
 msgstr "Editar as páxinas HTML públicas e os ficheiro de texto"
 
@@ -557,7 +557,7 @@ msgstr "Nome do tema:"
 msgid "Regexp:"
 msgstr "Expresión regular:"
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "Descrición:"
 
@@ -718,7 +718,7 @@ msgid "nodupes"
 msgstr "sen duplicados"
 
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr "compilación"
 
@@ -750,7 +750,7 @@ msgstr "B"
 msgid "notmetoo"
 msgstr "a min non"
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr "sen correo"
 
@@ -1088,152 +1088,152 @@ msgstr "Confirme o contrasinal do moderador:"
 msgid "Submit Your Changes"
 msgstr "Enviar os cambios"
 
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr "Os contrasinais do moderador non coinciden"
 
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 #, fuzzy
 msgid "Poster passwords did not match"
 msgstr "Os seus contrasinais non coinciden."
 
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 msgid "Administrator passwords did not match"
 msgstr "Os contrasinais do administrador non coinciden"
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "Xa está subscrito"
 
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr "&lt;líña en branco&gt;"
 
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "O enderezo de correo quer é incorrecto quer non é válido"
 
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr "Enderezo hostil (os caracteres non son válidos)"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr "Enderezo expulsado (concorda %(pattern)s)"
 
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "Convidáronse con éxito:"
 
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "Subscribiuse con éxito:"
 
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "Erro no convite de subscrición:"
 
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "Houbo un erro ao dar de alta a subscrición:"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "Anulou a súa subscrición satisfactoriamente:"
 
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr "Non se pode dar de baixa enderezos que non estean rexistrados:"
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 #, fuzzy
 msgid "You must provide both current and new addresses."
 msgstr "Primeiro tense que corrixir o enderezo que non é válido."
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 #, fuzzy
 msgid "%(schange_to)s is already a list member."
 msgstr " xa é un subscritor"
 
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 #, fuzzy
 msgid "%(schange_to)s is not a valid email address."
 msgstr "Ten de se proporcionar un enderezo de correo electrónico válido."
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 #, fuzzy
 msgid "%(schange_to)s is already a member"
 msgstr " xa é un subscritor"
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 #, fuzzy
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr "%(addr)s está  expulsado (coincide: %(patt)s)"
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 #, fuzzy
 msgid "%(list_name)s address change notice."
 msgstr "Notificación da baixa de %(realname)s"
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 #, fuzzy
 msgid "Notification sent to %(schange_from)s."
 msgstr "Notificacións"
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 #, fuzzy
 msgid "Notification sent to %(schange_to)s."
 msgstr "Notificacións"
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr "Valor incorrecto da bandeira de moderación"
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 msgid "member mgt page"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "Non está subscrito"
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr "Estanse a ignorar os cambios do usuario borrado: %(user)s"
 
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "Eliminouse satisfactoriamente"
 
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "Produciuse un erro ao dar de baixa a subscrición:"
 
@@ -1796,8 +1796,8 @@ msgstr ""
 "    <p>ou prema <em>Cancelar e rexeitar</em> para cancelar esta solicitude\n"
 "    de baixa."
 
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "Darse de baixa"
 
@@ -2404,47 +2404,51 @@ msgstr "Enviaranse mensualmente as lembranzas dos contrasinais?"
 msgid "List name is required."
 msgstr "É preciso inserir o nome da rolda."
 
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr "%(realname)s -- Editar o código HTML para %(template_info)s"
 
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr "Editación do HTML : erro"
 
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr "%(safetemplatename)s: o modelo non é válido"
 
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr "%(realname)s -- Edición do código HTML das páxinas"
 
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr "Seleccione a páxina para editar:"
 
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "Ver ou editar a información de configuración da rolda."
 
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "Cando remate de facer as mudanzas..."
 
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "Enviar os cambios"
 
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr "Non se pode ter unha páxina html baleira."
 
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr "Non se modificou o código de HTML"
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2453,20 +2457,20 @@ msgid ""
 "             "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 #, fuzzy
 msgid "Page Unchanged."
 msgstr "Non se modificou o código de HTML"
 
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr "Actualizouse o código HTML con éxito"
 
@@ -2530,7 +2534,7 @@ msgstr ""
 msgid "Edit Options"
 msgstr "Editar as opcións"
 
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "Ver esta páxina en "
@@ -2539,34 +2543,34 @@ msgstr "Ver esta páxina en "
 msgid "This form requires JavaScript."
 msgstr ""
 
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "Erro da escritura CGI"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "Non se indicou un enderezo"
 
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "O enderezo de correo electrónico é incorrecto: %(safeuser)s"
 
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr "Non existe ese subscritor: %(safeuser)s."
 
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 #, fuzzy
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr "Enviouse a mensaxe de confirmación."
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 #, fuzzy
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
@@ -2575,37 +2579,37 @@ msgstr ""
 "A solicitude da súa baixa reenviouse ao administrador da\n"
 "rolda para que lle de a aprobación."
 
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 #, fuzzy
 msgid ""
 "If you are a list member,\n"
 "            your password has been emailed to you."
 msgstr "Envióuselle un lembranza do seu contrasinal por correo electrónico.<p>"
 
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "Produciuse un erro na autenticación."
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr "Envióuselle un lembranza do seu contrasinal por correo electrónico.<p>"
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
 msgstr ""
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr "Nota: "
 
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr "Subscricións de %(safeuser)s en %(hostname)s"
 
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
@@ -2613,22 +2617,22 @@ msgstr ""
 "Prema co rato a ligazón para visitar a páxina\n"
 "        de opcións na rolda de distribución solicitada."
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
 "            subscription for this mailing list has been changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "Os enderezos non coinciden"
 
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr "Xa está a empregar ese enderezo de correo electrónico"
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 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 "
@@ -2642,56 +2646,56 @@ msgstr ""
 "cambiará calquera outra rolda de distribución que conteña o enderezo\n"
 "%(safeuser)s. "
 
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "O enderezo novo xa está dado de alta: %(newaddr)s"
 
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "Os enderezos non poden estar en branco"
 
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr "Envióuselles unha mensaxe de confirmación a %(newaddr)s"
 
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "Proporcionou un enderezo de correo que é incorrecto"
 
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "Proporcionouse un enderezo de correo que non é correcto"
 
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s xa está subscrito á rolda."
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
 "                      think this restriction is erroneous, please contact\n"
 "                      the list owners at %(owneraddr)s."
 msgstr ""
 
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr "Cambiouse, con éxito, o nome e mais os apelidos do subscritor."
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 msgid ""
 "The list administrator may not change the\n"
 "                    password for a user."
 msgstr ""
 
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "Os contrasinais non deberían estar en branco"
 
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "Os contrasinais non coinciden"
 
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 #, fuzzy
 msgid ""
 "The list administrator may not change the\n"
@@ -2703,12 +2707,12 @@ msgstr ""
 "a opción de entrega non se activou. Pola contra, o resto \n"
 "das opcións cambiáronse correctamente."
 
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "Cambiose a contrasinal satisfactoriamente."
 
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
@@ -2718,16 +2722,16 @@ msgstr ""
 "                verificación que está debaixo do botón\n"
 "                <em>Baixa</em>. Non se deu de baixa!."
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 #, fuzzy
 msgid "via the member options page"
 msgstr "Rolda %(realname)s: páxina de entrada das opcións do subscritor"
 
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "Resultados da baixa"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -2739,7 +2743,7 @@ msgstr ""
 "            para a súa aprobación. Recibirá unha notificación\n"
 "            despois de o moderador tomar unha decisión"
 
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -2754,7 +2758,7 @@ msgstr ""
 "        baixa, póñase en contacto cos propietarios da\n"
 "        rolda en %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -2762,7 +2766,7 @@ msgid ""
 "                changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -2773,7 +2777,7 @@ msgstr ""
 "esta rolda. Pola contra, o resto das opcións definíronse con\n"
 "éxito."
 
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -2785,63 +2789,63 @@ msgstr ""
 "a opción de entrega non se activou. Pola contra, o resto \n"
 "das opcións cambiáronse correctamente."
 
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "Definiu as súas opcións con éxito."
 
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "É posíbel que reciba unha última compilación."
 
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>Si, realmente quero darme de baixa</em>"
 
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "Mudar o meu contrasinal"
 
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "Relacionar as outras subscricións"
 
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "Enviarme o contrasinal por correo"
 
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "contrasinal"
 
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "Saír"
 
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "Enviar os cambios"
 
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "días"
 
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "día"
 
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr "%(days)d %(units)s"
 
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "Mudar o meu enderezo e o meu nome"
 
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "<em>Non se definiu ningún tema</em>"
 
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
@@ -2851,19 +2855,19 @@ msgstr ""
 "Está subscrito á rolda de correo co enderezo <em>%(cpuser)s</em> respectando "
 "as maiúsculas e as minúsculas."
 
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "Rolda %(realname)s: páxina de entrada das opcións do subscritor"
 
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "enderezo de correo electrónico e "
 
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr "Rolda %(realname)s: opcións de subscrición de %(safeuser)s"
 
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -2901,19 +2905,19 @@ msgstr ""
 "    premer a ligazón <em>Desconexión</em> (que verá unha vez\n"
 "    entre satisfactoriamente)."
 
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "Enderezo de correo electrónico: "
 
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "Contrasinal:"
 
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "Entrar"
 
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -2928,11 +2932,11 @@ msgstr ""
 "    realizar a confirmación por correo electrónico; lea\n"
 "    as instrucións na mensaxe de confirmación)."
 
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "Lembranza do contrasinal"
 
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
@@ -2940,27 +2944,27 @@ msgstr ""
 "Ao premer o botón <em>Lembrar</em>,\n"
 "    enviaráselle o contrasinal por correo electrónico."
 
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "Lembrar"
 
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr "<perdido>"
 
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "O tema solicitado non é válido: %(topicname)s"
 
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "Detalles do filtro de temas"
 
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "Nome:"
 
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr "Patrón (como unha expresión regular):"
 
@@ -6836,7 +6840,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -6875,7 +6879,7 @@ msgstr ""
 "            <p>Na caixa de texto de máis abaixo, engada un enderezo en cada "
 "liña, comece a liña\n"
 "            co carácter ^ para designar unha \n"
-"            <a href=\"http://docs.python.org/library/re.html\">\n"
+"            <a href=\"https://docs.python.org/2/library/re.html\">\n"
 "            expresión regular de Python</a>. Cando inclúa barras inclinadas "
 "de esquerda a dereita (\"\\\"),\n"
 "            fágao como se estivese a empregar cadeas de Python en bruto "
@@ -7626,7 +7630,7 @@ msgstr "Debe activarse ou desactivarse o filtrado de temas?"
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -7649,7 +7653,7 @@ msgid ""
 "             configuration variable."
 msgstr ""
 "O filtro segundo o tema, clasifica cada mensaxe recibida\n"
-"             segundo os <a href=\"http://docs.python.org/library/re.html\">\n"
+"             segundo os <a href=\"https://docs.python.org/2/library/re.html\">\n"
 "             filtros de expresións regulares</a> que especifique abaixo. Se "
 "as cabeceiras\n"
 "             <code>Subject:</code> (asunto) ou <code>Keywords</code> "
@@ -8281,7 +8285,7 @@ msgid "Once a month, your password will be emailed to you as a reminder."
 msgstr ""
 "Cada mes, enviaráselle o contrasinal por correo electrónico para o lembrar."
 
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 msgid "The current archive"
 msgstr "O arquivo actual"
 
@@ -8651,7 +8655,7 @@ msgstr "Fin de "
 msgid "Posting of your message titled \"%(subject)s\""
 msgstr "A mensaxe enviada tiña como asunto \"%(subject)s\""
 
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "[Non se deu ningunha razón]"
 
@@ -8663,28 +8667,28 @@ msgstr "Reenvío da mensaxe moderada"
 msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr "Nova solicitude de subscrición á rolda %(realname)s de %(addr)s"
 
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "Solicitude de subscrición"
 
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "Continuar a agardar a aprobación"
 
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr "Nova solicitude de baixa á rolda %(realname)s de %(addr)s"
 
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr "Solicitude de anulación de subscrición"
 
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr "Mensaxe orixinal"
 
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr "A solicitude á rolda de distribución %(realname)s foi rexeitada"
 
@@ -8795,58 +8799,58 @@ msgstr ""
 msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr ""
 
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr " de %(remote)s"
 
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr "as subscricións a %(realname)s precisan a aprobación do administrador"
 
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "Notificación de subscrición a %(realname)s"
 
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr "as baixas de %(realname)s precisan a aprobación do moderador"
 
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr "Notificación da baixa de %(realname)s"
 
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 #, fuzzy
 msgid "%(realname)s address change notification"
 msgstr "Notificación da baixa de %(realname)s"
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "A cadea de confirmación é incorrecta"
 
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "A cadea de confirmación é incorrecta"
 
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr ""
 "a subscrición a %(name)s require a aprobación por\n"
 "parte do administrador"
 
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "A cadea de confirmación é incorrecta"
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "Introduza a súa cadea de confirmación"
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr "última notificación da resposta automática de hoxe"
 
@@ -8939,15 +8943,15 @@ msgstr ""
 msgid "Original message suppressed by Mailman site configuration\n"
 msgstr ""
 
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr "Entregado por Mailman<br>versión %(version)s"
 
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr "Feito en Python"
 
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr "Gnu non é Unix"
 
@@ -10225,7 +10229,7 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
@@ -10265,7 +10269,7 @@ msgstr ""
 "A sintaxe da expresión regular é ao estilo Perl5, usando o módulo Python "
 "re.  As especificacións completas están en:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Na busca de enderezos non se distinguen as maiúsculas das minúsculas mais \n"
 "amósanse os enderezos tal e como se achan.\n"
diff --git a/messages/he/LC_MESSAGES/mailman.po b/messages/he/LC_MESSAGES/mailman.po
index 4f0b11c4..857e5511 100644
--- a/messages/he/LC_MESSAGES/mailman.po
+++ b/messages/he/LC_MESSAGES/mailman.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mailman v2.1.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: 2007-04-05 21:33+0300\n"
 "Last-Translator: Dov Zamir <linux@zamirfamily.com>\n"
 "Language-Team: Hebrew\n"
@@ -206,7 +206,7 @@ msgstr "על ידך"
 msgid "by the list administrator"
 msgstr "על ידי מנהל הרשימה"
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "מסיבות לא ידועות"
 
@@ -222,23 +222,23 @@ msgstr "מבוטל"
 msgid "Bounce action notification"
 msgstr "הודעת פעולת החזר"
 
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "מבוטל"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr " ההחזר האחרון שהתקבל ממך היה בתאריך %(date)s"
 
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
 msgid "(no subject)"
 msgstr "(ללא נושא)"
 
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr "[אין פרטי החזרים זמינים]"
 
@@ -252,7 +252,7 @@ msgstr "מנהל"
 
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -260,7 +260,7 @@ msgstr "אין רשימה בשם <em>%(safelistname)s</em>"
 
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -270,8 +270,8 @@ msgstr "שגיאה"
 
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -283,7 +283,7 @@ msgid "Authorization failed."
 msgstr "האימות נכשל."
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr ""
 
@@ -301,7 +301,7 @@ msgstr ""
 "                אחרת רשימת הדיוור לא תהיה שימושית כלל."
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "אזהרה: "
 
@@ -453,7 +453,7 @@ msgstr "טפל בבקשות מפקח ממתינות"
 msgid "Go to the general list information page"
 msgstr "עבור אל דף המידע הכללי של הרשימה"
 
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 msgid "Edit the public HTML pages and text files"
 msgstr "ערוך את עמודי ה-HTML הציבוריים ואת קבצי הטקסט"
 
@@ -546,7 +546,7 @@ msgstr "שם הנושא:"
 msgid "Regexp:"
 msgstr "ביטוי רגולרי:"
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "תאור:"
 
@@ -706,7 +706,7 @@ msgid "nodupes"
 msgstr "בלי כפולים"
 
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr "תקציר"
 
@@ -738,7 +738,7 @@ msgstr "ה"
 msgid "notmetoo"
 msgstr "ללא \"גםאני\""
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr "ללא דואר"
 
@@ -1056,152 +1056,152 @@ msgstr "אשר סיסמת פיקוח:"
 msgid "Submit Your Changes"
 msgstr "הגש את השינויים"
 
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr "סיסמאות הפיקוח אינן זהות"
 
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 #, fuzzy
 msgid "Poster passwords did not match"
 msgstr "הסיסמאות לא זהות."
 
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 msgid "Administrator passwords did not match"
 msgstr "סיסמאות הניהול אינן זהות"
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "הנו כבר מנוי"
 
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr "&lt;שורה ריקה&gt;"
 
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "כתובת דואר אלקטרוני לא חוקית/לא תקינה"
 
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr "כתובת אויינת (תווים לא חוקיים)"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr "כתובת חסומה (התאים ל-%(pattern)s)"
 
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "הוזמן בהצלחה:"
 
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "נרשם בהצלחה:"
 
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "שגיאה בהזמנה:"
 
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "שגיאה ברישום:"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "מנוי בוטל בהצלחה:"
 
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr "לא יכול לבטל מנוי למי שאינו מנוי:"
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 #, fuzzy
 msgid "You must provide both current and new addresses."
 msgstr "ראשית, עליך לתקן את הכתובת הלא חוקית הקודמת."
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 #, fuzzy
 msgid "%(schange_to)s is already a list member."
 msgstr " הנו כבר מנוי"
 
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 #, fuzzy
 msgid "%(schange_to)s is not a valid email address."
 msgstr "עליך לספק כתובת דוא\"ל בתוקף"
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 #, fuzzy
 msgid "%(schange_to)s is already a member"
 msgstr " הנו כבר מנוי"
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 #, fuzzy
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr "%(addr)s חסום (התאים ל-%(patt)s)"
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 #, fuzzy
 msgid "%(list_name)s address change notice."
 msgstr "הודעת עזיבה של %(realname)s"
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 #, fuzzy
 msgid "Notification sent to %(schange_from)s."
 msgstr "הודעות"
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 #, fuzzy
 msgid "Notification sent to %(schange_to)s."
 msgstr "הודעות"
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr "ערך דגל פיקוח לא תקין"
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 msgid "member mgt page"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "אינו מנוי"
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr "מתעלם משינויים למנוי שנמחק: %(user)s"
 
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "הוסר בהצלחה:"
 
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "שגיאה בביטול המנוי:"
 
@@ -1756,8 +1756,8 @@ msgstr ""
 "\n"
 "    <p>או לחץ <em>בטל ומחק</em>, כדי לבטל את בקשת הסרה זו."
 
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "הסר מנוי"
 
@@ -2348,47 +2348,51 @@ msgstr "שלח תזכורות סיסמא חודשיות?"
 msgid "List name is required."
 msgstr "שם רשימה חובה"
 
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr "%(realname)s -- עורך html עבור %(template_info)s"
 
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr "עורך HTML: שגיאה"
 
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr "%(safetemplatename)s: תבנית לא חוקית"
 
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr "%(realname)s -- עורך עמוד HTML"
 
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr "בחר עמוד לעריכה:"
 
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "ערוך או צפה במידע אודות הגדרות הרשימה"
 
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "כשתסיים לשנות..."
 
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "הגש שינוים"
 
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr "עמוד HTML לא יכול להיות ריק"
 
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr "HTML לא השתנה"
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2397,20 +2401,20 @@ msgid ""
 "             "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 #, fuzzy
 msgid "Page Unchanged."
 msgstr "HTML לא השתנה"
 
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr "HTML עודכן בהצלחה"
 
@@ -2472,7 +2476,7 @@ msgstr ""
 msgid "Edit Options"
 msgstr "אפשריות עריכה"
 
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "צפה בעמוד זה ב-"
@@ -2481,34 +2485,34 @@ msgstr "צפה בעמוד זה ב-"
 msgid "This form requires JavaScript."
 msgstr ""
 
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "שגיאת אצווה CGI"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "לא הוכנסה כתובת"
 
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "כתובת דוא\"ל לא חוקית: %(safeuser)s"
 
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr "אין כזה מנוי: %(safeuser)s."
 
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 #, fuzzy
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr "הודעת אישור נשלחה."
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 #, fuzzy
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
@@ -2517,22 +2521,22 @@ msgstr ""
 "בקשתך להסרה מרשימת המנוים הועברה אל\n"
 "                    מנהל הרשימה לאישור."
 
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 #, fuzzy
 msgid ""
 "If you are a list member,\n"
 "            your password has been emailed to you."
 msgstr "תזכורת עם סיסמתך נשלחה אליך."
 
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "אימות נכשל"
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr "תזכורת עם סיסמתך נשלחה אליך."
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
@@ -2540,16 +2544,16 @@ msgstr ""
 "למנהל הרשימה אין אפשרות לצפות\n"
 "            במנויים אחרים של משתמש זה."
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr "הערה:"
 
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr "מנויי רשימה של  %(safeuser)s על %(hostname)s"
 
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
@@ -2557,7 +2561,7 @@ msgstr ""
 "לחץ על הקישור כדי לבקר בעמוד האפשריות\n"
 "        של הרשימה המבוקשת."
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
@@ -2567,15 +2571,15 @@ msgstr ""
 "            הכתובות של המנויים האחרים של משתמש זה. אבל\n"
 "            המנוי ברשימת דיוור זו עודכן."
 
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "הכתובות לא זהות"
 
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr "אתה משתמש כבר בכתובת זו"
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 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 "
@@ -2587,31 +2591,31 @@ msgstr ""
 "%(listname)s, יתכן שביצעת עדכון גלובלי של הכתובת. עם האישור,\n"
 "כל רשימה אחרת המכילה את הכתובת %(safeuser)s תתעדכן."
 
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "הכתובת החדשה הנה כבר מנויה: %(newaddr)s"
 
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "הכתובת לא יכולה להיות ריקה"
 
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr "נשלחה הודעת אישוד אל %(newaddr)s. "
 
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "הוקלדה כתובת דוא\"ל לא תקינה"
 
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "הוקלדה כתובת דוא\"ל לא חוקית"
 
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s הנה כבר מנויה ברשימה."
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
 "                      think this restriction is erroneous, please contact\n"
@@ -2620,11 +2624,11 @@ msgstr ""
 "%(newaddr)s חסום מרשימה זו. אם לדעתך חסימה זו\n"
 "                      שגויה, נא ליצור קשר עם בעלי הרשימה ב-%(owneraddr)s."
 
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr "שם המנוי עודכן בהצלחה"
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 #, fuzzy
 msgid ""
 "The list administrator may not change the\n"
@@ -2633,15 +2637,15 @@ msgstr ""
 "למנהל הרשימה אין אפשרות לצפות\n"
 "            במנויים אחרים של משתמש זה."
 
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "הסיסמא לא יכולה להיות ריקה"
 
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "הסיסמאות לא זהות!"
 
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 msgid ""
 "The list administrator may not change the\n"
 "            password for this user's other subscriptions.  However, the\n"
@@ -2651,12 +2655,12 @@ msgstr ""
 "            של משתמש זה ברשימות אחרות. אבל\n"
 "            הסיסמא של רשימה זו עודכנה."
 
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "הסיסמאות עודכנו בהצלחה"
 
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
@@ -2666,16 +2670,16 @@ msgstr ""
 "                אתה צריך לאשר את בקשת ביטול המנוי על ידי\n"
 "                סימון בתיבת הסימון מתחת ללחצן <em>בטל מנוי</em>."
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 #, fuzzy
 msgid "via the member options page"
 msgstr "רשימת %(realname)s: עמוד כניסה להגדרות מנוים"
 
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "תצאות ביטול המנוי"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -2686,7 +2690,7 @@ msgstr ""
 "            מפקחי הרשימה לאישור.  תקבל הודעה לאחר\n"
 "            קבלת החלטה של מפקחי הרשימה."
 
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -2701,7 +2705,7 @@ msgstr ""
 "            לביטול המנוי שלך, נא ליצור קשר עם בעלי הרשימה\n"
 "            בכתובת %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -2712,7 +2716,7 @@ msgstr ""
 "                את ההגדרות של משתמש זה ברשימות אחרות.\n"
 "                אבל עודכנו ההגדרות שלו ברשימה זו."
 
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -2723,7 +2727,7 @@ msgstr ""
 "            תקצירים ברשימה זו, לכן אפשרות זו לא הופעלה.\n"
 "            אבל ההגדרות האחרות עודכנו בהצלחה."
 
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -2735,63 +2739,63 @@ msgstr ""
 "            אפשרות זו לא הופעלה. אבל ההגדרות\n"
 "            האחרות עודכנו בהצלחה."
 
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "ההגדרות שלך נקלטו בהצלחה"
 
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "יתכן שתקבל תקציר אחד אחרון"
 
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>כן, אני באמת רוצה לבטל את המנוי שלי</em>"
 
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "שנה את הסיסמא שלי"
 
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "הצג את המנוים האחרים שלי"
 
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "שלח את הסיסמא אלי בדוא\"ל"
 
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "סיסמא"
 
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "יציאה"
 
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "הגש את שינוים שלי"
 
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "ימים"
 
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "יום"
 
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr "%(units)s %(days)d"
 
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "שנה את כתובתי ואת שמי"
 
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "<em>לא הוגדרו נושאים</em>"
 
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
@@ -2801,19 +2805,19 @@ msgstr ""
 "הנך רשום לרשימה זו באמצעות הכתובת\n"
 "(עם שמירת אותיות גדולות/קטנות) em>%(cpuser)s</em>."
 
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "רשימת %(realname)s: עמוד כניסה להגדרות מנוים"
 
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "כתובת דוא\"ל ו-"
 
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr "רשימת %(realname)s: הגדרות מנוי עבור %(safeuser)s "
 
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -2840,19 +2844,19 @@ msgstr ""
 "    בדפדפן שלך, אחרת השינוים שלך לא יכנסו לתוקף.\n"
 "    "
 
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "כתובת דוא\"ל:"
 
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "סיסמא:"
 
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "כניסה למערכת"
 
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -2865,11 +2869,11 @@ msgstr ""
 "    עליו כדי להשלים את תהליך ביטול המנוי (אפשר גם לאשר\n"
 "    באמצעות דוא\"ל; ראה את ההוראות בהודעת האישור)."
 
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "תזכורת סיסמא"
 
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
@@ -2877,27 +2881,27 @@ msgstr ""
 "כשתלחץ על הלחצן <em>תזכורת</em>, הסיסמא שלך\n"
 "    תישלח אליך בדוא\"ל."
 
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "תזכורת"
 
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr "<חסר>"
 
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "הנושא המבוקש אינו חוקי: %(topicname)s"
 
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "פרטי מסנן נושא"
 
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "שם:"
 
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr "תבנית (כביטיו רגולרי):"
 
@@ -6671,7 +6675,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -7448,7 +7452,7 @@ msgstr "יש להפעיל את מסנן הנושאים או להפוך אותו
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -7471,7 +7475,7 @@ msgid ""
 "             configuration variable."
 msgstr ""
 "מסנן הנושאים מאפיין כל מסר דוא\"ל שנכנס בהתאם ל\n"
-"             <a href=\"http://docs.python.org/library/re.html\">\n"
+"             <a href=\"https://docs.python.org/2/library/re.html\">\n"
 "             מסנני ביטוים רגולריים</a> שאתה מגדיר למטה.  אם כותרת ה-"
 "<code>נושא:</code>\n"
 "             או <code>מלות-המפתח:</code> מכילה התאמה מול מסנן נושא, המסר "
@@ -8039,7 +8043,7 @@ msgstr "בקר ברשימת המנוים"
 msgid "Once a month, your password will be emailed to you as a reminder."
 msgstr "פעם בחודש, הסיסמא תישלח אליך בדוא\"ל כתזכורת."
 
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 msgid "The current archive"
 msgstr "הארכיון הנוכחי"
 
@@ -8403,7 +8407,7 @@ msgstr "סוף ה"
 msgid "Posting of your message titled \"%(subject)s\""
 msgstr "משלוח המסר שלך בשם \"%(subject)s\""
 
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "[ללא נימוק]"
 
@@ -8415,28 +8419,28 @@ msgstr "העברה של מסר מפוקח"
 msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr "בקשת הרשמה חדשה לרשימה %(realname)s מאת %(addr)s"
 
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "בקשת מנוי"
 
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "להמשיך להמתין לאישור"
 
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr "בקשת מנוי מאת %(realname)s לפי %(addr)s"
 
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr "בקשת ביטול מנוי"
 
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr "ההודעה המקורית"
 
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr "הבקשה אל רשימת הדיוור %(realname)s נדחתה"
 
@@ -8546,56 +8550,56 @@ msgstr "דרוש אישורך כדי להצטרף לרשימת דיוור %(list
 msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr "אישורך דרוש כדי לעזוב את רשימת דיוור %(listname)s"
 
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr "מ- %(remote)s"
 
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr "מנויים ל-%(realname)s מחייבים אישור מפקח"
 
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "הודעת מנוי של %(realname)s"
 
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr "ביטולי מנויים מחייבים אישור מפקח"
 
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr "הודעת עזיבה של %(realname)s"
 
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 #, fuzzy
 msgid "%(realname)s address change notification"
 msgstr "הודעת עזיבה של %(realname)s"
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "מחרוזת אישור שגויה"
 
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "מחרוזת אישור שגויה"
 
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr "מנויים ל-%(name)s מחייבים אישור מנהל"
 
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "מחרוזת אישור שגויה"
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "הקלד עוגיית אישור"
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr "מענה-אוטומטי אחרון להיום"
 
@@ -8687,15 +8691,15 @@ msgstr ""
 msgid "Original message suppressed by Mailman site configuration\n"
 msgstr ""
 
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr "נשלח על ידי דוור<br>גירסא %(version)s"
 
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr "מונע על ידי Python"
 
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr "Gnu אינו Unix"
 
@@ -10033,7 +10037,7 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
@@ -10073,7 +10077,7 @@ msgstr ""
 "התחביר של הביטיים הרגולריים דומה לתחביר של Perl5, באמצעות מודול ה-re של "
 "Python.\n"
 "ניתן למצאו הגדרה מלאה ב-:\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "התאמה של כתובות אינה רגישה לראשיות התווים, אך הכתובות מוצגות עם שמירה על "
 "ראשיות.\n"
diff --git a/messages/hr/LC_MESSAGES/mailman.po b/messages/hr/LC_MESSAGES/mailman.po
index 1034256d..788210fc 100644
--- a/messages/hr/LC_MESSAGES/mailman.po
+++ b/messages/hr/LC_MESSAGES/mailman.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.2\n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: 2004-06-15 12:00+1\n"
 "Last-Translator: Nino Katic <nkatic@jagor.srce.hr>\n"
 "Language-Team: Croatian <nkatic@jagor.srce.hr>\n"
@@ -205,7 +205,7 @@ msgstr "od mene"
 msgid "by the list administrator"
 msgstr "od strane administratora liste"
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "zbog nepoznatih razloga"
 
@@ -221,23 +221,23 @@ msgstr "onemogucen"
 msgid "Bounce action notification"
 msgstr "Obavijest o akciji odbijanja"
 
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "onemogucen"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr " Datum va�eg posljednjeg odbijanja %(date)s"
 
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
 msgid "(no subject)"
 msgstr "(nema naslova)"
 
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr "[Detalji o odbijanju nisu dostupni]"
 
@@ -251,7 +251,7 @@ msgstr "Administrator"
 
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -259,7 +259,7 @@ msgstr "Takva lista ne postoji <em>%(safelistname)s</em>"
 
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -269,8 +269,8 @@ msgstr "Gre
 
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -282,7 +282,7 @@ msgid "Authorization failed."
 msgstr "Autorizacija nije uspjela."
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr ""
 
@@ -300,7 +300,7 @@ msgstr ""
 "                za vasu mailing listu, inace ce ona biti neupotrebljiva."
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "Upozorenje: "
 
@@ -458,7 +458,7 @@ msgstr "Nastojim obraditi zahtjeve moderatora na 
 msgid "Go to the general list information page"
 msgstr "Idi na op�enitu informacijsku stranicu liste"
 
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 #, fuzzy
 msgid "Edit the public HTML pages and text files"
 msgstr "Uredi javne HTML stranice"
@@ -552,7 +552,7 @@ msgstr "Naziv naslova"
 msgid "Regexp:"
 msgstr "Regexp:"
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "Opis"
 
@@ -713,7 +713,7 @@ msgid "nodupes"
 msgstr "nodupes"
 
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr "digest"
 
@@ -745,7 +745,7 @@ msgstr "B"
 msgid "notmetoo"
 msgstr "ne metoo"
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr "nema maila"
 
@@ -1077,150 +1077,150 @@ msgstr "Potvrdite moderatorsku lozinku:"
 msgid "Submit Your Changes"
 msgstr "Po�aljite promjene"
 
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr "Moderatorske lozinke se ne podudaraju"
 
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 #, fuzzy
 msgid "Poster passwords did not match"
 msgstr "Va�e lozinke se ne podudaraju."
 
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 msgid "Administrator passwords did not match"
 msgstr "Administratorske lozinke se ne podudaraju"
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "Ve� je �lan"
 
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr "&lt;blank line&gt;"
 
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "Kriva/Neispravna e-mail adresa"
 
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr "Hostile adresa (nedozvoljeni znakovi)"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "Uspje�no pozvani:"
 
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "Uspje�no pretpla�eni:"
 
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "Gre�ka kod pozivanja:"
 
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "Gre�ka kod pretpla�ivanja:"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "Uspje�no Odjavljeni:"
 
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr "Ne mogu odjaviti one koji nisu �lanovi:"
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 msgid "You must provide both current and new addresses."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 #, fuzzy
 msgid "%(schange_to)s is already a list member."
 msgstr " je ve� �lan"
 
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 #, fuzzy
 msgid "%(schange_to)s is not a valid email address."
 msgstr "Morate unijeti ispravnu e-mail adresu."
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 #, fuzzy
 msgid "%(schange_to)s is already a member"
 msgstr " je ve� �lan"
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 #, fuzzy
 msgid "%(list_name)s address change notice."
 msgstr "%(realname)s obavijest o odjavi"
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 #, fuzzy
 msgid "Notification sent to %(schange_from)s."
 msgstr "Obavijesti"
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 #, fuzzy
 msgid "Notification sent to %(schange_to)s."
 msgstr "Obavijesti"
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr "Kriva vrijednost moderacijske zastavice"
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 msgid "member mgt page"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "Nije pretpla�en"
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr "Ignoriram promjene obrisanog �lana: %(user)s"
 
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "Uspje�no Maknut:"
 
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "Gre�ka kod Odjavljivanja:"
 
@@ -1812,8 +1812,8 @@ msgstr ""
 "    <p>Ili stisnite <em>Zanemari i odbaci</em> da biste zanemarili ovaj\n"
 "    zahtjev za pretplatom."
 
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "Odjava"
 
@@ -2421,47 +2421,51 @@ msgstr "
 msgid "List name is required."
 msgstr "Potreban je naziv liste."
 
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr "%(realname)s -- Uredi html za %(template_info)s"
 
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr "Uredi HTML : Gre�ka"
 
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr "%(safetemplatename)s: Pogre�an predlo�ak"
 
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr "%(realname)s -- Ure�ivanje HTML Stranice"
 
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr "Izaberite stranicu koju �ete ure�ivati:"
 
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "Pogledajte ili uredite konfiguracijske informacije liste."
 
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "Kada ste gotovi sa promjenama..."
 
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "Po�alji Promjene"
 
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr "Ne mogu imati praznu html stranicu."
 
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr "HTML Nepromjenjen."
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2470,20 +2474,20 @@ msgid ""
 "             "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 #, fuzzy
 msgid "Page Unchanged."
 msgstr "HTML Nepromjenjen."
 
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr "HTML je uspje�no osvje�en."
 
@@ -2548,7 +2552,7 @@ msgstr ""
 msgid "Edit Options"
 msgstr "Uredi Opcije"
 
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "Pogledaj ovu stranicu koriste�i"
@@ -2557,34 +2561,34 @@ msgstr "Pogledaj ovu stranicu koriste
 msgid "This form requires JavaScript."
 msgstr ""
 
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "Gre�ka u CGI skripti"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "Adresa nije dana"
 
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "Pogre�na Email Adresa: %(safeuser)s"
 
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr "Nema takvog �lana: %(safeuser)s."
 
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 #, fuzzy
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr "Potvrdni e-mail je poslan."
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 #, fuzzy
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
@@ -2593,37 +2597,37 @@ msgstr ""
 "Va� zahtjev za odjavom je proslje�en administratoru liste na\n"
 "odobrenje."
 
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 #, fuzzy
 msgid ""
 "If you are a list member,\n"
 "            your password has been emailed to you."
 msgstr "Podsjetnik va�e lozinke poslan vam je mailom."
 
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "Autentikacija nije uspjela."
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr "Podsjetnik va�e lozinke poslan vam je mailom."
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
 msgstr ""
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr ""
 
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr "Pretplata na listu za %(safeuser)s na %(hostname)s"
 
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
@@ -2631,22 +2635,22 @@ msgstr ""
 "Kliknite na link da biste posjetili svoju stranicu sa opcijama za\n"
 "        tra�enu mailing listu."
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
 "            subscription for this mailing list has been changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "Adrese se ne podudaraju!"
 
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr "Ve� koristite tu e-mail adresu"
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 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 "
@@ -2660,31 +2664,31 @@ msgstr ""
 "Nakon potvrde, bilo koja druga lista koja sadr�i adresu\n"
 "%(safeuser)s bit �e promjenjena. "
 
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "Nova adresa je ve� �lan: %(newaddr)s"
 
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "Adrese ne smiju biti prazne"
 
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr "Potvrdna purka je poslana na %(newaddr)s. "
 
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "Dana je kriva e-mail adresa"
 
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "Dana je pogre�na e-mail adresa"
 
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s je ve� �lan liste."
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 #, fuzzy
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
@@ -2695,11 +2699,11 @@ msgstr ""
 "Ako mislite da je ova restrikcija preo�tra, obratite se vlasniku\n"
 "liste na %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr "�lansko ime je uspje�no promjenjeno. "
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 #, fuzzy
 msgid ""
 "The list administrator may not change the\n"
@@ -2709,15 +2713,15 @@ msgstr ""
 "            tako da va�a opcija dostave nije postavljena.  Ipak,\n"
 "            druge opcije su uspje�no postavljene."
 
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "Lozinke ne smiju biti prazne"
 
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "Lozinke se ne podudaraju!"
 
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 #, fuzzy
 msgid ""
 "The list administrator may not change the\n"
@@ -2728,12 +2732,12 @@ msgstr ""
 "            tako da va�a opcija dostave nije postavljena.  Ipak,\n"
 "            druge opcije su uspje�no postavljene."
 
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "Lozinka je uspje�no promjenjena."
 
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
@@ -2742,16 +2746,16 @@ msgstr ""
 "Va� zahtjev za odjavom morate potvrditi uklju�ivanjem polja ispod\n"
 "                <em>Odjava</em> gumba.  Niste odjavljeni!"
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 #, fuzzy
 msgid "via the member options page"
 msgstr "%(realname)s lista: �lanska ulazna stranica sa opcijama"
 
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "Rezultati odjave"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -2762,7 +2766,7 @@ msgstr ""
 "            liste na odobrenje.  Kada moderator liste napravi odluku primit\n"
 "            �ete obavijest."
 
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -2778,7 +2782,7 @@ msgstr ""
 "odjave,\n"
 "            kontaktirajte vlasnike liste na %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -2786,7 +2790,7 @@ msgid ""
 "                changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -2797,7 +2801,7 @@ msgstr ""
 "            opcija dostave nije postavljena.  Ipak, ostale opcije\n"
 "            su uspje�no postavljene."
 
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -2808,63 +2812,63 @@ msgstr ""
 "            tako da va�a opcija dostave nije postavljena.  Ipak,\n"
 "            druge opcije su uspje�no postavljene."
 
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "Uspje�no ste postavili svoje opcije."
 
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "Mo�ete eventualno dobiti jo� jedan digest mail."
 
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>Da, ja se stvarno �elim odjaviti</em>"
 
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "Promjeni Moju Lozinku"
 
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "Prika�i listu mojih drugih pretplata"
 
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "Po�alji mi Moju Lozinku Mailom"
 
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "lozinka"
 
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "Odjava"
 
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "Po�alji Moje Promjene"
 
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "dani"
 
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "dan"
 
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr "%(days)d %(units)s"
 
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "Promjeni Moju Adresu i Ime"
 
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "<em>Nijedna tema nije napisana</em>"
 
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
@@ -2875,19 +2879,19 @@ msgstr ""
 "mala slova)\n"
 "<em>%(cpuser)s</em>."
 
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "%(realname)s lista: �lanska ulazna stranica sa opcijama"
 
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "e-mail adresa i "
 
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr "%(realname)s lista: �lanske opcije za korisnika %(safeuser)s"
 
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -2919,19 +2923,19 @@ msgstr ""
 "    koje ste napravili ne�e imati u�inka.\n"
 "    "
 
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "Email adresa:"
 
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "Prijavi se"
 
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -2945,11 +2949,11 @@ msgstr ""
 "tako�er mo�ete\n"
 "    potvrditi i mailom; pogledajte upute u poruci sa potvrdom"
 
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "Podsjetnik lozinke"
 
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
@@ -2957,27 +2961,27 @@ msgstr ""
 "Klikom na <em>Podsjeti</em> gumb bit �e\n"
 "    vam mailana va�a lozinka."
 
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "Podsjeti"
 
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr "<missing>"
 
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "Tra�eni naslov (tema) nije ispravan: %(topicname)s"
 
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "Detalji o filteru teme"
 
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "Naziv:"
 
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr "Uzorak (kao regexp):"
 
@@ -7014,7 +7018,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -7056,7 +7060,7 @@ msgstr ""
 "            <p>U donjim tekst poljima, dodajte jednu adresu po liniji; "
 "zapo�nite liniju\n"
 "            sa ^ znakom da biste konstruirali <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  Kada koristite kosu crtu, "
 "unesite je kao da\n"
 "            unosite obi�an Python tekst (npr. samo jednu kosu crtu)\n"
@@ -7831,7 +7835,7 @@ msgstr "Treba li filter naslova biti omogu
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -7855,7 +7859,7 @@ msgid ""
 msgstr ""
 "Filter naslova kategorizira svaku dolaznu e-mail poruku\n"
 "             sukladno <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filterima</a> koje navodite dolje.  Ako\n"
 "             <code>Subject:</code> ili <code>Keywords:</code> zaglavlja "
 "poruke\n"
@@ -8471,7 +8475,7 @@ msgstr "Posjetite Listu Pretplatnika"
 msgid "Once a month, your password will be emailed to you as a reminder."
 msgstr "Jednom mjese�no, va�a �e vam lozinka biti mailana kao podsjetnik."
 
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 msgid "The current archive"
 msgstr "Trenutna arhiva"
 
@@ -8840,7 +8844,7 @@ msgstr "Kraj "
 msgid "Posting of your message titled \"%(subject)s\""
 msgstr "Slanje poruke naslovljene \"%(subject)s\""
 
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "[Razlog nije dat]"
 
@@ -8852,28 +8856,28 @@ msgstr "Proslje
 msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr "Novi zahtjev za pretplatom na listu %(realname)s sa %(addr)s"
 
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "Zahtjev za pretplatom"
 
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "Nastavi o�ekivano odobrenje"
 
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr "Novi zahtjev za odjavom od %(realname)s sa %(addr)s"
 
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr "Zahtjev za odjavom"
 
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr "Izvorna Poruka"
 
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr "Zahtjev na mailing listi %(realname)s je odbijen"
 
@@ -8992,56 +8996,56 @@ msgstr "Vi niste 
 msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr "Vi niste �lan %(listname)s mailing liste"
 
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr " od %(remote)s"
 
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr "prtplate na %(realname)s zahtjevaju odobrenje moderatora"
 
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "%(realname)s obavijest o pretplati"
 
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr "odjava treba odobrenje moderatora"
 
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr "%(realname)s obavijest o odjavi"
 
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 #, fuzzy
 msgid "%(realname)s address change notification"
 msgstr "%(realname)s obavijest o odjavi"
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "Krivi potvrdni tekst"
 
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "Krivi potvrdni tekst"
 
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr "pretplata na %(name)s treba odobrenje administratora"
 
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "Krivi potvrdni tekst"
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "Unesite potvrdni kola�i� (cookie)"
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr "Posljednja obavijest o automatskom odgovoru za danas"
 
@@ -9135,15 +9139,15 @@ msgstr ""
 msgid "Original message suppressed by Mailman site configuration\n"
 msgstr ""
 
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr "Dostavljeno od strane Mailmana<br>verzija %(version)s"
 
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr "Python Powered"
 
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr "Gnu's Not Unix"
 
@@ -10125,7 +10129,7 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
diff --git a/messages/hu/LC_MESSAGES/mailman.po b/messages/hu/LC_MESSAGES/mailman.po
index 321e1eef..3aa13c18 100644
--- a/messages/hu/LC_MESSAGES/mailman.po
+++ b/messages/hu/LC_MESSAGES/mailman.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mailman\n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: 2004-03-23 14:55--100\n"
 "Last-Translator: Szil�rd Vizi <vizisz@freemail.hu>\n"
 "Language-Team: Hungarian <LL@li.org>\n"
@@ -204,7 +204,7 @@ msgstr "
 msgid "by the list administrator"
 msgstr "a lista adminisztr�tor �ltal"
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "ismeretlen indok miatt"
 
@@ -220,23 +220,23 @@ msgstr "kikapcsolva"
 msgid "Bounce action notification"
 msgstr "�rtes�t�s a visszapattan�si beavatkoz�sr�l"
 
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "kikapcsolva"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr " Az utols� visszapattan�sod ideje: %(date)s"
 
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
 msgid "(no subject)"
 msgstr "(nincs t�rgy)"
 
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr "[Nem tal�lhat� visszapattan�si megjegyz�s]"
 
@@ -250,7 +250,7 @@ msgstr "Adminisztr
 
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -258,7 +258,7 @@ msgstr "Nincs <em>%(safelistname)s</em> nev
 
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -268,8 +268,8 @@ msgstr "Hiba"
 
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -281,7 +281,7 @@ msgid "Authorization failed."
 msgstr "Sikertelen azonos�t�s"
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr ""
 
@@ -299,7 +299,7 @@ msgstr ""
 "\t    kell."
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "Figyelmeztet�s: "
 
@@ -455,7 +455,7 @@ msgstr "Szerkeszt
 msgid "Go to the general list information page"
 msgstr "A lista �ltal�nos inform�ci�s lapj�nak megtekint�se"
 
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 #, fuzzy
 msgid "Edit the public HTML pages and text files"
 msgstr "A lista nyilv�nos HTML oldalainak szerkeszt�se"
@@ -549,7 +549,7 @@ msgstr "T
 msgid "Regexp:"
 msgstr "Keres�si felt�tel:"
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "Le�r�s"
 
@@ -710,7 +710,7 @@ msgid "nodupes"
 msgstr "t�bbsz�r ne"
 
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr "digest"
 
@@ -742,7 +742,7 @@ msgstr "B"
 msgid "notmetoo"
 msgstr "saj�t nem"
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr "nincs lev�l"
 
@@ -1063,151 +1063,151 @@ msgstr "Szerkeszt
 msgid "Submit Your Changes"
 msgstr "V�ltoztat�sok ment�se"
 
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr "A szerkeszt�i jelszavak nem egyeznek."
 
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 #, fuzzy
 msgid "Poster passwords did not match"
 msgstr "A megadott jelszavak nem egyeznek."
 
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 msgid "Administrator passwords did not match"
 msgstr "Az adminisztr�tori jelszavak nem egyeznek."
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "M�r tag"
 
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr "&lt;�res sor&gt;"
 
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "Hib�s/�rv�nytelen e-mail c�m"
 
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr "Tiltott c�m (illeg�lis karakterek)"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "Sikeres megh�v�s:"
 
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "Sikeresen fel�rva:"
 
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "Hiba a megh�v�skor:"
 
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "Hiba a feliratkoz�skor:"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "Sikeresen t�r�lve:"
 
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr "Nem lehet t�r�lni azokat, akik nem listatagok:"
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 #, fuzzy
 msgid "You must provide both current and new addresses."
 msgstr "El�sz�r az �rv�nytelen c�meket kell kijav�tanod."
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 #, fuzzy
 msgid "%(schange_to)s is already a list member."
 msgstr " m�r tag"
 
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 #, fuzzy
 msgid "%(schange_to)s is not a valid email address."
 msgstr "�rv�nyes e-mail c�met kell megadnod."
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 #, fuzzy
 msgid "%(schange_to)s is already a member"
 msgstr " m�r tag"
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 #, fuzzy
 msgid "%(list_name)s address change notice."
 msgstr "�rtes�t�s leiratkoz�sr�l a(z) %(realname)s list�n"
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 #, fuzzy
 msgid "Notification sent to %(schange_from)s."
 msgstr "�rtes�t�sek"
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 #, fuzzy
 msgid "Notification sent to %(schange_to)s."
 msgstr "�rtes�t�sek"
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr "Hib�san megadott moder�l�si be�ll�t�s"
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 msgid "member mgt page"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "Nincs feliratkozva"
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr "M�dos�t�sok kihagy�sa a t�r�lt tagon: %(user)s"
 
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "Sikeresen t�r�lve:"
 
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "Hiba a t�rl�sn�l:"
 
@@ -1776,8 +1776,8 @@ msgstr ""
 "    <p>Ha nem akarod a leiratkoz�st meger�s�teni, akkor v�laszd  a\n"
 "    <em>M�gsem �s elvet</em> gombot."
 
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "Leiratkoz�s"
 
@@ -2376,47 +2376,51 @@ msgstr "Havonta elk
 msgid "List name is required."
 msgstr "Meg kell adni a lista nev�t."
 
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr "%(realname)s -- %(template_info)s html szerkeszt�se"
 
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr "HTML szerkeszt�se: Hiba"
 
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr "%(safetemplatename)s: �rv�nytelen sablon"
 
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr "%(realname)s -- HTML oldal szerkeszt�se"
 
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr "V�laszd ki a szerkesztend� lapot:"
 
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "A lista be�ll�t�sok kimenet�nek megtekint�se vagy szerkeszt�se."
 
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "V�ltoztat�sok befejez�se ut�n kattints ide..."
 
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "V�ltoztat�sok ment�se"
 
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr "Nem lehet �res html oldalt megadni."
 
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr "Nincs v�ltoztat�s."
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2425,20 +2429,20 @@ msgid ""
 "             "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 #, fuzzy
 msgid "Page Unchanged."
 msgstr "Nincs v�ltoztat�s."
 
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr "HTML sikeresen friss�tve."
 
@@ -2500,7 +2504,7 @@ msgstr ""
 msgid "Edit Options"
 msgstr "Be�ll�t�sok szerkeszt�se"
 
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "Az oldal nyelve/View this page in"
@@ -2509,34 +2513,34 @@ msgstr "Az oldal nyelve/View this page in"
 msgid "This form requires JavaScript."
 msgstr ""
 
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "CGI szkript hiba"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "Nincs c�m megadva"
 
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "�rv�nytelen e-mail c�m: %(safeuser)s"
 
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr "Nem tal�lhat� %(safeuser)s c�mmel tag."
 
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 #, fuzzy
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr "A meger�s�t�sre felsz�l�t� lev�l el lett k�ldve."
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 #, fuzzy
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
@@ -2545,37 +2549,37 @@ msgstr ""
 "Leiratkoz�si k�relmed a lista adminisztr�tor�hoz lett tov�bb�tva,\n"
 "meger�s�t�shez."
 
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 #, fuzzy
 msgid ""
 "If you are a list member,\n"
 "            your password has been emailed to you."
 msgstr "Az eml�keztet� a jelszavadr�l e-mailben el lett k�ldve."
 
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "Sikertelen azonos�t�s"
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr "Az eml�keztet� a jelszavadr�l e-mailben el lett k�ldve."
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
 msgstr ""
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr ""
 
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr "%(safeuser)s felhaszn�l� listatags�gai a(z) %(hostname)s g�pen"
 
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
@@ -2583,22 +2587,22 @@ msgstr ""
 "A levelez�list�n l�v� be�ll�t�said megtekint�s�hez kattints\n"
 "\tide:"
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
 "            subscription for this mailing list has been changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "A c�mek nem egyeznek!"
 
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr "Jelenleg is ezt az e-mail c�met haszn�lod."
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 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 "
@@ -2612,31 +2616,31 @@ msgstr ""
 "c�med ez�rt azokon a list�kon, ahol %(safeuser)s c�mmel vagy ny�lv�ntartva\n"
 "a v�ltoztat�s a meger�s�t�si ut�n sikeresen megt�rt�nik majd."
 
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "A megadott c�mmel m�r van tag a list�n: %(newaddr)s"
 
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "Legal�bb egy c�met meg kell adnod."
 
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr "A meger�s�t�si �rtes�t�s a(z) %(newaddr)s c�mre el lett k�ldve."
 
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "A megadott e-mail c�m hib�s."
 
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "A megadott e-mail c�m �rv�nytelen."
 
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s m�r tagja a list�nak."
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 #, fuzzy
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
@@ -2647,11 +2651,11 @@ msgstr ""
 "Ha �gy gondolod, hogy ez a korl�toz�s jogtalan, akkor k�rlek\n"
 "�rj a lista tulajdonos�nak a k�vetkez� c�mre: %(owneraddr)s"
 
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr "A listatag neve sikeresen megv�ltoztatva."
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 #, fuzzy
 msgid ""
 "The list administrator may not change the\n"
@@ -2661,15 +2665,15 @@ msgstr ""
 "            , ez�rt ezt a k�ld�si m�dot nem lehet megadni. Azonban a t�bbi\n"
 "            v�ltoztat�s sikeresen el lett mentve."
 
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "K�telez� megadni jelsz�t"
 
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "A jelszavak nem egyeznek!"
 
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 #, fuzzy
 msgid ""
 "The list administrator may not change the\n"
@@ -2680,12 +2684,12 @@ msgstr ""
 "            , ez�rt ezt a k�ld�si m�dot nem lehet megadni. Azonban a t�bbi\n"
 "            v�ltoztat�s sikeresen el lett mentve."
 
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "Jelsz� megv�ltoztatva."
 
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
@@ -2694,16 +2698,16 @@ msgstr ""
 "Meg kell er�s�tened a leiratkoz�si sz�nd�kodat a <em>Leiratkoz�s</em>\n"
 " gomb alatti kapcsol� kipip�l�s�val. Nem lett�l t�r�lve a list�r�l!"
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 #, fuzzy
 msgid "via the member options page"
 msgstr "%(realname)s lista: listatags�gi oldal"
 
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "T�r�lve"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -2713,7 +2717,7 @@ msgstr ""
 "Leiratkoz�si k�relmedet megkaptuk �s tov�bb�tottuk a lista szerkeszt�j�hez\n"
 "j�v�hagy�sra. A szerkeszt� d�nt�s�r�l e-mailben kapsz �rtes�t�st."
 
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -2728,7 +2732,7 @@ msgstr ""
 "\tnyugodtan a fordulj a lista tulajdonos�hoz ezen a c�men:\n"
 "\t%(owneraddr)s"
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -2736,7 +2740,7 @@ msgid ""
 "                changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -2747,7 +2751,7 @@ msgstr ""
 "            , ez�rt ezt a k�ld�si m�dot nem lehet megadni. Azonban a t�bbi\n"
 "            v�ltoztat�s sikeresen el lett mentve."
 
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -2758,63 +2762,63 @@ msgstr ""
 "            , ez�rt ezt a k�ld�si m�dot nem lehet megadni. Azonban a t�bbi\n"
 "            v�ltoztat�s sikeresen el lett mentve."
 
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "A k�v�nt v�ltoztat�sok sikeresen el lettek mentve."
 
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "Egy utols� digestet m�g kapni fogsz."
 
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>Igen, t�nyleg le akarok iratkozni</em>"
 
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "Jelszavam megv�ltoztat�sa"
 
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "Mutasd a t�bbi feliratkoz�somat"
 
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "K�ldd el e-mailben a jelszavamat"
 
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "jelsz�"
 
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "Kil�p�s"
 
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "V�ltoztat�saim ment�se"
 
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "nap"
 
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "nap"
 
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr "%(days)d %(units)s"
 
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "Feliratkoz�si c�mem �s nevem megv�ltoztat�sa"
 
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "<em>Nincsen t�masz�r�s</em>"
 
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
@@ -2823,19 +2827,19 @@ msgstr ""
 "\n"
 "Feliratkoz�sod bet�helyesen a k�vetkez� <em>%(cpuser)s</em>."
 
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "%(realname)s lista: listatags�gi oldal"
 
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "e-mail c�med �s "
 
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr "%(realname)s lista: %(safeuser)s tag be�ll�t�sai"
 
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -2868,19 +2872,19 @@ msgstr ""
 "  "
 
 # In this entry insert a space at the end of string, it will be stripped.
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "E-mail c�m: "
 
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "Jelsz�: "
 
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "Bejelentkez�s"
 
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -2894,11 +2898,11 @@ msgstr ""
 "        (vagy a megfelel� e-mailt elk�ldeni; err�l a lev�lben lehet \n"
 "        r�szletesen olvasni)."
 
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "Jelsz� eml�keztet�"
 
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
@@ -2906,27 +2910,27 @@ msgstr ""
 "Az <em>Eml�keztet�</em> gombra kattintva e-mailben elk�ld�sre ker�l\n"
 "        a jelszavad."
 
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "Eml�keztet�"
 
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr "<hi�nyzik>"
 
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "A k�rt t�masz�r�s nem megfelel�: %(topicname)s"
 
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "B�vebben a t�m�k sz�r�s�r�l"
 
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "Neve:"
 
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr "Sz�r�si felt�tel (kifejez�sk�nt megadva)"
 
@@ -6803,7 +6807,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -6840,7 +6844,7 @@ msgstr ""
 "k�ls�\n"
 "bek�ld�si szab�lyok</a> lesznek �rv�nyesek.\n"
 "<p>A sz�vegdobozban soronk�nt egy c�met adjunk meg; a <a href=\n"
-"     \"http://docs.python.org/library/re.html\"\n"
+"     \"https://docs.python.org/2/library/re.html\"\n"
 ">Python regul�ris kifejez�sek</a> jel�l�s�re a sorokat ^ jellel kezdj�k. "
 "Backslasht (\"\\\") mint egy hagyom�nyos\n"
 "karaktert adhatunk meg, �gy ahogy a Pythonban karaktern�l szok�sos (ez "
@@ -7598,7 +7602,7 @@ msgstr "A t
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -7622,7 +7626,7 @@ msgid ""
 msgstr ""
 "A t�masz�r� minden egyes bej�v� levelet megvizsg�l a k�s�bbiekben  megadott "
 "<a\n"
-"href=\"http://docs.python.org/library/re.html\">regul�ris\n"
+"href=\"https://docs.python.org/2/library/re.html\">regul�ris\n"
 "sz�r� kifejez�sek</a> alapj�n. Ha a lev�l <code>Subject:</code> vagy\n"
 "\t<code>Keywords:</code> fejl�ce egyez�st mutat valamelyik sz�r�si\n"
 "\tfelt�tellel, akkor az �zenet egy �n. t�ma <em>t�rol�ba</em> ker�l.\n"
@@ -8188,7 +8192,7 @@ msgstr "Mutasd a tagok list
 msgid "Once a month, your password will be emailed to you as a reminder."
 msgstr "Havonta egyszer a jelszavad eml�keztet��l e-mailben elk�ld�sre ker�l."
 
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 msgid "The current archive"
 msgstr "Az aktu�lis arch�vum"
 
@@ -8559,7 +8563,7 @@ msgstr "V
 msgid "Posting of your message titled \"%(subject)s\""
 msgstr "A leveled t�rgya: \"%(subject)s\""
 
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "[Nincs indok megadva]"
 
@@ -8571,28 +8575,28 @@ msgstr "Tov
 msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr "%(realname)s list�ra %(addr)s feliratkoz�si k�relme"
 
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "Feliratkoz�si k�relem"
 
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "J�v�hagy�sra v�rakoz�s"
 
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr "%(addr)s leiratkoz�si k�relme %(realname)s list�r�l"
 
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr "Leiratkoz�si k�relem"
 
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr "Eredeti �zenet"
 
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr ""
 "A(z) %(realname)s levelez�list�ra val� feliratkoz�sod vissza lett utas�tva"
@@ -8705,58 +8709,58 @@ msgstr "Nem vagy tagja a(z) %(listname)s levelez
 msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr "Nem vagy tagja a(z) %(listname)s levelez�list�nak."
 
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr " %(remote)s"
 
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr ""
 "feliratkoz�shoz a(z) %(realname)s list�ra szerkeszt�i j�v�hagy�s sz�ks�ges"
 
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "�rtes�t�s feliratkoz�sr�l a(z) %(realname)s list�n"
 
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr "leiratkoz�shoz szerkeszt�i j�v�hagy�s sz�ks�ges"
 
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr "�rtes�t�s leiratkoz�sr�l a(z) %(realname)s list�n"
 
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 #, fuzzy
 msgid "%(realname)s address change notification"
 msgstr "�rtes�t�s leiratkoz�sr�l a(z) %(realname)s list�n"
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "Hib�s meger�s�t�si azonos�t�"
 
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "Hib�s meger�s�t�si azonos�t�"
 
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr ""
 "feliratkoz�shoz a(z) %(name)s list�ra adminisztr�tori j�v�hagy�s sz�ks�ges"
 
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "Hib�s meger�s�t�si azonos�t�"
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "Hib�s meger�s�t�si azonos�t�"
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr "A mai napra az utols� automatikus v�lasz"
 
@@ -8848,15 +8852,15 @@ msgstr ""
 msgid "Original message suppressed by Mailman site configuration\n"
 msgstr ""
 
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr "Mailman listakezel� <br> %(version)s verzi�"
 
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr "Python alap�"
 
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr "Gnu Nem Unix"
 
@@ -10214,7 +10218,7 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
@@ -10252,7 +10256,7 @@ msgstr ""
 "\n"
 "A hagyom�nyos kifejez�sinek Perl5-t�pus�nak kell lennie, a keres�st a\n"
 "Python re modulja v�gzi. R�szletes le�r�sa a k�vetkez� c�men tal�lhat�:\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Keres�sn�l a kis- �s nagybet�k nem sz�m�tanak, de a tal�lt c�mek a\n"
 "feliratkoz�skor megadott form�ban jelennek meg.\n"
diff --git a/messages/ia/LC_MESSAGES/mailman.po b/messages/ia/LC_MESSAGES/mailman.po
index 364ba8ee..ffa35d03 100644
--- a/messages/ia/LC_MESSAGES/mailman.po
+++ b/messages/ia/LC_MESSAGES/mailman.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mailman\n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: Wed Feb 18 19:50:26 2015\n"
 "Last-Translator: Martijn Dekker <vice-secretario@interlingua.com>\n"
 "Language-Team: Interlingua <TradSoft@interlingua.com>\n"
@@ -205,7 +205,7 @@ msgstr "per te"
 msgid "by the list administrator"
 msgstr "per le administrator del lista"
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "pro rationes incognite"
 
@@ -221,23 +221,23 @@ msgstr "disactivate"
 msgid "Bounce action notification"
 msgstr "Notification de action sur messages retrosaltate"
 
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "disactivate"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr " Le ultime message retrosaltate recipite de te data del %(date)s"
 
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
 msgid "(no subject)"
 msgstr "(sin subjecto)"
 
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr "[Detalios de messages retrosaltate non disponibile]"
 
@@ -251,7 +251,7 @@ msgstr "Administrator"
 
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -259,7 +259,7 @@ msgstr "Le lista <em>%(safelistname)s</em> non existe"
 
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -269,8 +269,8 @@ msgstr "Error"
 
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -282,7 +282,7 @@ msgid "Authorization failed."
 msgstr "Autorisation fallite."
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr "Le formulario ha expirate. (controlo contra falsification de requesta)"
 
@@ -300,7 +300,7 @@ msgstr ""
 "                livration o tu lista essera de facto inusabile."
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "Attention: "
 
@@ -457,7 +457,7 @@ msgstr "Tractar le requestas administrative attendente"
 msgid "Go to the general list information page"
 msgstr "Vader al pagina de information general del lista"
 
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 msgid "Edit the public HTML pages and text files"
 msgstr "Modificar le paginas HTML public e le files de texto"
 
@@ -550,7 +550,7 @@ msgstr "Nomine del topico:"
 msgid "Regexp:"
 msgstr "Regexp:"
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "Description:"
 
@@ -710,7 +710,7 @@ msgid "nodupes"
 msgstr "sin duples"
 
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr "digesto"
 
@@ -742,7 +742,7 @@ msgstr "R"
 msgid "notmetoo"
 msgstr "sin propries"
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr "sin posta"
 
@@ -1082,149 +1082,149 @@ msgstr "Confirma le contrasigno de autor:"
 msgid "Submit Your Changes"
 msgstr "Confirmar cambiamentos"
 
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr "Le contrasignos de moderator non coincide"
 
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 msgid "Poster passwords did not match"
 msgstr "Le contrasignos de autor non coincide"
 
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 msgid "Administrator passwords did not match"
 msgstr "Le contrasignos de administrator non coincide"
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "Ja es un membro"
 
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr "&lt;linea vacue&gt;"
 
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "Adresse de e-mail invalide"
 
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr "Adresse invalide (characteres illegal)"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr "Adresse bannite (corresponde a %(pattern)s)"
 
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "Invitate con successo:"
 
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "Abonate con successo:"
 
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "Error in invitar:"
 
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "Error in abonar:"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "Disabonate con successo:"
 
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr "Impossibile disabonar non-membros:"
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 msgid "You must provide both current and new addresses."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 #, fuzzy
 msgid "%(schange_to)s is already a list member."
 msgstr " ja es un membro"
 
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 #, fuzzy
 msgid "%(schange_to)s is not a valid email address."
 msgstr "Tu debe specificar un adresse email valide."
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 #, fuzzy
 msgid "%(schange_to)s is already a member"
 msgstr " ja es un membro"
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 #, fuzzy
 msgid "%(list_name)s address change notice."
 msgstr "notification de disabonamento de %(realname)s"
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 #, fuzzy
 msgid "Notification sent to %(schange_from)s."
 msgstr "Notificationes"
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 #, fuzzy
 msgid "Notification sent to %(schange_to)s."
 msgstr "Notificationes"
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr "Valor de signal de moderation invalide"
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 msgid "member mgt page"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "Non abonate"
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr "Ignorante cambiamentos al membro delite: %(user)s"
 
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "Removite con successo:"
 
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "Error in disabonar:"
 
@@ -1807,8 +1807,8 @@ msgstr ""
 "requesta\n"
 "    de disabonamento."
 
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "Disabona me"
 
@@ -2414,47 +2414,51 @@ msgstr "Invia rememoration del contrasigno cata mense?"
 msgid "List name is required."
 msgstr "Le nomine del lista es requirite."
 
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr "%(realname)s -- Edita le html pro %(template_info)s"
 
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr "Edita le HTML: Error"
 
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr "%(safetemplatename)s: modello invalide"
 
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr "%(realname)s -- Editation del pagina HTML"
 
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr "Selige le pagina a editar:"
 
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "Vide o edita le informationes de configuration del lista."
 
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "Quando tu ha finite le cambiamentos..."
 
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "Confirma le cambiamentos"
 
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr "On non pote lassar le pagina vacue."
 
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr "HTML non modificate."
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2463,19 +2467,19 @@ msgid ""
 "             "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 msgid "Page Unchanged."
 msgstr "Pagina non modificate."
 
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr "HTML modificate con successo."
 
@@ -2540,7 +2544,7 @@ msgstr ""
 msgid "Edit Options"
 msgstr "Modifica optiones"
 
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "Vide iste pagina in"
@@ -2549,34 +2553,34 @@ msgstr "Vide iste pagina in"
 msgid "This form requires JavaScript."
 msgstr ""
 
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "Error del script CGI"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "Nulle adresse date"
 
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "Adresse de e-mail invalide: %(safeuser)s"
 
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr "Membro inexistente: %(safeuser)s."
 
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr ""
 "Si tu es membro del lista, un message de confirmation ha essite inviate."
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
 "             forwarded to the list administrator for approval."
@@ -2584,7 +2588,7 @@ msgstr ""
 "Si tu es membro del lista, tu requesta de disabonamento ha essite\n"
 "                    inviate al administrator del lista pro approbation."
 
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 msgid ""
 "If you are a list member,\n"
 "            your password has been emailed to you."
@@ -2592,30 +2596,30 @@ msgstr ""
 "Si tu es membro del lista,\n"
 "            tu contrasigno te ha essite inviate."
 
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "Authentication fallite."
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr "Un rememoration de tu contrasigno te ha essite inviate."
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
 msgstr ""
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr ""
 
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr "Abonamentos de %(safeuser)s in %(hostname)s"
 
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
@@ -2623,22 +2627,22 @@ msgstr ""
 "Clicca sur un ligamine pro visitar tu pagina de optiones\n"
 "        pro le lista seligite."
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
 "            subscription for this mailing list has been changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "Le adresses non corresponde!"
 
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr "Tu jam usa iste adresse de e-mail"
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 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 "
@@ -2652,31 +2656,31 @@ msgstr ""
 "Post tu confirmation, tote altere listas continente le adresse\n"
 "%(safeuser)s essera cambiate. "
 
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "Le nove adresse jam es un membro: %(newaddr)s"
 
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "Adresses non pote esser vacue"
 
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr "Un message de confirmation ha essite inviate a %(newaddr)s."
 
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "Adresse de e-mail invalide"
 
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "Adresse de e-mail invalide"
 
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s jam es un membro del lista."
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
 "                      think this restriction is erroneous, please contact\n"
@@ -2687,11 +2691,11 @@ msgstr ""
 "proprietario(s) del\n"
 "lista a %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr "Le nomine del abonato ha essite cambiate con successo. "
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 msgid ""
 "The list administrator may not change the\n"
 "                    password for a user."
@@ -2699,15 +2703,15 @@ msgstr ""
 "Le administrator del lista non pote cambiar le\n"
 "                    contrasigno de un usator."
 
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "Contrasignos non pote esser vacue"
 
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "Le contrasignos non corresponde!"
 
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 msgid ""
 "The list administrator may not change the\n"
 "            password for this user's other subscriptions.  However, the\n"
@@ -2717,12 +2721,12 @@ msgstr ""
 "            pro le altere abonamentos de iste usator. Nonobstante, le\n"
 "            contrasigno de iste lista de diffusion ha essite cambiate."
 
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "Contrasigno cambiate con successo."
 
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
@@ -2732,16 +2736,16 @@ msgstr ""
 "                le cella sub le button <em>Disabona</em>. Tu\n"
 "                ancora non ha essite disabonate!"
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 #, fuzzy
 msgid "via the member options page"
 msgstr "Lista %(realname)s: pagina de entrata al optiones del membro"
 
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "Resultatos del disabonamento"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -2753,7 +2757,7 @@ msgstr ""
 "            un notification post que le moderatores ha prendite lor\n"
 "            decision."
 
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -2767,7 +2771,7 @@ msgstr ""
 "            Si tu ha alicun question sur tu disabonamento, per favor\n"
 "            contacta le proprietarios del lista a %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -2775,7 +2779,7 @@ msgid ""
 "                changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -2787,7 +2791,7 @@ msgstr ""
 "comocunque\n"
 "            tote tu altere optiones ha essite activate con successo."
 
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -2799,63 +2803,63 @@ msgstr ""
 "comocunque\n"
 "            tote tu altere optiones ha essite activate con successo."
 
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "Tu ha editate tu optiones con successo."
 
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "Tu poterea reciper un ultime digesto."
 
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>Si, io vermente vole disabonar me</em>"
 
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "Cambia mi contrasigno"
 
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "Lista mi altere abonamentos"
 
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "Invia me mi contrasigno per e-mail"
 
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "contrasigno"
 
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "Claude session"
 
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "Confirma mi cambiamentos"
 
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "dies"
 
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "die"
 
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr "%(days)d %(units)s"
 
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "Cambia mi adresse e nomine"
 
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "<em>Nulle thema definite</em>"
 
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
@@ -2865,19 +2869,19 @@ msgstr ""
 "Tu es abonate al lista con le adresse sin variationes de maiusculas\n"
 "<em>%(cpuser)s</em>."
 
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "Lista %(realname)s: pagina de entrata al optiones del membro"
 
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "adresse de e-mail e "
 
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr "Lista %(realname)s: optiones del usator %(safeuser)s"
 
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -2907,19 +2911,19 @@ msgstr ""
 "    o tu cambiamentos non habera effecto.\n"
 "    "
 
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "Adresse e-mail:"
 
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "Contrasigno:"
 
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "Aperi session"
 
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -2934,11 +2938,11 @@ msgstr ""
 "message\n"
 "    de confirmation)."
 
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "Promemoria del contrasigno"
 
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
@@ -2946,27 +2950,27 @@ msgstr ""
 "Post cliccar le button <em>Promemoria</em> button, tu\n"
 "    contrasigno te essera inviate in e-mail."
 
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "Promemoria"
 
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr "<mancante>"
 
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "Le thema non es valide: %(topicname)s"
 
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "Detalios de filtro de themas"
 
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "Nomine:"
 
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr "Motivo (como expression regular):"
 
@@ -7067,7 +7071,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -7106,7 +7110,7 @@ msgstr ""
 "            <p>In le cassas textual infra, adde un adresse per linea; "
 "comencia le\n"
 "            linea con un signo ^ pro designar un <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >expression Python regular</a>.  Scribe barras inverse como si\n"
 "            usar catenas rude de Python (i.e. on generalmente usa\n"
 "            solmente un singule barra inverse).\n"
@@ -7898,7 +7902,7 @@ msgstr "Le filtro de themas debe esser activate o disactivate?"
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -7922,7 +7926,7 @@ msgid ""
 msgstr ""
 "Le filtro de themas categorisa cata message entrante in\n"
 "             base a <a\n"
-"            href=\"http://docs.python.org/library/re.html\">filtros\n"
+"            href=\"https://docs.python.org/2/library/re.html\">filtros\n"
 "             con expressiones regular</a> que tu scribe infra.  Si le "
 "capite\n"
 "             <code>Subject:</code> o <code>Keywords:</code> del message\n"
@@ -8525,7 +8529,7 @@ msgstr "Visita le lista del abonatos"
 msgid "Once a month, your password will be emailed to you as a reminder."
 msgstr "Un vice cata mense, tu contrasigno te essera inviate como pro memoria."
 
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 msgid "The current archive"
 msgstr "Le archivo currente"
 
@@ -8900,7 +8904,7 @@ msgstr "Fin de "
 msgid "Posting of your message titled \"%(subject)s\""
 msgstr "Expedition de tu message titulate \"%(subject)s\""
 
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "[Nulle ration fornite]"
 
@@ -8912,28 +8916,28 @@ msgstr "Re-invia de message moderate"
 msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr "Requesta de nove abonamento al lista %(realname)s de %(addr)s"
 
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "Requesta de subscription"
 
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "Continua a attender le approbation"
 
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr "Requesta de nove disabonamento de %(realname)s de %(addr)s"
 
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr "Requesta de disabonamento"
 
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr "Message original"
 
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr "Requesta al lista de diffusion %(realname)s rejectate"
 
@@ -9054,56 +9058,56 @@ msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr ""
 "Tu confirmation es requirite pro abandonar le lista de diffusion %(listname)s"
 
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr " de %(remote)s"
 
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr "abonamentos a %(realname)s require approbation del moderator"
 
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "notification de abonamento de %(realname)s"
 
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr "disabonamento require approbation del moderator"
 
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr "notification de disabonamento de %(realname)s"
 
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 #, fuzzy
 msgid "%(realname)s address change notification"
 msgstr "notification de disabonamento de %(realname)s"
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "Codice de confirmation invalide"
 
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "Codice de confirmation invalide"
 
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr "abonamentos a %(name)s require approbation del administrator"
 
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "Codice de confirmation invalide"
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "Insere le cookie de confirmation"
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr "Ultime notification de auto-responsa pro hodie"
 
@@ -9199,15 +9203,15 @@ msgstr ""
 msgid "Original message suppressed by Mailman site configuration\n"
 msgstr ""
 
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr "Livrate per Mailman<br>version %(version)s"
 
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr "Conducite per Python"
 
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr "GNU non es Unix"
 
@@ -10189,7 +10193,7 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
diff --git a/messages/it/LC_MESSAGES/mailman.po b/messages/it/LC_MESSAGES/mailman.po
index ab8693df..9c0b04dd 100644
--- a/messages/it/LC_MESSAGES/mailman.po
+++ b/messages/it/LC_MESSAGES/mailman.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mailman\n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: 2008-03-24 19:19+0100\n"
 "Last-Translator: Simone Piunno <pioppo@ferrara.linux.it>\n"
 "Language-Team:  <it@li.org>\n"
@@ -222,7 +222,7 @@ msgstr "per decisione tua"
 msgid "by the list administrator"
 msgstr "dall'amministratore della lista"
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "per qualche ragione ignota"
 
@@ -239,18 +239,18 @@ msgstr "disabilitata"
 msgid "Bounce action notification"
 msgstr "Notifica errore"
 
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "disabilitata"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr " L'ultimo errore sul tuo indirizzo � datato %(date)s"
 
 # /home/mailman/Mailman/Archiver/pipermail.py:95
 # /home/mailman/Mailman/Archiver/pipermail.py:96
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
@@ -258,7 +258,7 @@ msgid "(no subject)"
 msgstr "(senza oggetto)"
 
 # /home/mailman/Mailman/MailCommandHandler.py:426
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr "[Non ci sono dettagli disponibili sugli errori]"
 
@@ -273,7 +273,7 @@ msgstr "l'amministratore della lista"
 
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -297,7 +297,7 @@ msgstr "Non esiste la lista <em>%(safelistname)s</em>"
 # /home/mailman/Mailman/Cgi/subscribe.py:102
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -314,8 +314,8 @@ msgstr "Errore"
 # /home/mailman/Mailman/Cgi/subscribe.py:44
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -327,7 +327,7 @@ msgid "Authorization failed."
 msgstr "Autenticazione fallita."
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr ""
 
@@ -346,7 +346,7 @@ msgstr ""
 "                inutilizzabile."
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "Attenzione: "
 
@@ -523,7 +523,7 @@ msgstr "Controlla richieste amministrative pendenti"
 msgid "Go to the general list information page"
 msgstr "Vai alla pagina delle informazioni generali della lista"
 
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 msgid "Edit the public HTML pages and text files"
 msgstr "Modifica le pagine HTML e i file di testo pubblici"
 
@@ -624,7 +624,7 @@ msgstr "Regexp:"
 # /home/mailman/Mailman/Cgi/admin.py:260
 # /home/mailman/Mailman/Cgi/admin.py:352
 # /home/mailman/Mailman/Cgi/listinfo.py:159
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "Descrizione:"
 
@@ -794,7 +794,7 @@ msgstr "no doppioni"
 
 # /home/mailman/Mailman/Digester.py:63
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr "digest"
 
@@ -829,7 +829,7 @@ msgstr "E"
 msgid "notmetoo"
 msgstr "non anche a me"
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr "nomail"
 
@@ -1203,173 +1203,173 @@ msgid "Submit Your Changes"
 msgstr "Applica le modifiche"
 
 # /home/mailman/Mailman/Cgi/subscribe.py:144
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr "Le password non sono identiche"
 
 # /home/mailman/Mailman/Cgi/subscribe.py:144
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 #, fuzzy
 msgid "Poster passwords did not match"
 msgstr "Le password non sono identiche."
 
 # /home/mailman/Mailman/Cgi/subscribe.py:144
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 msgid "Administrator passwords did not match"
 msgstr "Le password di amministratore non sono identiche"
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
 # /home/mailman/Mailman/Cgi/admin.py:856
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "Gi&agrave; iscritto."
 
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr "&lt;riga vuota&gt;"
 
 # /home/mailman/Mailman/Cgi/admin.py:861
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "Indirizzo email errato/non valido"
 
 # /home/mailman/Mailman/Cgi/admin.py:864
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr "Indirizzo errato (caratteri non permessi)"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr "Indirizzo interdetto (corrispondenza con %(pattern)s)"
 
 # /home/mailman/Mailman/Cgi/admin.py:866
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "Invitati con successo:"
 
 # /home/mailman/Mailman/Cgi/admin.py:866
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "Iscritti con successo:"
 
 #
 # /home/mailman/Mailman/Cgi/admin.py:928
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "Errore durante l'invio dell'invito:"
 
 #
 # /home/mailman/Mailman/Cgi/admin.py:928
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "Errore durante l'iscrizione:"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
 # /home/mailman/Mailman/Cgi/admin.py:866
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "Cancellati con successo:"
 
 # /home/mailman/Mailman/Cgi/admin.py:633
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr "Non posso cancellare non iscritti:"
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 #, fuzzy
 msgid "You must provide both current and new addresses."
 msgstr "Devi prima sistemare i precedenti indirizzi non validi."
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 #, fuzzy
 msgid "%(schange_to)s is already a list member."
 msgstr " &egrave; gi&agrave; iscritto"
 
 # /home/mailman/Mailman/Cgi/subscribe.py:115
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 #, fuzzy
 msgid "%(schange_to)s is not a valid email address."
 msgstr "Devi inserire un indirizzo di email valido."
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 #, fuzzy
 msgid "%(schange_to)s is already a member"
 msgstr " &egrave; gi&agrave; iscritto"
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 #, fuzzy
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr "%(addr)s � interdetto (corrispondenza con: %(patt)s)"
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
 msgstr ""
 
 # /home/mailman/Mailman/Cgi/roster.py:72
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 #, fuzzy
 msgid "%(list_name)s address change notice."
 msgstr "notifica di cancellazione da %(realname)s"
 
 # /home/mailman/Mailman/Cgi/admin.py:43
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 #, fuzzy
 msgid "Notification sent to %(schange_from)s."
 msgstr "Notifiche"
 
 # /home/mailman/Mailman/Cgi/admin.py:43
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 #, fuzzy
 msgid "Notification sent to %(schange_to)s."
 msgstr "Notifiche"
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr "Valore errato per il flag di moderazione"
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 msgid "member mgt page"
 msgstr ""
 
 # /home/mailman/Mailman/Cgi/admin.py:894
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "Non iscritto"
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr "Ignoro i cambiamenti per l'ex-iscritto: %(user)s"
 
 # /home/mailman/Mailman/Cgi/admin.py:866
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "Rimosso con successo:"
 
 #
 # /home/mailman/Mailman/Cgi/admin.py:928
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "Errore durante la cancellazione:"
 
@@ -1977,8 +1977,8 @@ msgstr ""
 "    richiesta di cancellazione."
 
 # /home/mailman/Mailman/Cgi/admindb.py:213
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "Cancellami"
 
@@ -2628,56 +2628,60 @@ msgid "List name is required."
 msgstr "Il nome della lista &egrave; obbligatorio."
 
 # /home/mailman/Mailman/Cgi/edithtml.py:86
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr "%(realname)s -- Variazione html per %(template_info)s"
 
 # /home/mailman/Mailman/Cgi/edithtml.py:90
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr "Modifica HTML : Errore"
 
 # /home/mailman/Mailman/Cgi/edithtml.py:91
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr "%(safetemplatename)s: Template non valido"
 
 # /home/mailman/Mailman/Cgi/edithtml.py:96
 # /home/mailman/Mailman/Cgi/edithtml.py:97
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr "%(realname)s -- Modifica di pagina HTML"
 
 # /home/mailman/Mailman/Cgi/edithtml.py:98
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr "Seleziona la pagina da modificare:"
 
 # /home/mailman/Mailman/Cgi/edithtml.py:160
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "Vedi o edita le informazioni della configurazione della lista."
 
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
 # /home/mailman/Mailman/Cgi/edithtml.py:173
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "Quando hai finito di fare modifiche..."
 
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "Esegui Variazioni"
 
 # /home/mailman/Mailman/Cgi/edithtml.py:186
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr "Non puoi avere una pagina html vuota."
 
 # /home/mailman/Mailman/Cgi/edithtml.py:187
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr "HTML invariato."
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2692,21 +2696,21 @@ msgstr ""
 "server Mailman.\n"
 "             "
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr "Vedi "
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr "FAQ 4.48."
 
 # /home/mailman/Mailman/Cgi/edithtml.py:187
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 msgid "Page Unchanged."
 msgstr "Pagina invariata."
 
 # /home/mailman/Mailman/Cgi/edithtml.py:194
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr "HTML modificato con successo."
 
@@ -2773,7 +2777,7 @@ msgid "Edit Options"
 msgstr "Modifica Opzioni"
 
 # /home/mailman/Mailman/Cgi/listinfo.py:199
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "Vedi questa pagina in"
@@ -2782,36 +2786,36 @@ msgstr "Vedi questa pagina in"
 msgid "This form requires JavaScript."
 msgstr ""
 
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "Errore nello script CGI"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr ""
 
 # /home/mailman/Mailman/ListAdmin.py:210
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "Nessun indirizzo fornito"
 
 # /home/mailman/Mailman/Cgi/admin.py:861
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "Indirizzo email errato/non valido: %(safeuser)s"
 
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr "Nessun iscritto: %(safeuser)s."
 
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 #, fuzzy
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr "L'email di conferma &egrave; stata spedita."
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 #, fuzzy
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
@@ -2820,22 +2824,22 @@ msgstr ""
 "La tua richiesta di iscrizione � stata inoltrata \n"
 "all'amministratore della lista per essere approvata."
 
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 #, fuzzy
 msgid ""
 "If you are a list member,\n"
 "            your password has been emailed to you."
 msgstr "Un promemoria della tua password ti &egrave; stato inviato."
 
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "Autenticazione fallita."
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr "Un promemoria della tua password ti &egrave; stato inviato."
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
@@ -2843,24 +2847,24 @@ msgstr ""
 "L'amministratore della lista non pu� vedere le altre iscrizioni di questo "
 "utente."
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr "Nota: "
 
 # /home/mailman/Mailman/Cgi/handle_opts.py:147
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr "Lista delle iscrizioni per %(safeuser)s su %(hostname)s"
 
 # /home/mailman/Mailman/Cgi/handle_opts.py:149
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
 msgstr "Clicca su un link per visitare le tue opzioni per la lista"
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
@@ -2871,16 +2875,16 @@ msgstr ""
 "a\n"
 "            questa lista � stata cambiata."
 
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "Gli indirizzi non sono uguali|"
 
 # /home/mailman/Mailman/MailCommandHandler.py:351
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr "Stai gi� usando questo indirizzo"
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 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 "
@@ -2893,34 +2897,34 @@ msgstr ""
 "cambio globale di indirizzo.  Se confermi, ogni altra lista contenente\n"
 "l'indirizzo %(safeuser)s sar&agrave; cambiata."
 
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "Il nuovo indirizzo � gi� un iscritto: %(newaddr)s"
 
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "Gli indirizzi non possono essere vuoti"
 
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr "Una richiesta di conferma &egrave; stata spedita a %(newaddr)s"
 
 # /home/mailman/Mailman/Cgi/admin.py:861
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "Indirizzo email errato/non valido"
 
 # /home/mailman/Mailman/Cgi/admin.py:861
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "Indirizzo email errato/non valido"
 
 # /home/mailman/Mailman/MailCommandHandler.py:297
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s � gi� iscritto alla lista."
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
 "                      think this restriction is erroneous, please contact\n"
@@ -2931,11 +2935,11 @@ msgstr ""
 "della lista all'indirizzo %(owneraddr)s."
 
 # /home/mailman/Mailman/Cgi/edithtml.py:194
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr "Nome dell'iscritto modificato con successo."
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 #, fuzzy
 msgid ""
 "The list administrator may not change the\n"
@@ -2944,15 +2948,15 @@ msgstr ""
 "L'amministratore della lista non pu� vedere le altre iscrizioni di questo "
 "utente."
 
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "Le password non possono essere vuote"
 
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "Le password non sono uguali!"
 
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 msgid ""
 "The list administrator may not change the\n"
 "            password for this user's other subscriptions.  However, the\n"
@@ -2963,12 +2967,12 @@ msgstr ""
 "            per questa lista &egrave; stata cambiata."
 
 # /home/mailman/Mailman/Cgi/edithtml.py:194
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "Password modificata con successo."
 
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
@@ -2978,17 +2982,17 @@ msgstr ""
 "                quadratino <em>Cancellami</em> qui sotto.\n"
 "                Non sei stato cancellato!"
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 #, fuzzy
 msgid "via the member options page"
 msgstr "lista %(realname)s: login alla pagina di opzioni per gli iscritti"
 
 # /home/mailman/Mailman/Cgi/admindb.py:289
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "Risultati di cancellazione"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -3000,7 +3004,7 @@ msgstr ""
 "            Riceverai una notifica quando i moderatori avranno \n"
 "            preso una decisione."
 
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -3015,7 +3019,7 @@ msgstr ""
 "        a proposito della tua cancellazione, contatta i gestori della\n"
 "        lista all'indirizzo %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -3026,7 +3030,7 @@ msgstr ""
 "               iscrizioni di questo utente.  Tuttavia, le opzioni per\n"
 "               l'iscrizione a questa lista sono state cambiate."
 
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -3038,7 +3042,7 @@ msgstr ""
 "            state modificate. In ogni caso tutti gli altri parametri\n"
 "            sono stati salvati correttamente."
 
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -3051,69 +3055,69 @@ msgstr ""
 "            sono stati salvati correttamente."
 
 # /home/mailman/Mailman/Cgi/handle_opts.py:242
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "Le tue opzioni sono state modificate con successo."
 
 # /home/mailman/Mailman/Cgi/handle_opts.py:248
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "Potresti ricevere un ultimo digest."
 
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>S&igrave;, voglio veramente cancellarmi</em>"
 
 # /home/mailman/Mailman/Cgi/options.py:140
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "Cambia la mia password"
 
 # /home/mailman/Mailman/Cgi/options.py:138
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "Elenco delle altre mie iscrizioni"
 
 # /home/mailman/Mailman/Cgi/options.py:146
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "Mandami la mia password via email"
 
 # /home/mailman/Mailman/Cgi/options.py:149
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "password"
 
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "Termina Sessione"
 
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "Esegui le variazioni"
 
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "giorni"
 
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "giorno"
 
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr "%(days)d %(units)s"
 
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "Cambia il mio nome e indirizzo"
 
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "<em>Non sono stati definiti argomenti</em>"
 
 # /home/mailman/Mailman/Cgi/options.py:151
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
@@ -3124,20 +3128,20 @@ msgstr ""
 "(conservando maiuscole e minuscole)\n"
 "<em>%(cpuser)s</em>."
 
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "lista %(realname)s: login alla pagina di opzioni per gli iscritti"
 
 # /home/mailman/Mailman/Cgi/admin.py:861
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "indirizzo email e"
 
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr "Lista %(realname)s: opzioni di iscrizione per %(safeuser)s"
 
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -3169,20 +3173,20 @@ msgstr ""
 
 # In this entry insert a space at the end of string, it will be stripped.
 # /home/mailman/Mailman/HTMLFormatter.py:287
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "Indirizzo email:"
 
 # /home/mailman/Mailman/HTMLFormatter.py:301
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "Password:"
 
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "Entra"
 
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -3197,11 +3201,11 @@ msgstr ""
 "        email; vedi le istruzioni nel messaggio)."
 
 # /home/mailman/Mailman/HTMLFormatter.py:301
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "Promemoria password"
 
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
@@ -3209,27 +3213,27 @@ msgstr ""
 "Cliccando sul pulsante <em>Promemoria</em>,\n"
 "        ti sar&agrave; spedita la tua password."
 
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "Promemoria"
 
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr "<mancante>"
 
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "L'argomento richiesto non &egrave; valido: %(topicname)s"
 
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "Dettagli sul filtro per argomenti"
 
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "Nome:"
 
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr "Pattern (come regexp):"
 
@@ -7401,7 +7405,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -7439,7 +7443,7 @@ msgstr ""
 "\n"
 "              <p>Nei campi sottostanti aggiungi un indirizzo per riga; \n"
 "              inizia la riga con un carattere ^ per indicare una\n"
-"              <a href=\"http://docs.python.org/library/re.html\"\n"
+"              <a href=\"https://docs.python.org/2/library/re.html\"\n"
 "              >Espressione regolare Python</a>.  Quando inserisci "
 "backslash,\n"
 "              fallo come se stessi inserendo stringhe grezze Python (ad \n"
@@ -8252,7 +8256,7 @@ msgstr "Devo abilitare il filtro sugli argomenti?"
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -8276,7 +8280,7 @@ msgid ""
 msgstr ""
 "Il filtro per argomenti categorizza ogni messaggio entrante\n"
 "             in base a\n"
-"<a href=\"http://docs.python.org/library/re.html\">\n"
+"<a href=\"https://docs.python.org/2/library/re.html\">\n"
 "             espressioni regolari</a> che puoi specificare pi&ugrave;\n"
 "             in basso.  Se i campi <code>Subject:</code> oppure\n"
 "             <code>Keywords:</code> nel messaggio contengono parole\n"
@@ -8912,7 +8916,7 @@ msgstr ""
 "Una volta al mese, la tua password ti verr&agrave; spedita come promemoria."
 
 # /home/mailman/Mailman/HTMLFormatter.py:373
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 msgid "The current archive"
 msgstr "L'archivio corrente"
 
@@ -9290,7 +9294,7 @@ msgid "Posting of your message titled \"%(subject)s\""
 msgstr "Invio del tuo messaggio intitolato \"%(subject)s\""
 
 # /home/mailman/Mailman/ListAdmin.py:210
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "[Nessuna motivazione fornita]"
 
@@ -9304,32 +9308,32 @@ msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr "Nuova richiesta di iscrizione a %(realname)s da parte di %(addr)s"
 
 # /home/mailman/Mailman/Cgi/admindb.py:289
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "Richieste di iscrizione"
 
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "Continua ad attendere approvazione"
 
 # /home/mailman/Mailman/ListAdmin.py:57
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr "Nuova richiesta di cancellazione da %(realname)s da parte di %(addr)s"
 
 # /home/mailman/Mailman/Cgi/admindb.py:289
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr "Richiesta di cancellazione"
 
 # /home/mailman/Mailman/ListAdmin.py:217
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr "Messaggio originale"
 
 # /home/mailman/Mailman/Deliverer.py:255
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr "Richiesta alla lista %(realname)s rifiutata"
 
@@ -9446,59 +9450,59 @@ msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr "� richiesta la tua conferma per disiscriverti dalla lista %(listname)s"
 
 # /home/mailman/Mailman/Cgi/subscribe.py:129
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr " da %(remote)s"
 
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr "le iscrizioni a %(realname)s richiedono l'approvazione del moderatore"
 
 # /home/mailman/Mailman/Cgi/roster.py:72
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "Notifica di iscrizione a %(realname)s"
 
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr "le cancellazioni richiedono l'approvazione del moderatore"
 
 # /home/mailman/Mailman/Cgi/roster.py:72
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr "notifica di cancellazione da %(realname)s"
 
 # /home/mailman/Mailman/Cgi/roster.py:72
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 #, fuzzy
 msgid "%(realname)s address change notification"
 msgstr "notifica di cancellazione da %(realname)s"
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "Stringa di conferma non valida"
 
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "Stringa di conferma non valida"
 
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr "le iscrizioni a %(name)s richiedono l'approvazione dell'amministratore"
 
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "Stringa di conferma non valida"
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "Inserisci il cookie di conferma"
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr "Ultima notifica automatica per oggi."
 
@@ -9593,15 +9597,15 @@ msgstr ""
 msgid "Original message suppressed by Mailman site configuration\n"
 msgstr ""
 
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr "Consegnato da Mailman<br>versione %(version)s"
 
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr "Python Powered"
 
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr "Gnu's Not Unix"
 
@@ -11024,7 +11028,7 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
@@ -11065,7 +11069,7 @@ msgstr ""
 "usando il modulo Python re.  La specifica completa si pu� trovare\n"
 "all'indirizzo:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "La ricerca degli indirizzi � non sensibile a maiuscole/minuscole\n"
 "ma vengono mostrati gli indirizzi senza alterazioni.\n"
diff --git a/messages/ja/LC_MESSAGES/mailman.po b/messages/ja/LC_MESSAGES/mailman.po
index dc55a60c..a1416fd3 100644
--- a/messages/ja/LC_MESSAGES/mailman.po
+++ b/messages/ja/LC_MESSAGES/mailman.po
@@ -6,9 +6,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Mailman 2.1.26\n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
-"PO-Revision-Date: 2018-06-18 06:13+09:00\n"
+"Project-Id-Version: Mailman 2.1.28\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
+"PO-Revision-Date: 2018-07-19 16:01+09:00\n"
 "Last-Translator: Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp>\n"
 "Language-Team: Japanese <mailman-users-jp@googlegroups.com>\n"
 "Language: ja\n"
@@ -63,7 +63,7 @@ msgstr "
 
 #: Mailman/Archiver/HyperArch.py:783
 msgid "<P>Currently, there are no archives. </P>"
-msgstr "<p>����, ��¸��ˤϤ���ޤ���."
+msgstr "<P>���ߡ���¸��ˤϤ���ޤ���</P>"
 
 #: Mailman/Archiver/HyperArch.py:821
 msgid "Gzip'd Text%(sz)s"
@@ -205,7 +205,7 @@ msgstr "
 msgid "by the list administrator"
 msgstr "�ꥹ�ȴ����Ԥˤ��"
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "���餫����ͳ�ˤ��"
 
@@ -221,24 +221,24 @@ msgstr "
 msgid "Bounce action notification"
 msgstr "�������顼��������"
 
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 msgid "disabled address"
 msgstr "������ߤ��줿���ɥ쥹"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr "�Ǹ�˥��顼�᡼�������������դ� %(date)s �Ǥ�"
 
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
 msgid "(no subject)"
 msgstr "(̵��)"
 
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
-msgstr "[�ܤ����������顼����Ϥ���ޤ���.]"
+msgstr "[�ܤ����������顼����Ϥ���ޤ���]"
 
 #: Mailman/Cgi/Auth.py:48
 msgid "Moderator"
@@ -250,7 +250,7 @@ msgstr "
 
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -258,7 +258,7 @@ msgstr "<em>%(safelistname)s</em>
 
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -268,12 +268,12 @@ msgstr "
 
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
-msgstr "CGI �Υ��ץ����̵���Ǥ�."
+msgstr "CGI �Υ��ץ����̵���Ǥ���"
 
 #: Mailman/Cgi/admin.py:123 Mailman/Cgi/admindb.py:161
 #: Mailman/Cgi/edithtml.py:128 Mailman/Cgi/private.py:144
@@ -281,7 +281,7 @@ msgid "Authorization failed."
 msgstr "ǧ�ڼ���"
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr "�ե������ͭ�����¤��᤮�ޤ����� (�ꥯ�����ȵ������ɻ�)"
 
@@ -293,13 +293,13 @@ msgid ""
 "                non-digest delivery or your mailing list will basically be\n"
 "                unusable."
 msgstr ""
-"�ޤȤ��ɤߤ�����������ξ����̵�������ꤵ��Ƥ��ޤ�. �����̷�⤷�����֤�"
-"��. \n"
+"�ޤȤ��ɤߤ�����������ξ����̵�������ꤵ��Ƥ��ޤ��������̷�⤷�����֤�"
+"����\n"
 "�ޤȤ��ɤߤ����������Τɤ��餫�����ꤷ�ʤ����\n"
-"�᡼��󥰥ꥹ�Ȥϵ�ǽ���ޤ���. "
+"�᡼��󥰥ꥹ�Ȥϵ�ǽ���ޤ���"
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "�ٹ�: "
 
@@ -309,8 +309,9 @@ msgid ""
 "                off. Those people will not receive mail.\n"
 "                Affected member(s) %(dm)r."
 msgstr ""
-"�ޤȤ��ɤߤ����դ�����Ǥ���, �ޤȤ��ɤ߲�������ޤ�.\n"
-"�ޤȤ��ɤ߲���ϥ᡼���������ޤ���.%(dm)r"
+"�ޤȤ��ɤߤβ�������ޤ������ꥹ�ȤΤޤȤ��ɤߤ����꤬���դˤʤäƤ��ޤ���\n"
+"�ޤȤ��ɤߤβ���ϥ᡼���������ޤ��󡣤��αƶ������������ %(dm)r ��"
+"����"
 
 #: Mailman/Cgi/admin.py:243
 msgid ""
@@ -319,8 +320,10 @@ msgid ""
 "you\n"
 "                fix this problem. Affected member(s) %(rm)r."
 msgstr ""
-"���������ϥ��դ�����Ǥ������ޤ��������������򤷤Ƥ����������ޤ�.\n"
-"�������꤬���������ޤ�, �᡼�����������������³���ޤ�.%(rm)r"
+"���������β�������ޤ������ꥹ�Ȥ��������������꤬���դˤʤäƤ��ޤ���\n"
+"�������꤬���������ޤǡ� ���������β���ϥ᡼������������Ǽ�����뤳�Ȥˤ�"
+"��Ǥ��礦��\n"
+"���αƶ������������ %(rm)r �Ǥ���"
 
 #: Mailman/Cgi/admin.py:268
 msgid "%(hostname)s mailing lists - Admin Links"
@@ -340,7 +343,7 @@ msgid ""
 "            mailing lists on %(hostname)s."
 msgstr ""
 "<p>���� %(hostname)s �dz����˸�������Ƥ��� %(mailmanlink)s \n"
-"�᡼��󥰥ꥹ�ȤϤ���ޤ���. "
+"�᡼��󥰥ꥹ�ȤϤ���ޤ���"
 
 #: Mailman/Cgi/admin.py:316
 msgid ""
@@ -349,8 +352,8 @@ msgid ""
 "            name to visit the configuration pages for that list."
 msgstr ""
 "<p>�ʲ��� %(hostname)s �Ǹ�������Ƥ��� \n"
-"%(mailmanlink)s �᡼��󥰥ꥹ�ȤǤ�. �ꥹ�Ȥ�̾���򥯥�å������, \n"
-"���Υꥹ�Ȥ�����ڡ����˰�ư���ޤ�."
+"%(mailmanlink)s �᡼��󥰥ꥹ�ȤǤ����ꥹ�Ȥ�̾���򥯥�å�����ȡ�\n"
+"���Υꥹ�Ȥ�����ڡ����˰�ư���ޤ���"
 
 #: Mailman/Cgi/admin.py:323
 msgid "right "
@@ -367,10 +370,10 @@ msgid ""
 "\n"
 "        <p>General list information can be found at "
 msgstr ""
-"������ɽ������Ƥ��ʤ��ꥹ�Ȥδ�������ڡ�����, ���Υڡ����� URL ��\n"
-"'/' �ȥꥹ�Ȥ�̾�� %(extra)s ���դ��� URL �˥����������Ƥ�������.\n"
-"�����θ��¤������, <a href=\"%(creatorurl)s\">�������᡼���\n"
-"�ꥹ�Ȥ��������</a>���Ȥ�Ǥ��ޤ�.\n"
+"������ɽ������Ƥ��ʤ��ꥹ�Ȥδ�������ڡ����ϡ����Υڡ����� URL ��\n"
+"'/' �ȥꥹ�Ȥ�̾�� %(extra)s ���դ��� URL �˥����������Ƥ���������\n"
+"�����θ��¤�����С�<a href=\"%(creatorurl)s\">�������᡼���\n"
+"�ꥹ�Ȥ��������</a>���Ȥ�Ǥ��ޤ���\n"
 "\n"
 "<p>�ꥹ�Ȥ���������"
 
@@ -397,7 +400,7 @@ msgstr "[
 
 #: Mailman/Cgi/admin.py:385
 msgid "No valid variable name found."
-msgstr "ͭ�����ѿ�̾�����Ĥ���ޤ���."
+msgstr "ͭ�����ѿ�̾�����Ĥ���ޤ���"
 
 #: Mailman/Cgi/admin.py:395
 msgid ""
@@ -420,14 +423,14 @@ msgid ""
 "also\n"
 "    "
 msgstr ""
-"<strong>�ٹ�:</strong> ����������ѹ������,\n"
-"  ¾�β��̤�ɽ�����ƤȰ��פ��ʤ��ʤ뤫�⤷�ޤ���.\n"
+"<strong>�ٹ�:</strong> ����������ѹ�����ȡ�\n"
+"  ¾�β��̤�ɽ�����ƤȰ��פ��ʤ��ʤ뤫�⤷�ޤ���\n"
 "  ���Υ��ץ�����ɽ��������ڡ����˰�ư��������\n"
-"  ɬ�����ɤ߹��ߤ����򤷤Ƥ�������. ���뤤��"
+"  ɬ�����ɤ߹��ߤ����򤷤Ƥ������������뤤��"
 
 #: Mailman/Cgi/admin.py:431
 msgid "return to the %(categoryname)s options page."
-msgstr "%(categoryname)s ���ץ����Υڡ��������."
+msgstr "%(categoryname)s ���ץ����Υڡ�������롣"
 
 #: Mailman/Cgi/admin.py:446
 msgid "%(realname)s Administration (%(label)s)"
@@ -453,7 +456,7 @@ msgstr "̤
 msgid "Go to the general list information page"
 msgstr "�ꥹ���������Υڡ�����"
 
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 msgid "Edit the public HTML pages and text files"
 msgstr "���� HTML �ڡ����ȥƥ����ȥե�������Խ�����"
 
@@ -483,8 +486,8 @@ msgid ""
 "Make your changes in the following section, then submit them\n"
 "        using the <em>Submit Your Changes</em> button below."
 msgstr ""
-"�ʲ��ι��ܤ��ѹ�����, <em>�ѹ�����������</em>�Υܥ����\n"
-" ����å������������Ƥ�������."
+"�ʲ��ι��ܤ��ѹ����ơ�<em>�ѹ�����������</em>�Υܥ����\n"
+" ����å������������Ƥ���������"
 
 #: Mailman/Cgi/admin.py:561
 msgid "Additional Member Tasks"
@@ -495,7 +498,7 @@ msgid ""
 "<li>Set everyone's moderation bit, including\n"
 "            those members not currently visible"
 msgstr ""
-"<li>����������(��ǥ졼�����)�ե饰�򥻥åȤ���.\n"
+"<li>����������(��ǥ졼�����)�ե饰�򥻥åȤ��롣\n"
 "(��������ޤ�)"
 
 #: Mailman/Cgi/admin.py:571
@@ -546,7 +549,7 @@ msgstr "
 msgid "Regexp:"
 msgstr "����ɽ��:"
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "����:"
 
@@ -556,11 +559,11 @@ msgstr "
 
 #: Mailman/Cgi/admin.py:770 Mailman/Cgi/admin.py:828
 msgid "...before this one."
-msgstr "...��������."
+msgstr "...��������"
 
 #: Mailman/Cgi/admin.py:771 Mailman/Cgi/admin.py:829
 msgid "...after this one."
-msgstr "...����."
+msgstr "...����"
 
 #: Mailman/Cgi/admin.py:804 Mailman/Cgi/admin.py:807
 msgid "Spam Filter Rule %(i)d"
@@ -629,8 +632,8 @@ msgid ""
 "        permanent state.</em>"
 msgstr ""
 "<br><em><strong>����:</strong>\n"
-"�����ͤ����ꤹ���ľ���˼¹Ԥ���ޤ���, ����Ū�ʾ��֤�\n"
-"�ѹ�����櫓�ǤϤ���ޤ���.</em></div>"
+"�����ͤ����ꤹ���ľ���˼¹Ԥ���ޤ���������Ū�ʾ��֤�\n"
+"�ѹ�����櫓�ǤϤ���ޤ���</em></div>"
 
 #: Mailman/Cgi/admin.py:893
 msgid "Mass Subscriptions"
@@ -705,7 +708,7 @@ msgid "nodupes"
 msgstr "���֥�̵"
 
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr "�ޤȤ��ɤ�"
 
@@ -737,13 +740,13 @@ msgstr "B"
 msgid "notmetoo"
 msgstr "����̵"
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr "�������"
 
 #: Mailman/Cgi/admin.py:1138
 msgid "<b>unsub</b> -- Click on this to unsubscribe the member."
-msgstr "<b>���</b> -- �������񤵤���ˤ�, �����򥯥�å�."
+msgstr "<b>���</b> -- �������񤵤���ˤϡ������򥯥�å���"
 
 #: Mailman/Cgi/admin.py:1140
 msgid ""
@@ -751,9 +754,9 @@ msgid ""
 "        set, postings from them will be moderated, otherwise they will be\n"
 "        approved."
 msgstr ""
-"<b>����</b> -- �Ŀ�ñ�̤Dz��������(��ǥ졼�����)�򤫤���ե饰.\n"
-"���Υե饰�򥻥åȤ����, ���β������Ƥ����¤���ޤ�. \n"
-"���åȤ��ʤ���м�ͳ����ƤǤ��ޤ�."
+"<b>����</b> -- �Ŀ�ñ�̤Dz��������(��ǥ졼�����)�򤫤���ե饰��\n"
+"���Υե饰�򥻥åȤ���ȡ����β������Ƥ����¤���ޤ���\n"
+"���åȤ��ʤ���м�ͳ����ƤǤ��ޤ���"
 
 #: Mailman/Cgi/admin.py:1144
 msgid ""
@@ -781,13 +784,13 @@ msgid ""
 "                    in older versions of Mailman.\n"
 "            </ul>"
 msgstr ""
-"<b>�������</b> -- ���β���ؤ���������ߤ���Ƥ��ޤ���? �⤷, �����ʤ�\n"
+"<b>�������</b> -- ���β���ؤ���������ߤ���Ƥ��ޤ���? �⤷�������ʤ�\n"
 " �ʲ���ά�����������ߤ�����ͳ��������ޤ�:\n"
-" <ul><li><b>U</b> -- ������Ȥ����ץ����ڡ�������������ߤ���.\n"
-" <li><b>A</b> -- �ꥹ�ȴ����Ԥ���������ߤ���.\n"
-" <li><b>B</b> -- ���顼�᡼����ˤ�ꥷ���ƥब��ưŪ����������ߤ���.\n"
+" <ul><li><b>U</b> -- ������Ȥ����ץ����ڡ�������������ߤ�����\n"
+" <li><b>A</b> -- �ꥹ�ȴ����Ԥ���������ߤ�����\n"
+" <li><b>B</b> -- ���顼�᡼����ˤ�ꥷ���ƥब��ưŪ����������ߤ�����\n"
 " <li><b>?</b> -- ������ߤ���ͳ����. ��С�������Mailman��\n"
-"    ��������ߤ������ʤɤ�����ˤ�����ޤ�.\n"
+"    ��������ߤ������ʤɤ�����ˤ�����ޤ���\n"
 " </ul>"
 
 #: Mailman/Cgi/admin.py:1161
@@ -816,15 +819,15 @@ msgid ""
 "        (otherwise, individual messages)"
 msgstr ""
 "<b>�ޤȤ��ɤ�</b> -- ���β���ؤϡ֤ޤȤ��ɤߡפ��������ޤ���?\n"
-"    (���ꤷ�ʤ����, 1�ܤ���������������������ˤʤ�ޤ�)"
+"    (�������ʤ��ΤǤ���С�1�̤���������������������ˤʤ�ޤ�)"
 
 #: Mailman/Cgi/admin.py:1173
 msgid ""
 "<b>plain</b> -- If getting digests, does the member get plain\n"
 "        text digests?  (otherwise, MIME)"
 msgstr ""
-"<b>ʿʸ</b> -- �֤ޤȤ��ɤߡפξ��, ���β���ؤ�ʿʸ���������ޤ���?\n"
-"    (�Ǥʤ����, MIME ź�դ�Ȥ��ޤ�)"
+"<b>ʿʸ</b> -- �֤ޤȤ��ɤߡפξ�硢���β���ؤ�ʿʸ���������ޤ���?\n"
+"    (�������ʤ��ΤǤ���С�MIME ź�դ�Ȥ��ޤ�)"
 
 #: Mailman/Cgi/admin.py:1175
 msgid "<b>language</b> -- Language preferred by the user"
@@ -832,18 +835,18 @@ msgstr "<b>
 
 #: Mailman/Cgi/admin.py:1189
 msgid "Click here to hide the legend for this table."
-msgstr "����ɽ�������򱣤��ˤ�, �����򥯥�å�."
+msgstr "����ɽ�������򱣤��ˤϡ������򥯥�å���"
 
 #: Mailman/Cgi/admin.py:1193
 msgid "Click here to include the legend for this table."
-msgstr "����ɽ��������ɽ������ˤ�, �����򥯥�å�."
+msgstr "����ɽ��������ɽ������ˤϡ������򥯥�å���"
 
 #: Mailman/Cgi/admin.py:1200
 msgid ""
 "<p><em>To view more members, click on the appropriate\n"
 "        range listed below:</em>"
 msgstr ""
-"<p>¾�β���򸫤�ˤ�, ���Υꥹ�Ȥ�Ŭ�����ϰϤ򥯥�å����Ƥ�������:</em>"
+"<p>¾�β���򸫤�ˤϡ����Υꥹ�Ȥ�Ŭ�����ϰϤ򥯥�å����Ƥ�������:</em>"
 
 #: Mailman/Cgi/admin.py:1214
 msgid "from %(start)s to %(end)s"
@@ -943,8 +946,8 @@ msgid ""
 "least\n"
 "    one blank line at the end..."
 msgstr ""
-"���Ԥޤ�����������Τ���Ƭ���դ���ʸ�Ϥ�ʲ������Ϥ��Ƥ�������. \n"
-"�ǽ��Ԥθ��, ���Ԥ򣱹԰ʾ�����Ƥ�������..."
+"���Ԥޤ�����������Τ���Ƭ���դ���ʸ�Ϥ�ʲ������Ϥ��Ƥ���������\n"
+"�ǽ��Ԥθ��, ���Ԥ�1�԰ʾ�����Ƥ�������..."
 
 #: Mailman/Cgi/admin.py:1278
 msgid "Send unsubscription acknowledgement to the user?"
@@ -999,19 +1002,19 @@ msgid ""
 "and also provide the email addresses of the list moderators in the\n"
 "<a href=\"%(adminurl)s/general\">general options section</a>."
 msgstr ""
-"<em>�ꥹ�ȴ�����</em>��, ���Υ᡼��󥰥ꥹ�Ȥ�������ܤ򤹤٤�\n"
-"���������Ǥ��ޤ�. �����Ԥϴ���Web�ڡ�����\n"
-"���٤ƤΥꥹ�������ѿ����ѹ��Ǥ��ޤ�.\n"
+"<em>�ꥹ�ȴ�����</em>�ϡ����Υ᡼��󥰥ꥹ�Ȥ�������ܤ򤹤٤�\n"
+"���������Ǥ��ޤ��������Ԥϴ���Web�ڡ�����\n"
+"���٤ƤΥꥹ�������ѿ����ѹ��Ǥ��ޤ���\n"
 "\n"
-"<p><em>�ꥹ�Ȼʲ��</em>�ϸ��¤����¤���Ƥ���Τ�,\n"
-"�ꥹ�Ȥ�ư��������ѹ����뤳�ȤϤǤ��ޤ���.\n"
-"������, �������ξ�ǧ��Ѳ�, ��α�᡼��ν����ʤɤδ�����Ȥ��Ǥ��ޤ�. \n"
-"�������, <em>�ꥹ�ȴ�����</em>�⿽����������뤳�Ȥ��Ǥ��ޤ�. \n"
+"<p><em>�ꥹ�Ȼʲ��</em>�ϸ��¤����¤���Ƥ���Τǡ�\n"
+"�ꥹ�Ȥ�ư��������ѹ����뤳�ȤϤǤ��ޤ���\n"
+"���������������ξ�ǧ��Ѳ�, ��α�᡼��ν����ʤɤδ�����Ȥ��Ǥ��ޤ���\n"
+"�������<em>�ꥹ�ȴ�����</em>�⿽����������뤳�Ȥ��Ǥ��ޤ���\n"
 "\n"
-"<p>�ꥹ�Ƚ�ͭ�ԤλŻ�������ԤȻʲ�Ԥ�ʬ����ˤ�,\n"
-"���ε�������̤λʲ�ԥѥ���ɤ����ꤷ�ޤ�.\n"
-"�����, <a href=\"%(adminurl)s/general\">����Ū���ץ�������</a>��\n"
-"�ʲ�ԤΥ᡼�륢�ɥ쥹�������Ƥ�������."
+"<p>�ꥹ�Ƚ�ͭ�ԤλŻ�������ԤȻʲ�Ԥ�ʬ����ˤϡ�\n"
+"���ε�������̤λʲ�ԥѥ���ɤ����ꤷ�ޤ���\n"
+"����ˡ�<a href=\"%(adminurl)s/general\">����Ū���ץ�������</a>��\n"
+"�ʲ�ԤΥ᡼�륢�ɥ쥹�������Ƥ���������"
 
 #: Mailman/Cgi/admin.py:1362
 msgid "Enter new administrator password:"
@@ -1038,12 +1041,12 @@ msgid ""
 "addition, the password below, if set, can be used for that purpose and\n"
 "no other."
 msgstr ""
-"��Σ��ĤΥѥ���ɤ˲ä���, ���Υꥹ�Ȥ���Ƥ��뤿��Υѥ���ɤ�\n"
-"���ꤹ�뤳�Ȥ��Ǥ��ޤ�. ��Τɤ���Υѥ���ɤ���ƥ᡼��Υإå�, \n"
-"������ʸ��κǽ�ιԤǤ��뵼���إå���, �إå�̾�� Approved: �Ȥ���\n"
-"�ѥ���ɤ�񤤤Ƥ������Ȥ�, ��α���줺�ˤ��Τޤ����������褦��\n"
-"�Ǥ��ޤ�. ����˲ä��Ʋ��Υѥ���ɤ�Ʊ���褦�˻Ȥ����Ȥ��Ǥ��ޤ�����\n"
-"�������¾������ (admin �� admindb �ؤΥ�������) �˻Ȥ����ȤϤǤ��ޤ���."
+"���2�ĤΥѥ���ɤ˲ä��ơ����Υꥹ�Ȥ���Ƥ��뤿��Υѥ���ɤ�\n"
+"���ꤹ�뤳�Ȥ��Ǥ��ޤ�����Τɤ���Υѥ���ɤ���ƥ᡼��Υإå���\n"
+"������ʸ��κǽ�ιԤǤ��뵼���إå��ˡ��إå�̾�� Approved: �Ȥ���\n"
+"�ѥ���ɤ�񤤤Ƥ������Ȥǡ���α���줺�ˤ��Τޤ����������褦��\n"
+"�Ǥ��ޤ�������˲ä��Ʋ��Υѥ���ɤ�Ʊ���褦�˻Ȥ����Ȥ��Ǥ��ޤ�����\n"
+"�������¾������ (admin �� admindb �ؤΥ�������) �˻Ȥ����ȤϤǤ��ޤ���"
 
 #: Mailman/Cgi/admin.py:1386
 msgid "Enter new poster password:"
@@ -1057,145 +1060,145 @@ msgstr "
 msgid "Submit Your Changes"
 msgstr "�ѹ�����������"
 
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
-msgstr "�ʲ�ԤΥѥ���ɤ����פ��ޤ���."
+msgstr "�ʲ�ԤΥѥ���ɤ����פ��ޤ���"
 
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 msgid "Poster passwords did not match"
-msgstr "��ƼԤΥѥ���ɤ����פ��ޤ���."
+msgstr "��ƼԤΥѥ���ɤ����פ��ޤ���"
 
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 msgid "Administrator passwords did not match"
 msgstr "�����ԤΥѥ���ɤ����פ��ޤ���"
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr "�����Ԥˤ��������"
 
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "���˲���Ǥ�"
 
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr "&lt;�����&gt;"
 
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "����ޤ���̵���ʥ᡼�륢�ɥ쥹"
 
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr "�����ʥ��ɥ쥹 (��§����ʸ��)"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr "����ػߥ��ɥ쥹 (%(pattern)s �˰���)"
 
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "���Լ�³����λ:"
 
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "�����³����λ"
 
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "���Լ�³���Υ��顼:"
 
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "�����³���Υ��顼:"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr "�����Ԥˤ�������"
 
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "����³����λ"
 
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr "���������Ǥ��ޤ���:"
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 msgid "You must provide both current and new addresses."
-msgstr "���ߤΥ��ɥ쥹���ѹ���Υ��ɥ쥹��ξ����ɬ�פǤ�."
+msgstr "���ߤΥ��ɥ쥹���ѹ���Υ��ɥ쥹��ξ����ɬ�פǤ���"
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
-msgstr "���ߤΥ��ɥ쥹���ѹ���Υ��ɥ쥹�ϰۤʤäƤ��ʤ���Фʤ�ޤ���."
+msgstr "���ߤΥ��ɥ쥹���ѹ���Υ��ɥ쥹�ϰۤʤäƤ��ʤ���Фʤ�ޤ���"
 
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 msgid "%(schange_to)s is already a list member."
-msgstr "%(schange_to)s �ϴ��˲���Ǥ�"
+msgstr "%(schange_to)s �ϴ��˲���Ǥ���"
 
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 msgid "%(schange_to)s is not a valid email address."
-msgstr "%(schange_to)s ��ͭ���ʥ᡼�륢�ɥ쥹�ǤϤ���ޤ���."
+msgstr "%(schange_to)s ��ͭ���ʥ᡼�륢�ɥ쥹�ǤϤ���ޤ���"
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr "%(schange_from)s �ϲ���ǤϤ���ޤ���"
 
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 msgid "%(schange_to)s is already a member"
 msgstr "%(schange_to)s �ϴ��˲���Ǥ�"
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr "%(schange_to)s ������ػߥѥ����� %(spat)s �˥ޥå����ޤ�"
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr "���ɥ쥹 %(schange_from)s �� %(schange_to)s ���ѹ����ޤ���"
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
 msgstr ""
 "�᡼��󥰥ꥹ�� %(list_name)s �� ����Υ��ɥ쥹 %(change_from)s ��\n"
-"%(change_to)s �ؤ��ѹ����ޤ���"
+"%(change_to)s �ؤ��ѹ����ޤ�����"
 
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 msgid "%(list_name)s address change notice."
 msgstr "%(list_name)s ���ɥ쥹�ѹ�����"
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 msgid "Notification sent to %(schange_from)s."
-msgstr "���Τ� %(schange_from)s ������ޤ���."
+msgstr "���Τ� %(schange_from)s ������ޤ�����"
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 msgid "Notification sent to %(schange_to)s."
-msgstr "���Τ� %(schange_to)s. ������ޤ���."
+msgstr "���Τ� %(schange_to)s. ������ޤ�����"
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr "���¥ե饰���ͤ��ְ�äƤ��ޤ�"
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 msgid "member mgt page"
 msgstr "��������Υڡ������"
 
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "���񤷤Ƥ��ޤ���"
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr "������줿������ѹ���̵��: %(user)s"
 
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "����³����λ:"
 
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "����³���Υ��顼:"
 
@@ -1209,11 +1212,11 @@ msgstr "%(realname)s 
 
 #: Mailman/Cgi/admindb.py:251
 msgid "There are no pending requests."
-msgstr "��α��ο����Ϥ���ޤ���."
+msgstr "��α��ο����Ϥ���ޤ���"
 
 #: Mailman/Cgi/admindb.py:254
 msgid "Click here to reload this page."
-msgstr "���Υڡ������ɽ������ˤ�, �����򥯥�å�."
+msgstr "���Υڡ������ɽ������ˤϡ������򥯥�å���"
 
 #: Mailman/Cgi/admindb.py:269
 msgid "Detailed instructions for the administrative database"
@@ -1237,11 +1240,11 @@ msgstr "%(esender)s 
 
 #: Mailman/Cgi/admindb.py:303
 msgid "a single held message."
-msgstr "1�̤���α�᡼��."
+msgstr "1�̤���α�᡼�롣"
 
 #: Mailman/Cgi/admindb.py:308
 msgid "all held messages."
-msgstr "���٤Ƥ���α�᡼��."
+msgstr "���٤Ƥ���α�᡼�롣"
 
 #: Mailman/Cgi/admindb.py:356
 msgid "Mailman Administrative Database Error"
@@ -1249,11 +1252,11 @@ msgstr "Mailman 
 
 #: Mailman/Cgi/admindb.py:361
 msgid "list of available mailing lists."
-msgstr "�����ˤ���᡼��󥰥ꥹ�Ȥΰ���"
+msgstr "�����ˤ���᡼��󥰥ꥹ�Ȥΰ�����"
 
 #: Mailman/Cgi/admindb.py:362
 msgid "You must specify a list name.  Here is the %(link)s"
-msgstr "�ꥹ��̾����ꤷ�Ƥ�������. ������ %(link)s ������ޤ�."
+msgstr "�ꥹ��̾����ꤷ�Ƥ��������������� %(link)s ������ޤ���"
 
 #: Mailman/Cgi/admindb.py:375
 msgid "Subscription Requests"
@@ -1290,7 +1293,7 @@ msgstr "
 
 #: Mailman/Cgi/admindb.py:487
 msgid "Held Messages"
-msgstr "��α�᡼��."
+msgstr "��α�᡼��"
 
 #: Mailman/Cgi/admindb.py:490
 msgid "Show this list grouped/sorted by"
@@ -1330,7 +1333,7 @@ msgstr "
 
 #: Mailman/Cgi/admindb.py:558
 msgid "<em>The sender is now a member of this list</em>"
-msgstr "<em>�����ԤϤ��Υ᡼��󥰥ꥹ�Ȥ����񤷤Ƥ��ޤ�.</em>"
+msgstr "<em>�����ԤϤ��Υ᡼��󥰥ꥹ�Ȥ����񤷤Ƥ��ޤ�</em>"
 
 #: Mailman/Cgi/admindb.py:568
 msgid "Add <b>%(esender)s</b> to one of these sender filters:"
@@ -1364,7 +1367,7 @@ msgstr ""
 msgid ""
 "Click on the message number to view the individual\n"
 "            message, or you can "
-msgstr "�᡼���ֹ�򥯥�å����Ƹġ��Υ᡼��򸫤뤫, "
+msgstr "�᡼���ֹ�򥯥�å����Ƹġ��Υ᡼��򸫤뤫��"
 
 #: Mailman/Cgi/admindb.py:591
 msgid "view all messages from %(esender)s"
@@ -1405,11 +1408,11 @@ msgstr " (%(total)d 
 
 #: Mailman/Cgi/admindb.py:694
 msgid "<em>Message with id #%(id)d was lost."
-msgstr "<em>ID #%(id)d �Υ᡼���ʶ�����Ƥ��ޤ�."
+msgstr "<em>ID #%(id)d �Υ᡼���ʶ�����Ƥ��ޤ���"
 
 #: Mailman/Cgi/admindb.py:703
 msgid "<em>Message with id #%(id)d is corrupted."
-msgstr "<em>ID #%(id)d �Υ᡼��ϲ���Ƥ��ޤ�."
+msgstr "<em>ID #%(id)d �Υ᡼��ϲ���Ƥ��ޤ���"
 
 #: Mailman/Cgi/admindb.py:769
 msgid "Preserve message for site administrator"
@@ -1417,7 +1420,7 @@ msgstr "
 
 #: Mailman/Cgi/admindb.py:775
 msgid "Additionally, forward this message to: "
-msgstr "�����, ���Υ᡼���ž��:"
+msgstr "����ˡ����Υ᡼���ž��:"
 
 #: Mailman/Cgi/admindb.py:780 Mailman/Cgi/admindb.py:849
 #: Mailman/Cgi/admindb.py:926 Mailman/Cgi/admindb.py:928
@@ -1426,7 +1429,7 @@ msgstr "[
 
 #: Mailman/Cgi/admindb.py:782
 msgid "If you reject this post,<br>please explain (optional):"
-msgstr "������Ƥ���ݤ�����,<br>������ͳ (���ץ���ʥ�):"
+msgstr "������Ƥ���ݤ����硢<br>������ͳ (���ץ���ʥ�):"
 
 #: Mailman/Cgi/admindb.py:788
 msgid "Message Headers:"
@@ -1450,7 +1453,7 @@ msgstr "%(addr)s 
 
 #: Mailman/Cgi/confirm.py:88
 msgid "Confirmation string was empty."
-msgstr "��ǧʸ���󤬶��Ǥ�"
+msgstr "��ǧʸ���󤬶��Ǥ���"
 
 #: Mailman/Cgi/confirm.py:108
 msgid ""
@@ -1481,8 +1484,8 @@ msgid ""
 "been\n"
 "                unsubscribed, e.g. by the list administrator?"
 msgstr ""
-"�������������ɥ쥹�ϲ��̾���ˤ���ޤ���.\n"
-"�����Ԥʤɤˤ�äƴ�������³�������줿�ΤǤϤʤ��Ǥ��礦��."
+"�������������ɥ쥹�ϲ��̾���ˤ���ޤ���\n"
+"�����Ԥʤɤˤ�äƴ�������³�������줿�ΤǤϤʤ��Ǥ��礦����"
 
 #: Mailman/Cgi/confirm.py:158
 msgid ""
@@ -1490,12 +1493,12 @@ msgid ""
 "                    been subsequently unsubscribed.  This request has been\n"
 "                    cancelled."
 msgstr ""
-"�ѹ������Τ��ä����ɥ쥹����񤷤Ƥ��ޤ�.\n"
-"���ο�������ä��ޤ�."
+"�ѹ������Τ��ä����ɥ쥹����񤷤Ƥ��ޤ���\n"
+"���ο�������ä��ޤ���"
 
 #: Mailman/Cgi/confirm.py:178
 msgid "System error, bad content: %(content)s"
-msgstr "�����ƥ२�顼. ���Ƥ�����Ƥ��ޤ�: %(content)s"
+msgstr "�����ƥ२�顼�����Ƥ�����Ƥ��ޤ�: %(content)s"
 
 #: Mailman/Cgi/confirm.py:188
 msgid "Bad confirmation string"
@@ -1513,9 +1516,9 @@ msgid ""
 "    below.  Then hit the <em>Submit</em> button to proceed to the next\n"
 "    confirmation step."
 msgstr ""
-"�����������, �᡼��Ǽ�����ä���ǧʸ����(<em>���å���</em>)��\n"
-"���Ϥ��Ƥ�������. ����, <em>����</em>�ܥ���򲡤���, \n"
-"��ǧ��³���˿ʤ�Ǥ�������."
+"����������ˡ��᡼��Ǽ�����ä���ǧʸ����(<em>���å���</em>)��\n"
+"���Ϥ��Ƥ������������ˡ�<em>����</em>�ܥ���򲡤��ơ�\n"
+"��ǧ��³���˿ʤ�Ǥ���������"
 
 #: Mailman/Cgi/confirm.py:225
 msgid "Confirmation string:"
@@ -1548,16 +1551,17 @@ msgid ""
 "    subscribe to this list."
 msgstr ""
 "<em>%(listname)s</em> �᡼��󥰥ꥹ�Ȥؤ������³���κǸ��,\n"
-"�ʲ�������������ǧ���Ƥ�������. ɬ�פʤ餳�����Ƥ������뤳�Ȥ��Ǥ��ޤ�.\n"
-"<em>����</em>�ܥ���򥯥�å������,\n"
-"�����³������λ���ޤ�. ��ǧ��, ������ץ����ڡ����˰�ư���ޤ�. \n"
-"�����Ǥ���˲�����ץ����򥫥����ޥ������뤳�Ȥ��Ǥ��ޤ�.\n"
+"�ʲ�������������ǧ���Ƥ���������ɬ�פʤ餳�����Ƥ������뤳�Ȥ��Ǥ���"
+"����\n"
+"<em>����</em>�ܥ���򥯥�å�����ȡ�\n"
+"�����³������λ���ޤ�����ǧ�塢������ץ����ڡ����˰�ư���ޤ���\n"
+"�����Ǥ���˲�����ץ����򥫥����ޥ������뤳�Ȥ��Ǥ��ޤ���\n"
 "\n"
-"<p>����: �����ǧ��, ���ץ������ѹ��˻Ȥ��ѥ���ɤ�����ޤ�.\n"
-"���Υѥ���ɤϲ�����ץ����ڡ������Ѥ����ޤ�.\n"
+"<p>����: �����ǧ�塢���ץ������ѹ��˻Ȥ��ѥ���ɤ�����ޤ���\n"
+"���Υѥ���ɤϲ�����ץ����ڡ������Ѥ����ޤ���\n"
 "\n"
-"<p>����ο������ߤ���ä��Ȥ���, <em>����󥻥롦�˴�</em>�ܥ����\n"
-"����å����Ƥ�������."
+"<p>����ο������ߤ���ä��Ȥ��ϡ�<em>����󥻥롦�˴�</em>�ܥ����\n"
+"����å����Ƥ���������"
 
 #: Mailman/Cgi/confirm.py:275
 msgid ""
@@ -1579,17 +1583,17 @@ msgid ""
 "        this mailing list, you can hit <em>Cancel my subscription\n"
 "        request</em>."
 msgstr ""
-"<em>%(listname)s</em> �᡼��󥰥ꥹ�Ȥؤ���������³���뤿���,\n"
-"�ܿͤγ�ǧ��ɬ�פǤ�. ���ʤ����������꤬�ʲ��˼�����Ƥ��ޤ�. \n"
+"<em>%(listname)s</em> �᡼��󥰥ꥹ�Ȥؤ���������³���뤿��ˡ�\n"
+"�ܿͤγ�ǧ��ɬ�פǤ������ʤ����������꤬�ʲ��˼�����Ƥ��ޤ���\n"
 "ɬ�פʤ��ѹ���Ԥʤä�<em>����</em>�ܥ���򥯥�å������\n"
-"�����³������λ���ޤ�. ��������ǧ����λ�����, �ʲ�Ԥ���������\n"
-"���ݤ���ꤷ, ��̤��᡼������Τ���ޤ�.\n"
+"�����³������λ���ޤ�����������ǧ����λ����ȡ��ʲ�Ԥ���������\n"
+"���ݤ���ꤷ����̤��᡼������Τ���ޤ���\n"
 "\n"
-"<p>����: ����γ�ǧ���Ѥ�ȥ᡼��ǥѥ���ɤ�����ޤ�.\n"
-"�ѥ���ɤϲ�����ץ����ڡ������Ѥ����ޤ�.\n"
+"<p>����: ����γ�ǧ���Ѥ�ȥ᡼��ǥѥ���ɤ�����ޤ���\n"
+"�ѥ���ɤϲ�����ץ����ڡ������Ѥ����ޤ���\n"
 "\n"
-"<p>����������ä��ˤ� <em>���������ä�</em>�Υܥ����\n"
-"����å����Ƥ�������."
+"<p>����������ä��ˤ� <em>���������ä�</em> �Υܥ����\n"
+"����å����Ƥ���������"
 
 #: Mailman/Cgi/confirm.py:293
 msgid "Your email address:"
@@ -1617,7 +1621,7 @@ msgstr "
 
 #: Mailman/Cgi/confirm.py:335
 msgid "You have canceled your subscription request."
-msgstr "����������ä��ޤ���."
+msgstr "����������ä��ޤ�����"
 
 #: Mailman/Cgi/confirm.py:373
 msgid "Awaiting moderator approval"
@@ -1634,9 +1638,9 @@ msgid ""
 "notified\n"
 "            of the moderator's decision."
 msgstr ""
-"%(listname)s �᡼��󥰥ꥹ�Ȥؤ���������ǧ��³������λ���ޤ���.\n"
-"����ˤϥ᡼��󥰥ꥹ�Ȥλʲ�Ԥκǽ���ǧ��ɬ�פǤ��Τ�, \n"
-"������ʲ�Ԥ�ž�����ޤ���. ����, ����˴ؤ������Τ������ޤ�."
+"%(listname)s �᡼��󥰥ꥹ�Ȥؤ���������ǧ��³������λ���ޤ�����\n"
+"����ˤϥ᡼��󥰥ꥹ�Ȥλʲ�Ԥκǽ���ǧ��ɬ�פǤ��Τǡ�\n"
+"������ʲ�Ԥ�ž�����ޤ���������������˴ؤ������Τ������ޤ���"
 
 #: Mailman/Cgi/confirm.py:383 Mailman/Cgi/confirm.py:448
 #: Mailman/Cgi/confirm.py:537 Mailman/Cgi/confirm.py:774
@@ -1645,8 +1649,8 @@ msgid ""
 "            possible that you are attempting to confirm a request for an\n"
 "            address that has already been unsubscribed."
 msgstr ""
-"��ǧʸ����̵���Ǥ�. ������񤷤����ɥ쥹�ο������ǧ���褦��\n"
-"���Ƥ����ǽ��������ޤ�."
+"��ǧʸ����̵���Ǥ���������񤷤����ɥ쥹�ο������ǧ���褦��\n"
+"���Ƥ����ǽ��������ޤ���"
 
 #: Mailman/Cgi/confirm.py:387
 msgid "You are already a member of this mailing list!"
@@ -1658,7 +1662,7 @@ msgid ""
 "            this list.  If you think this restriction is erroneous, please\n"
 "            contact the list owners at %(owneraddr)s."
 msgstr ""
-"�������줿�᡼�륢�ɥ쥹�Ǥ�����϶ػߤ���Ƥ��ޤ�. \n"
+"�������줿�᡼�륢�ɥ쥹�Ǥ�����϶ػߤ���Ƥ��ޤ���\n"
 "�����������¤�����Ͽ�ˤ���ΤȻפ������\n"
 "���Υꥹ�ȴ����԰��ˤ�Ϣ����������: %(owneraddr)s"
 
@@ -1668,8 +1672,8 @@ msgid ""
 "            been discarded, and both list administrators have been\n"
 "            alerted."
 msgstr ""
-"���ʤ������Ԥ��줿�᡼��󥰥ꥹ�Ȥ�, ���Υ᡼��󥰥ꥹ�ȤǤϤ���ޤ���.\n"
-"ȯ�Ԥ��줿���Ԥ���ä�, �����Υꥹ�ȴ����Ԥ����󤷤ޤ���."
+"���ʤ������Ԥ��줿�᡼��󥰥ꥹ�Ȥϡ����Υ᡼��󥰥ꥹ�ȤǤϤ���ޤ���\n"
+"ȯ�Ԥ��줿���Ԥ���ä��������Υꥹ�ȴ����Ԥ����󤷤ޤ�����"
 
 #: Mailman/Cgi/confirm.py:404
 msgid "Subscription request confirmed"
@@ -1687,18 +1691,18 @@ msgid ""
 "            page</a>."
 msgstr ""
 "%(listname)s�᡼��󥰥ꥹ�Ȥؤ� \"%(addr)s\" ����������\n"
-"��ǧ���ޤ���. ���ؤ�\n"
-"��ǧ�᡼��ǥѥ���ɤʤɤ�ɬ�פʾ�������ꤷ�ޤ�.\n"
+"��ǧ���ޤ��������ؤ�\n"
+"��ǧ�᡼��ǥѥ���ɤʤɤ�ɬ�פʾ�������ꤷ�ޤ���\n"
 "\n"
-"<p><a href=\"%(optionsurl)s\">�����������ڡ���</a>�ؤΥ����������Ǥ��ޤ�."
+"<p><a href=\"%(optionsurl)s\">�����������ڡ���</a>�ؤΥ����������Ǥ��ޤ���"
 
 #: Mailman/Cgi/confirm.py:426
 msgid "You have canceled your unsubscription request."
-msgstr "���������ä��ޤ���."
+msgstr "���������ä��ޤ�����"
 
 #: Mailman/Cgi/confirm.py:454
 msgid "Unsubscription request confirmed"
-msgstr "��������ǧ���ޤ���."
+msgstr "��������ǧ���ޤ���"
 
 #: Mailman/Cgi/confirm.py:458
 msgid ""
@@ -1708,8 +1712,8 @@ msgid ""
 "main\n"
 "            information page</a>."
 msgstr ""
-"%(listname)s �᡼��󥰥ꥹ�Ȥ��������³����λ���ޤ���. \n"
-"<a href=\"%(listinfourl)s\">�᡼��󥰥ꥹ�Ȱ���ڡ���</a>�ؤɤ���."
+"%(listname)s �᡼��󥰥ꥹ�Ȥ��������³����λ���ޤ�����\n"
+"<a href=\"%(listinfourl)s\">�᡼��󥰥ꥹ�Ȱ���ڡ���</a>�ؤɤ�����"
 
 #: Mailman/Cgi/confirm.py:469
 msgid "Confirm unsubscription request"
@@ -1736,17 +1740,17 @@ msgid ""
 "    <p>Or hit <em>Cancel and discard</em> to cancel this unsubscription\n"
 "    request."
 msgstr ""
-"<em>%(listname)s</em>�᡼��󥰥ꥹ�Ȥ�������ˤ�, \n"
-"�ܿͤˤ��������γ�ǧ��ɬ�פǤ�. \n"
+"<em>%(listname)s</em>�᡼��󥰥ꥹ�Ȥ�������ˤϡ�\n"
+"�ܿͤˤ��������γ�ǧ��ɬ�פǤ���\n"
 "���ߤβ������ϰʲ����̤�Ǥ�...\n"
 "<ul><li><b>��̾:</b> %(fullname)s\n"
 "    <li><b>�᡼�륢�ɥ쥹:</b> %(addr)s\n"
 "</ul>\n"
-"��ǧ�μ�³����λ����ˤ�, ����<em>���</em>�ܥ���򲡤��ޤ�.\n"
-"<p><em>����󥻥롦�˴�</em>�ܥ�������������ä����Ȥ�Ǥ��ޤ�."
+"��ǧ�μ�³����λ����ˤ�, ����<em>���</em>�ܥ���򲡤��ޤ���\n"
+"<p><em>����󥻥롦�˴�</em>�ܥ�������������ä����Ȥ�Ǥ��ޤ���"
 
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "���"
 
@@ -1756,7 +1760,7 @@ msgstr "
 
 #: Mailman/Cgi/confirm.py:514
 msgid "You have canceled your change of address request."
-msgstr "���ɥ쥹�ѹ��ο�������ä��ޤ���."
+msgstr "���ɥ쥹�ѹ��ο�������ä��ޤ�����"
 
 #: Mailman/Cgi/confirm.py:543
 msgid ""
@@ -1765,7 +1769,7 @@ msgid ""
 "            please contact the list owners at %(owneraddr)s."
 msgstr ""
 "%(newaddr)s �Ȥ����᡼�륢�ɥ쥹�� %(realname)s �ؤ�\n"
-"����϶ػߤ���Ƥ��ޤ�. \n"
+"����϶ػߤ���Ƥ��ޤ���\n"
 "�����������¤�����Ͽ�ˤ���ΤȻפ������\n"
 "���Υꥹ�ȴ����԰��ˤ�Ϣ����������: %(owneraddr)s"
 
@@ -1776,8 +1780,8 @@ msgid ""
 "            to confirm a request for an address that has already been\n"
 "            subscribed."
 msgstr ""
-"%(newaddr)s ��, ���� %(realname)s �ꥹ�Ȥβ���Ǥ�.\n"
-"�������񤷤����ɥ쥹�ο������ǧ���褦�Ȥ��Ƥ����ǽ��������ޤ�."
+"%(newaddr)s �ϡ����� %(realname)s �ꥹ�Ȥβ���Ǥ���\n"
+"�������񤷤����ɥ쥹�ο������ǧ���褦�Ȥ��Ƥ����ǽ��������ޤ���"
 
 #: Mailman/Cgi/confirm.py:555
 msgid "Change of address request confirmed"
@@ -1792,8 +1796,8 @@ msgid ""
 "            login page</a>."
 msgstr ""
 "%(listname)s �᡼��󥰥ꥹ�Ȥμ������ɥ쥹��\n"
-"<b>%(oldaddr)s</b> ���� <b>%(newaddr)s</b> ���ѹ����ޤ���.\n"
-"<a href=\"%(optionsurl)s\">�����������ڡ���</a>�ؤɤ���."
+"<b>%(oldaddr)s</b> ���� <b>%(newaddr)s</b> ���ѹ����ޤ�����\n"
+"<a href=\"%(optionsurl)s\">�����������ڡ���</a>�ؤɤ�����"
 
 #: Mailman/Cgi/confirm.py:571
 msgid "Confirm change of address request"
@@ -1827,16 +1831,16 @@ msgid ""
 "    request."
 msgstr ""
 "<em>%(listname)s</em>�᡼��󥰥ꥹ�Ȥ������᡼�륢�ɥ쥹��\n"
-"�ѹ�����ˤ�, �ܿͤˤ���ǧ��ɬ�פǤ�. ���ߤβ�������, \n"
+"�ѹ�����ˤϡ��ܿͤˤ���ǧ��ɬ�פǤ������ߤβ������ϡ�\n"
 "<ul><li><b>��̾:</b> %(fullname)s\n"
 "    <li><b>��᡼�륢�ɥ쥹:</b> %(oldaddr)s\n"
 "</ul>\n"
-"�Ǥ�. ������, �᡼�륢�ɥ쥹��\n"
+"�Ǥ��������ơ��᡼�륢�ɥ쥹��\n"
 "<ul><li><b>���᡼�륢�ɥ쥹:</b> %(newaddr)s\n"
-"�� %(globallys)s �ѹ�����褦�˿������ޤ���.\n"
-"����<em>���ɥ쥹�ѹ�</em>�ܥ���򲡤��Ƴ�ǧ�μ�³���򤷤Ƥ�������.\n"
+"�� %(globallys)s �ѹ�����褦�˿������ޤ�����\n"
+"����<em>���ɥ쥹�ѹ�</em>�ܥ���򲡤��Ƴ�ǧ�μ�³���򤷤Ƥ���������\n"
 "<p><em>����󥻥롦�˴�</em>�ܥ���򲡤��ƥ��ɥ쥹�ѹ�������\n"
-"���ä����Ȥ�Ǥ��ޤ�."
+"���ä����Ȥ�Ǥ��ޤ���"
 
 #: Mailman/Cgi/confirm.py:614
 msgid "Change address"
@@ -1851,12 +1855,12 @@ msgid ""
 "Okay, the list moderator will still have the\n"
 "    opportunity to approve or reject this message."
 msgstr ""
-"λ��. �ꥹ�Ȼʲ�Ԥˤ�, ���Υ᡼���ǧ���뤫���ݤ��뤫\n"
-"����ꤹ�����󥹤��ޤ�����ޤ�."
+"λ�򡣥ꥹ�Ȼʲ�Ԥˤϡ����Υ᡼���ǧ���뤫���ݤ��뤫\n"
+"����ꤹ�����󥹤��ޤ�����ޤ���"
 
 #: Mailman/Cgi/confirm.py:659
 msgid "Sender discarded message via web."
-msgstr "�����Ԥ� Web �ǥ᡼����˴����ޤ���."
+msgstr "�����Ԥ� Web �ǥ᡼����˴����ޤ�����"
 
 #: Mailman/Cgi/confirm.py:661
 msgid ""
@@ -1868,13 +1872,13 @@ msgid ""
 "            rejected the message.  You were not able to cancel it in\n"
 "            time."
 msgstr ""
-"<em>%(subject)s</em>�Ȥ�����̾�Υ᡼�����α����Ƥ��ޤ���.\n"
-"�ꥹ�Ȼʲ�Ԥ����˾�ǧ�ޤ��ϵ��ݤ�����, \n"
-"���ä����֤˹��ʤ��ä���ǽ��������ޤ�."
+"<em>%(subject)s</em>�Ȥ�����̾�Υ᡼�����α����Ƥ��ޤ���\n"
+"�ꥹ�Ȼʲ�Ԥ����˾�ǧ�ޤ��ϵ��ݤ����ᡢ\n"
+"���ä����֤˹��ʤ��ä���ǽ��������ޤ���"
 
 #: Mailman/Cgi/confirm.py:669
 msgid "Posted message canceled"
-msgstr "��Ƥ����ä���ޤ���."
+msgstr "��Ƥ����ä���ޤ���"
 
 #: Mailman/Cgi/confirm.py:672
 msgid ""
@@ -1882,8 +1886,8 @@ msgid ""
 "            the Subject: header <em>%(subject)s</em> to the mailing list\n"
 "            %(listname)s."
 msgstr ""
-"��̾: �� <em>%(subject)s</em>�Ǥ���, %(listname)s �᡼���\n"
-"�ꥹ�Ȥؤ���ƥ᡼��ϼ��ä���λ���ޤ���."
+"��̾: �� <em>%(subject)s</em>�Ǥ��롢%(listname)s �᡼���\n"
+"�ꥹ�Ȥؤ���ƥ᡼��ϼ��ä���λ���ޤ�����"
 
 #: Mailman/Cgi/confirm.py:683
 msgid "Cancel held message posting"
@@ -1893,7 +1897,7 @@ msgstr "
 msgid ""
 "The held message you were referred to has\n"
 "        already been handled by the list administrator."
-msgstr "��α����Ƥ����᡼���, ���Ǥ˥ꥹ�ȴ����Ԥ��������ޤ���."
+msgstr "��α����Ƥ����᡼��ϡ����Ǥ˥ꥹ�ȴ����Ԥ��������ޤ�����"
 
 #: Mailman/Cgi/confirm.py:722
 msgid ""
@@ -1911,14 +1915,14 @@ msgid ""
 "    allow the list moderator to approve or reject the message."
 msgstr ""
 "<em>%(listname)s</em> �᡼��󥰥ꥹ�Ȥ���Ƥ��줿\n"
-"���Υ᡼�����ä��ˤ�, �ܿͤˤ���ǧ��ɬ�פǤ�. \n"
+"���Υ᡼�����ä��ˤϡ��ܿͤˤ���ǧ��ɬ�פǤ���\n"
 "<ul><li><b>������:</b> %(sender)s\n"
 "    <li><b>��̾:</b> %(subject)s\n"
 "    <li><b>��ͳ:</b> %(reason)s\n"
 "</ul>\n"
-"<em>��Ƽ��ä�</em>�ܥ���򲡤�����ƥ᡼����˴����Ƥ�������.\n"
-"<p><em>��ǧ���Ԥ�</em>�ܥ���򲡤���, ����³��, \n"
-"�᡼���ǧ���뤫���ݤ��뤫��Ƚ�Ǥ�, �ʲ�Ԥˤ���ͤ뤳�Ȥˤʤ�ޤ�."
+"<em>��Ƽ��ä�</em>�ܥ���򲡤�����ƥ᡼����˴����Ƥ���������\n"
+"<p><em>��ǧ���Ԥ�</em>�ܥ���򲡤��ȡ�����³����\n"
+"�᡼���ǧ���뤫���ݤ��뤫��Ƚ�Ǥ򡢻ʲ�Ԥˤ���ͤ뤳�Ȥˤʤ�ޤ���"
 
 #: Mailman/Cgi/confirm.py:738
 msgid "Cancel posting"
@@ -1931,13 +1935,13 @@ msgid ""
 "from\n"
 "    this mailing list."
 msgstr ""
-"����������褬���ä���ޤ���. ���ʤ��Υ᡼�륢�ɥ쥹\n"
-"����Υ��顼�᡼�뤬³�����, ���Υ᡼��󥰥ꥹ�Ȥβ������\n"
-"���ä���뤫�⤷��ޤ���."
+"����������褬���ä���ޤ��������ʤ��Υ᡼�륢�ɥ쥹\n"
+"����Υ��顼�᡼�뤬³����硢���Υ᡼��󥰥ꥹ�Ȥβ������\n"
+"���ä���뤫�⤷��ޤ���"
 
 #: Mailman/Cgi/confirm.py:780
 msgid "Membership re-enabled."
-msgstr "����������褷�ޤ���."
+msgstr "����������褷�ޤ�����"
 
 #: Mailman/Cgi/confirm.py:784
 msgid ""
@@ -1946,8 +1950,8 @@ msgid ""
 "            href=\"%(optionsurl)s\">visit your member options page</a>.\n"
 "            "
 msgstr ""
-"%(listname)s �᡼��󥰥ꥹ�Ȥβ���������褵���ޤ���.\n"
-"<a href=\"%(optionsurl)s\">������ץ����ڡ���</a>�ؤɤ���."
+"%(listname)s �᡼��󥰥ꥹ�Ȥβ���������褵���ޤ�����\n"
+"<a href=\"%(optionsurl)s\">������ץ����ڡ���</a>�ؤɤ�����"
 
 #: Mailman/Cgi/confirm.py:796
 msgid "Re-enable mailing list membership"
@@ -1959,9 +1963,9 @@ msgid ""
 "        from this mailing list.  To re-subscribe, please visit the\n"
 "        <a href=\"%(listinfourl)s\">list information page</a>."
 msgstr ""
-"��ǰ�Ǥ���, ���ʤ��Ϥ��Υ᡼��󥰥ꥹ�Ȥ��������񤷤Ƥ��ޤ�.\n"
-"�������񤹤�ˤ�, <a href=\"%(listinfourl)s\">�ꥹ���������ڡ���</a>\n"
-"�ؤɤ���."
+"��ǰ�Ǥ��������ʤ��Ϥ��Υ᡼��󥰥ꥹ�Ȥ��������񤷤Ƥ��ޤ���\n"
+"�������񤹤�ˤϡ�<a href=\"%(listinfourl)s\">�ꥹ���������ڡ���</a>\n"
+"�ؤɤ�����"
 
 #: Mailman/Cgi/confirm.py:828
 msgid "<em>not available</em>"
@@ -1988,9 +1992,9 @@ msgid ""
 "    re-enabling your membership.\n"
 "    "
 msgstr ""
-"���顼�᡼���¿ȯ�ˤ��, %(realname)s �᡼��󥰥ꥹ�ȤǤβ������\n"
-"����, ��ߤ��Ƥ��ޤ�. ���ʤ��Υ᡼�륢�ɥ쥹�ؤ�����\n"
-"�����褵����ˤ�, ��ǧ��ɬ�פǤ�. ���ߤβ������ϰʲ����̤�Ǥ�:\n"
+"���顼�᡼���¿ȯ�ˤ�ꡢ%(realname)s �᡼��󥰥ꥹ�ȤǤβ������\n"
+"���ߡ���ߤ��Ƥ��ޤ������ʤ��Υ᡼�륢�ɥ쥹�ؤ�����\n"
+"�����褵����ˤϡ���ǧ��ɬ�פǤ������ߤβ������ϰʲ����̤�Ǥ�:\n"
 "\n"
 "<ul><li><b>�᡼�륢�ɥ쥹:</b> %(member)s\n"
 " <li><b>���̾:</b> %(username)s\n"
@@ -1999,8 +2003,8 @@ msgstr ""
 "</ul>\n"
 "\n"
 "<em>���������</em>�ܥ���򲡤��ƥ᡼��󥰥ꥹ�ȤΥ᡼�������\n"
-"�Ƴ����Ƥ�������.\n"
-"��Dz���������褵������� <em>���ä�</em>�ܥ���򲡤��Ƥ�������."
+"�Ƴ����Ƥ���������\n"
+"��Dz���������褵������� <em>���ä�</em>�ܥ���򲡤��Ƥ���������"
 
 #: Mailman/Cgi/confirm.py:852
 msgid "Re-enable membership"
@@ -2012,7 +2016,7 @@ msgstr "
 
 #: Mailman/Cgi/create.py:60 Mailman/Cgi/rmlist.py:59
 msgid "Bad URL specification"
-msgstr "URL�ε��Ҥ��ְ�äƤ��ޤ�."
+msgstr "URL�ε��Ҥ��ְ�äƤ��ޤ���"
 
 #: Mailman/Cgi/create.py:75 Mailman/Cgi/rmlist.py:189
 msgid "Return to the "
@@ -2040,11 +2044,11 @@ msgstr "
 
 #: Mailman/Cgi/create.py:126
 msgid "You forgot to enter the list name"
-msgstr "�ꥹ��̾�����Ϥ��Ƥ�������."
+msgstr "�ꥹ��̾�����Ϥ��Ƥ�������"
 
 #: Mailman/Cgi/create.py:130
 msgid "You forgot to specify the list owner"
-msgstr "�ꥹ�ȴ����Ԥ���ꤷ�Ƥ�������."
+msgstr "�ꥹ�ȴ����Ԥ���ꤷ�Ƥ�������"
 
 #: Mailman/Cgi/create.py:137
 msgid ""
@@ -2052,8 +2056,8 @@ msgid ""
 "                blank if you want Mailman to autogenerate the list\n"
 "                passwords."
 msgstr ""
-"�ꥹ�ȤΥѥ���ɤ�ưŪ�� Mailman ���������������Ȥ���, \n"
-"����ѥ����(�ȳ�ǧ)��������ˤ��Ƥ����Ƥ�������."
+"�ꥹ�ȤΥѥ���ɤ�ưŪ�� Mailman ���������������Ȥ��ϡ�\n"
+"����ѥ����(�ȳ�ǧ)��������ˤ��Ƥ����Ƥ���������"
 
 #: Mailman/Cgi/create.py:146
 msgid "Initial list passwords do not match"
@@ -2088,8 +2092,8 @@ msgid ""
 "Some unknown error occurred while creating the list.\n"
 "                Please contact the site administrator for assistance."
 msgstr ""
-"�ꥹ�Ⱥ��������ͳ�����Υ��顼��ȯ�����ޤ���.\n"
-"�����ȴ����Ԥ�Ϣ�����Ƥ�������."
+"�ꥹ�Ⱥ��������ͳ�����Υ��顼��ȯ�����ޤ�����\n"
+"�����ȴ����Ԥ�Ϣ�����Ƥ���������"
 
 #: Mailman/Cgi/create.py:266 bin/newlist:265
 msgid "Your new mailing list: %(listname)s"
@@ -2105,8 +2109,8 @@ msgid ""
 "    <b>%(listname)s</b> and notification has been sent to the list owner\n"
 "    <b>%(owner)s</b>.  You can now:"
 msgstr ""
-"�᡼��󥰥ꥹ��<b>%(listname)s</b>�������,\n"
-"�����Ԥ�<b>%(owner)s</b>�����Τ�����ޤ���.\n"
+"�᡼��󥰥ꥹ��<b>%(listname)s</b>���������\n"
+"�����Ԥ�<b>%(owner)s</b>�����Τ�����ޤ�����\n"
 "����³�� ..."
 
 #: Mailman/Cgi/create.py:285
@@ -2156,19 +2160,19 @@ msgid ""
 "    "
 msgstr ""
 "�ʲ��Υե������ɬ�פʾ���������ƿ������᡼��󥰥ꥹ�Ȥ�\n"
-"��뤳�Ȥ��Ǥ��ޤ�. �᡼��󥰥ꥹ�Ȥ�̾����,\n"
-"�ꥹ�Ȥ���Ƥ���ݤδ��ܥ��ɥ쥹�ˤʤ�ޤ��Τ�,\n"
-"��ʸ���Υ���ե��٥åȤ����Ϥ��Ƥ�������. ������ϥꥹ��̾���ѹ�\n"
-"���뤳�ȤϤǤ��ޤ���. \n"
-"<p>�ޤ�, �ǽ�Υꥹ�ȴ����ԤΥ᡼�륢�ɥ쥹��ɬ�פǤ�.\n"
-"�ꥹ�Ⱥ�����˥ꥹ�Ȥν���ѥ���ɤ������԰�����������ޤ�.\n"
-"�ꥹ�ȴ����Ԥ�, �ѥ���ɤ��ѹ���ꥹ�ȴ����Ԥ��ɲä��Ǥ��ޤ�.</p>\n"
-"<p>Mailman����ưŪ�˽���ѥ���ɤ����������������,\n"
-"���μ�ư�����ǡ֤Ϥ��פ�����, �ѥ����������϶���Τޤޤ�\n"
-"���Ƥ����Ƥ�������.</p>\n"
-"<p>�������᡼��󥰥ꥹ�Ȥ��������ˤ�, �ꥹ�Ⱥ������¤�ɬ�פǤ�.\n"
-"�����Ȥˤ�<em>�ꥹ�Ⱥ�����</em>�Υѥ���ɤ���ֲ���������Ϥ��Ƥ�������.\n"
-"�����ȴ����ԤΥѥ���ɤ�Ȥ��ޤ�."
+"��뤳�Ȥ��Ǥ��ޤ����᡼��󥰥ꥹ�Ȥ�̾���ϡ�\n"
+"�ꥹ�Ȥ���Ƥ���ݤδ��ܥ��ɥ쥹�ˤʤ�ޤ��Τǡ�\n"
+"��ʸ���Υ���ե��٥åȤ����Ϥ��Ƥ���������������ϥꥹ��̾���ѹ�\n"
+"���뤳�ȤϤǤ��ޤ���\n"
+"<p>�ޤ����ǽ�Υꥹ�ȴ����ԤΥ᡼�륢�ɥ쥹��ɬ�פǤ���\n"
+"�ꥹ�Ⱥ�����˥ꥹ�Ȥν���ѥ���ɤ������԰�����������ޤ���\n"
+"�ꥹ�ȴ����Ԥϡ��ѥ���ɤ��ѹ���ꥹ�ȴ����Ԥ��ɲä��Ǥ��ޤ���</p>\n"
+"<p>Mailman����ưŪ�˽���ѥ���ɤ���������������С�\n"
+"���μ�ư�����ǡ֤Ϥ��פ����ӡ��ѥ����������϶���Τޤޤ�\n"
+"���Ƥ����Ƥ���������</p>\n"
+"<p>�������᡼��󥰥ꥹ�Ȥ��������ˤϡ��ꥹ�Ⱥ������¤�ɬ�פǤ���\n"
+"�����Ȥˤ�<em>�ꥹ�Ⱥ�����</em>�Υѥ���ɤ���ֲ���������Ϥ��Ƥ���������\n"
+"�����ȴ����ԤΥѥ���ɤ�Ȥ��ޤ���"
 
 #: Mailman/Cgi/create.py:342
 msgid "List Identity"
@@ -2206,8 +2210,8 @@ msgid ""
 "    new member postings for moderator approval by default."
 msgstr ""
 "̵��ǧ�Ǥ���Ƥ���Ĥ���ޤǿ�������Υ���ޤ���? \n"
-"<em>�Ϥ�</em>�����֤�, ���������Ƥ˾�ǧ��ɬ�פ�\n"
-"�����դ�����Ȥ�����Ͽ����ޤ�."
+"<em>�Ϥ�</em>�����֤ȡ����������Ƥ˾�ǧ��ɬ�פ�\n"
+"�����դ�����Ȥ�����Ͽ����ޤ���"
 
 #: Mailman/Cgi/create.py:425
 msgid ""
@@ -2215,9 +2219,9 @@ msgid ""
 "        select at least one initial language, the list will use the server\n"
 "        default language of %(deflang)s"
 msgstr ""
-"���Ѥ������ν������. <p>\n"
+"���Ѥ������ν�����ꡣ<p>\n"
 "��ά����ȥ����Ф����ꤵ��Ƥ���ǥե���Ȥθ����%(deflang)s�ˤ�Ŭ�Ѥ����"
-"��."
+"����"
 
 #: Mailman/Cgi/create.py:436
 msgid "Send \"list created\" email to list owner?"
@@ -2305,49 +2309,53 @@ msgstr "
 
 #: Mailman/Cgi/edithtml.py:76
 msgid "List name is required."
-msgstr "�ꥹ�Ȥ�̾����ɬ�פǤ�."
+msgstr "�ꥹ�Ȥ�̾����ɬ�פǤ���"
 
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr "%(realname)s -- %(template_info)s �� HTML ���Խ�"
 
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr "HTML���Խ� : ���顼"
 
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr "%(safetemplatename)s: ����(�ƥ�ץ졼��)��̵���Ǥ�"
 
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr "%(realname)s -- HTML �ڡ������Խ�"
 
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr "�Խ�����ڡ���������Ǥ�������:"
 
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "�ꥹ���������α������Խ�"
 
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr "�Խ�����ƥ�ץ졼�Ȥθ��������"
+
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "�ѹ����Ǥ����� ..."
 
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "�ѹ�������"
 
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
-msgstr "HTML �ڡ��������ˤ��뤳�ȤϤǤ��ޤ���."
+msgstr "HTML �ڡ��������ˤ��뤳�ȤϤǤ��ޤ���"
 
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
-msgstr "HTML ���ѹ�����ޤ���Ǥ���."
+msgstr "HTML ���ѹ�����ޤ���Ǥ�����"
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2355,26 +2363,26 @@ msgid ""
 "must have shell access to your Mailman server.\n"
 "             "
 msgstr ""
-"���ʤ�����¸�����ڡ����ˤ�, �桼���򥯥��������ȥ�����ץȹ����\n"
-"���餹�褦�ʵ��路�� HTML�����ɤ��ޤޤ�Ƥ��ޤ�.���Τ���, �ѹ��ϵѲ����ޤ�"
-"��. �⤷, �ɤ����Ƥ��ѹ���ɬ�פǤ����, \n"
-"Mailman �����Ф˥����륢���������ʤ���Фʤ�ޤ���.\n"
+"���ʤ�����¸�����ڡ����ˤϡ��桼���򥯥��������ȥ�����ץȹ����\n"
+"���餹�褦�ʵ��路�� HTML�����ɤ��ޤޤ�Ƥ��ޤ������Τ��ᡢ�ѹ��ϵѲ����ޤ�"
+"�����⤷���ɤ����Ƥ��ѹ���ɬ�פǤ���С�\n"
+"Mailman �����Ф˥����륢���������ʤ���Фʤ�ޤ���\n"
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr "����:"
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr "FAQ 4.48."
 
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 msgid "Page Unchanged."
-msgstr "�ڡ������ѹ�����ޤ���Ǥ���."
+msgstr "�ڡ������ѹ�����ޤ���Ǥ�����"
 
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
-msgstr "HTML ���ѹ�����λ���ޤ���."
+msgstr "HTML ���ѹ�����λ���ޤ�����"
 
 #: Mailman/Cgi/listinfo.py:89
 msgid "%(hostname)s Mailing Lists"
@@ -2386,7 +2394,7 @@ msgid ""
 "            %(mailmanlink)s mailing lists on %(hostname)s."
 msgstr ""
 "<p>���� %(hostname)s �dz����˸�������Ƥ��� %(mailmanlink)s \n"
-"�᡼��󥰥ꥹ�ȤϤ���ޤ���. "
+"�᡼��󥰥ꥹ�ȤϤ���ޤ���"
 
 #: Mailman/Cgi/listinfo.py:131
 msgid ""
@@ -2397,9 +2405,9 @@ msgid ""
 "preferences\n"
 "            on your subscription."
 msgstr ""
-"<p>���� %(hostname)s �Ǹ�������Ƥ���᡼��󥰥ꥹ�Ȥϰʲ����̤�Ǥ�. \n"
-"�ꥹ��̾�򥯥�å������, �ܤ�������������������ˡ, \n"
-"������ץ������ѹ���ˡ�ʤɤ����ܤ��줿����ڡ����˰�ư���ޤ�. "
+"<p>���� %(hostname)s �Ǹ�������Ƥ���᡼��󥰥ꥹ�Ȥϰʲ����̤�Ǥ���\n"
+"�ꥹ��̾�򥯥�å�����ȡ��ܤ�������������������ˡ��\n"
+"������ץ������ѹ���ˡ�ʤɤ����ܤ��줿����ڡ����˰�ư���ޤ���"
 
 #: Mailman/Cgi/listinfo.py:137
 msgid "right"
@@ -2412,8 +2420,8 @@ msgid ""
 "        list name appended.\n"
 "        <p>List administrators, you can visit "
 msgstr ""
-"ɽ������Ƥ��ʤ��ꥹ�Ȥ��������Υڡ����ؤΰ�ư��, ���Υڡ����� URL ��\n"
-"'/' �ȥꥹ�Ȥ�̾�� %(adj)s ���դ���URL�򳫤��Ƥ�������.\n"
+"ɽ������Ƥ��ʤ��ꥹ�Ȥ��������Υڡ����ؤΰ�ư�ϡ����Υڡ����� URL ��\n"
+"'/' �ȥꥹ�Ȥ�̾�� %(adj)s ���դ���URL�򳫤��Ƥ���������\n"
 "<p>�ꥹ�ȴ����Ԥ�"
 
 #: Mailman/Cgi/listinfo.py:145
@@ -2425,49 +2433,49 @@ msgid ""
 " to find the management interface for your list.\n"
 "         <p>If you are having trouble using the lists, please contact "
 msgstr ""
-" �Ǽ�ʬ�δ����ڡ�����õ���Ƥ�������.\n"
-"<p>�ꥹ�Ȥ����Ѥ˴ؤ���ȥ�֥��, ���ΰ����Ϣ�����Ƥ�������: "
+" �Ǽ�ʬ�δ����ڡ�����õ���Ƥ���������\n"
+"<p>�ꥹ�Ȥ����Ѥ˴ؤ���ȥ�֥�ϡ����ΰ����Ϣ�����Ƥ�������: "
 
 #: Mailman/Cgi/listinfo.py:235
 msgid "Edit Options"
 msgstr "���ץ������Խ�"
 
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "ɽ������"
 
 #: Mailman/Cgi/listinfo.py:248
 msgid "This form requires JavaScript."
-msgstr "���Υե�����Ǥ�JavaScript��ͭ���ˤ���ɬ�פ�����ޤ�."
+msgstr "���Υե�����Ǥ�JavaScript��ͭ���ˤ���ɬ�פ�����ޤ���"
 
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "CGI ������ץȥ��顼"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr "HTTP�ꥯ�����ȤΥ᥽�åɤ������Ǥ�: %(method)s"
 
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "���ɥ쥹�����Ϥ���Ƥ��ޤ���"
 
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "���ѤǤ��ʤ��᡼�륢�ɥ쥹: %(safeuser)s"
 
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr "���Τ褦�ʲ���Ϥ��ޤ���: %(safeuser)s."
 
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr "���ʤ����ꥹ�Ȳ���Ǥ���С���ǧ�᡼����������ޤ�����"
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
 "             forwarded to the list administrator for approval."
@@ -2475,62 +2483,62 @@ msgstr ""
 "���ʤ����ꥹ�Ȳ���Ǥ���С���ǧ��³���Τ�����������ꥹ�ȴ����Ԥ�ž����"
 "�ޤ�����"
 
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 msgid ""
 "If you are a list member,\n"
 "            your password has been emailed to you."
 msgstr "���ʤ����ꥹ�Ȳ���Ǥ���С��ѥ������˺���Τ��������ޤ�����"
 
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "ǧ�ڼ���"
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
-msgstr "�ѥ������˺���Τ��������ޤ���."
+msgstr "�ѥ������˺���Τ��������ޤ�����"
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
 msgstr ""
 "�ꥹ�ȴ����ԤϤ��β���ˤĤ���¾����������򸫤뤳�Ȥ�\n"
-"�Ǥ��ޤ���."
+"�Ǥ��ޤ���"
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr "����:"
 
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr "%(hostname)s �Ǥ� %(safeuser)s ����Υꥹ�Ȳ����Ͽ����"
 
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
 msgstr ""
-"��󥯤򥯥�å������, ���Υ᡼��󥰥ꥹ�ȤΥ��ץ����ڡ����˰�ư���ޤ�."
+"��󥯤򥯥�å�����ȡ����Υ᡼��󥰥ꥹ�ȤΥ��ץ����ڡ����˰�ư���ޤ���"
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
 "            subscription for this mailing list has been changed."
 msgstr ""
-"�ꥹ�ȴ����Ԥ�, ���β����¾�Υꥹ�Ȥˤ�������̾��᡼�륢�ɥ쥹��\n"
-"�ѹ����뤳�ȤϤǤ��ޤ���. ������, ���Υꥹ�ȤˤĤ��Ƥ��ѹ����ޤ���."
+"�ꥹ�ȴ����Ԥϡ����β����¾�Υꥹ�Ȥˤ�������̾��᡼�륢�ɥ쥹��\n"
+"�ѹ����뤳�ȤϤǤ��ޤ��󡣤�����, ���Υꥹ�ȤˤĤ��Ƥ��ѹ����ޤ�����"
 
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "���ɥ쥹�����פ��ޤ���"
 
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
-msgstr "���ˤ��Υ᡼�륢�ɥ쥹�����񤷤Ƥ��ޤ�."
+msgstr "���ˤ��Υ᡼�륢�ɥ쥹�����񤷤Ƥ��ޤ���"
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 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 "
@@ -2538,107 +2546,107 @@ msgid ""
 "address.  Upon confirmation, any other mailing list containing the address\n"
 "%(safeuser)s will be changed. "
 msgstr ""
-"���������ɥ쥹�Ȥ��ƻ��ꤵ�줿 %(newaddr)s ��, ���� %(listname)s ��\n"
-"�������Ͽ����Ƥ��ޤ�. ������, �������ѹ��פ����ꤵ��Ƥ��뤿��,\n"
-"��ǧ�ξ�, %(safeuser)s ��¾�Τ��٤ƤΥꥹ�Ȥ���Ͽ����Ƥ��륢�ɥ쥹��\n"
-"�ѹ����ޤ�."
+"���������ɥ쥹�Ȥ��ƻ��ꤵ�줿 %(newaddr)s �ϡ����� %(listname)s ��\n"
+"�������Ͽ����Ƥ��ޤ������������������ѹ��פ����ꤵ��Ƥ��뤿�ᡢ\n"
+"��ǧ�ξ塢%(safeuser)s ��¾�Τ��٤ƤΥꥹ�Ȥ���Ͽ����Ƥ��륢�ɥ쥹��\n"
+"�ѹ����ޤ���"
 
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "���������ɥ쥹�ϴ�������ѤߤǤ�: %(newaddr)s"
 
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "���ɥ쥹�������Ƥ�������"
 
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
-msgstr "%(newaddr)s ���˳�ǧ�᡼����������ޤ���."
+msgstr "%(newaddr)s ���˳�ǧ�᡼����������ޤ�����"
 
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "�������ʤ��᡼�륢�ɥ쥹�����Ϥ���ޤ���"
 
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "�����ʥ᡼�륢�ɥ쥹�����Ϥ���ޤ���"
 
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
-msgstr "%(newaddr)s �ϴ�������ѤߤǤ�."
+msgstr "%(newaddr)s �ϴ�������ѤߤǤ���"
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
 "                      think this restriction is erroneous, please contact\n"
 "                      the list owners at %(owneraddr)s."
 msgstr ""
-"%(newaddr)s �Υ᡼�륢�ɥ쥹�Ǥ�����϶ػߤ���Ƥ��ޤ�. \n"
+"%(newaddr)s �Υ᡼�륢�ɥ쥹�Ǥ�����϶ػߤ���Ƥ��ޤ���\n"
 "�����������¤�����Ͽ�ˤ���ΤȻפ������\n"
 "���Υꥹ�ȴ����԰��ˤ�Ϣ����������: %(owneraddr)s"
 
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
-msgstr "���̾���ѹ����ޤ���."
+msgstr "���̾���ѹ����ޤ�����"
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 msgid ""
 "The list administrator may not change the\n"
 "                    password for a user."
 msgstr ""
 "�ꥹ�ȴ����Ԥ�¾�Υꥹ�ȤˤĤ��Ƥ�\n"
-"����ѥ�����ѹ��ϤǤ��ޤ���."
+"����ѥ�����ѹ��ϤǤ��ޤ���"
 
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "�ѥ���ɤ����Ϥ��Ƥ�������"
 
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "�ѥ���ɤ����פ��ޤ���"
 
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 msgid ""
 "The list administrator may not change the\n"
 "            password for this user's other subscriptions.  However, the\n"
 "            password for this mailing list has been changed."
 msgstr ""
-"�ꥹ�ȴ����Ԥ�¾�Υꥹ�ȤˤĤ��Ƥβ���ѥ�����ѹ��ϤǤ��ޤ���.\n"
-"������, ���Υ᡼��󥰥ꥹ�ȤΥѥ���ɤ��ѹ����ޤ���."
+"�ꥹ�ȴ����Ԥ�¾�Υꥹ�ȤˤĤ��Ƥβ���ѥ�����ѹ��ϤǤ��ޤ���\n"
+"�����������Υ᡼��󥰥ꥹ�ȤΥѥ���ɤ��ѹ����ޤ�����"
 
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
-msgstr "�ѥ���ɤ��ѹ����ޤ���."
+msgstr "�ѥ���ɤ��ѹ����ޤ�����"
 
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
 "                have not been unsubscribed!"
 msgstr ""
-"�����ǧ���뤿���, <em>���</em>�ܥ���β��Υ����å��ܥå�����\n"
-"�����å����Ƥ�������. �������Ǥ��������ϴ�λ���Ƥ��ޤ���!"
+"�����ǧ���뤿��ˡ�<em>���</em>�ܥ���β��Υ����å��ܥå�����\n"
+"�����å����Ƥ����������������Ǥ��������ϴ�λ���Ƥ��ޤ���!"
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 msgid "via the member options page"
 msgstr "������ץ����Υڡ������"
 
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "�����"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
 "            receive notification once the list moderators have made their\n"
 "            decision."
 msgstr ""
-"�������������, �ꥹ�Ȼʲ�Ԥ�ž�����ޤ���. \n"
-"�����˴ؤ������θ�, ��̤�᡼������Τ��ޤ�."
+"������������ꡢ�ꥹ�Ȼʲ�Ԥ�ž�����ޤ�����\n"
+"�����˴ؤ������θ塢��̤�᡼������Τ��ޤ���"
 
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -2647,99 +2655,99 @@ msgid ""
 "            about your unsubscription, please contact the list owners at\n"
 "            %(owneraddr)s."
 msgstr ""
-"%(fqdn_listname)s �᡼��󥰥ꥹ�Ȥ������������λ���ޤ���.\n"
-"�ޤȤ��ɤߤ����ꤷ�Ƥ�����, �Ǹ�ΤޤȤ��ɤߥ᡼�뤬�Ϥ����⤷��ޤ���.\n"
-"���˴ؤ��Ƽ��䤬�����, �ꥹ�ȴ����Ԥ� %(owneraddr)s �ޤǤ��ꤤ���ޤ�."
+"%(fqdn_listname)s �᡼��󥰥ꥹ�Ȥ������������λ���ޤ�����\n"
+"�ޤȤ��ɤߤ����ꤷ�Ƥ����硢�Ǹ�ΤޤȤ��ɤߥ᡼�뤬�Ϥ����⤷��ޤ���\n"
+"���˴ؤ��Ƽ��䤬����С��ꥹ�ȴ����Ԥ� %(owneraddr)s �ޤǤ��ꤤ���ޤ���"
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
 "                options for this mailing list subscription has been\n"
 "                changed."
 msgstr ""
-"�ꥹ�ȴ����Ԥ�, ���β����¾�Υꥹ�Ȥˤ����륪�ץ������ѹ����뤳�Ȥ�\n"
-"�Ǥ��ޤ���. ������, ���Υꥹ�ȤǤΥ��ץ������ѹ����ޤ���."
+"�ꥹ�ȴ����Ԥϡ����β����¾�Υꥹ�Ȥˤ����륪�ץ������ѹ����뤳�Ȥ�\n"
+"�Ǥ��ޤ��󡣤����������Υꥹ�ȤǤΥ��ץ������ѹ����ޤ�����"
 
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
 "your\n"
 "            other options have been set successfully."
 msgstr ""
-"�����Ԥ��֤ޤȤ��ɤߡפؤ��ѹ���ػߤ��Ƥ���Τ�,\n"
-"  �������ץ������ѹ��Ǥ��ޤ���Ǥ���.\n"
-"  ����¾�Υ��ץ�����������ѹ����ޤ���."
+"�����Ԥ��֤ޤȤ��ɤߡפؤ��ѹ���ػߤ��Ƥ���Τǡ�\n"
+"  �������ץ������ѹ��Ǥ��ޤ���Ǥ�����\n"
+"  ����¾�Υ��ץ�����������ѹ����ޤ�����"
 
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
 "However\n"
 "            your other options have been set successfully."
 msgstr ""
-"�����Ԥ������������פؤ��ѹ���ػߤ��Ƥ���Τ�, \n"
-"  �������ץ������ѹ��Ǥ��ޤ���Ǥ���.\n"
-"  ����¾�Υ��ץ����������ѹ�����λ���ޤ���."
+"�����Ԥ������������פؤ��ѹ���ػߤ��Ƥ���Τǡ�\n"
+"  �������ץ������ѹ��Ǥ��ޤ���Ǥ�����\n"
+"  ����¾�Υ��ץ����������ѹ�����λ���ޤ�����"
 
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
-msgstr "���ץ����������ѹ�����λ���ޤ���."
+msgstr "���ץ����������ѹ�����λ���ޤ�����"
 
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
-msgstr "�Ǹ�Ρ֤ޤȤ��ɤߡפ��Ϥ����⤷��ޤ���."
+msgstr "�Ǹ�Ρ֤ޤȤ��ɤߡפ��Ϥ����⤷��ޤ���"
 
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
-msgstr "<em>�Ϥ�, ��������񤷤ޤ�</em>"
+msgstr "<em>�Ϥ�����������񤷤ޤ�</em>"
 
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "�ѥ�����ѹ�"
 
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "¾�Υꥹ�Ȥؤ��������"
 
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "�ѥ���ɤ�᡼������äƤ�������"
 
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "�ѥ����"
 
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "����������"
 
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "�ѹ�������"
 
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "��"
 
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "��"
 
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr "%(days)d %(units)s"
 
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "���ɥ쥹��̾�����ѹ�"
 
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "<em>���꤬�������Ƥ��ޤ���</em>"
 
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
@@ -2747,21 +2755,21 @@ msgid ""
 msgstr ""
 "\n"
 "<em>%(cpuser)s</em>�Ȥ������񤷤ޤ���.\n"
-"����̾������ʸ���Ⱦ�ʸ���ζ��̤���¸����ޤ�."
+"����̾������ʸ���Ⱦ�ʸ���ζ��̤���¸����ޤ���"
 
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "%(realname)s �ꥹ��: ������ץ�����������ڡ���"
 
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "�᡼�륢�ɥ쥹��"
 
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr "%(realname)s�ꥹ��: %(safeuser)s ������ץ����"
 
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -2778,30 +2786,30 @@ msgid ""
 "    effect.\n"
 "    "
 msgstr ""
-"������ץ������ѹ�����ˤ�, �ޤ�, ���Υե������\n"
-"%(extra)s����ѥ���ɤ�����ƥ������󤷤Ƥ�������. ����ѥ����\n"
-"���狼��ʤ��Ȥ���, ���Υܥ���򥯥�å�����ȥ᡼��ǥѥ���ɤ�\n"
-"����ޤ�. �ޤ�, ���Υꥹ�Ȥ�����񤷤����Ȥ���, <em>���</em>\n"
-"�ܥ���򥯥�å����Ƥ�������. ����ǧ�Υ᡼�������ޤ�. \n"
+"������ץ������ѹ�����ˤϡ��ޤ������Υե������\n"
+"%(extra)s����ѥ���ɤ�����ƥ������󤷤Ƥ�������������ѥ����\n"
+"���狼��ʤ��Ȥ��ϡ����Υܥ���򥯥�å�����ȥ᡼��ǥѥ���ɤ�\n"
+"����ޤ����ޤ������Υꥹ�Ȥ�����񤷤����Ȥ��ϡ�<em>���</em>\n"
+"�ܥ���򥯥�å����Ƥ�������������ǧ�Υ᡼�������ޤ���\n"
 "\n"
-"<p><strong><em>����:</em></strong> ���λ����������, �֥饦����\n"
-"���å�����ͭ���ˤ��Ƥ����Ƥ�������. ���å�����̵���ˤ����, \n"
-"�ѹ����Ǥ��ޤ���. \n"
+"<p><strong><em>����:</em></strong> ���λ���������ϡ��֥饦����\n"
+"���å�����ͭ���ˤ��Ƥ����Ƥ������������å�����̵���ˤ���ȡ�\n"
+"�ѹ����Ǥ��ޤ���\n"
 "   "
 
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "�᡼�륢�ɥ쥹:"
 
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "�ѥ����:"
 
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "��������"
 
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -2809,43 +2817,43 @@ msgid ""
 "    also confirm by email; see the instructions in the confirmation\n"
 "    message)."
 msgstr ""
-"<em>���</em>�ܥ���򥯥�å������, ��ǧ�Υ᡼�뤬�ܿͰ�����������ޤ�.\n"
-"���Υ᡼��˽񤫤�Ƥ����󥯤򥯥�å����������������λ���ޤ�. \n"
-"(�᡼��dz�ǧ���뤳�Ȥ�Ǥ��ޤ�; �ܤ�����, �᡼��λؼ����ɤߤ�������). "
+"<em>���</em>�ܥ���򥯥�å�����ȡ���ǧ�Υ᡼�뤬�ܿͰ�����������ޤ���\n"
+"���Υ᡼��˽񤫤�Ƥ����󥯤򥯥�å����������������λ���ޤ���\n"
+"(�᡼��dz�ǧ���뤳�Ȥ�Ǥ��ޤ�; �ܤ����ϡ��᡼��λؼ����ɤߤ�������)��"
 
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "�ѥ������˺����"
 
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
 msgstr ""
-"<em>��˺����</em>�ܥ���򥯥�å������, \n"
-"�ѥ���ɤ��᡼�����������ޤ�."
+"<em>��˺����</em>�ܥ���򥯥�å�����ȡ�\n"
+"�ѥ���ɤ��᡼�����������ޤ���"
 
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "��˺����"
 
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr "<����ޤ���>"
 
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "�׵ᤵ�줿�����̵���Ǥ�: %(topicname)s"
 
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "����ե��륿�ξܺ�"
 
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "̾��:"
 
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr "�ѥ�����(����ɽ���ǻ���):"
 
@@ -2855,11 +2863,11 @@ msgstr "
 
 #: Mailman/Cgi/private.py:65
 msgid "You must specify a list."
-msgstr "�ꥹ�Ȥ���ꤷ�Ƥ�������."
+msgstr "�ꥹ�Ȥ���ꤷ�Ƥ���������"
 
 #: Mailman/Cgi/private.py:72
 msgid "Private archive - \"./\" and \"../\" not allowed in URL."
-msgstr "���������¸��� - \"./\" �� \"../\" �� URL ������뤳�ȤϤǤ��ޤ���."
+msgstr "���������¸��� - \"./\" �� \"../\" �� URL ������뤳�ȤϤǤ��ޤ���"
 
 #: Mailman/Cgi/private.py:109
 msgid "Private Archive Error - %(msg)s"
@@ -2869,7 +2877,9 @@ msgstr "
 msgid ""
 "If you are a list member,\n"
 "                          your password has been emailed to you."
-msgstr "�ѥ������˺���Τ��������ޤ���."
+msgstr ""
+"���ʤ�������ʤ顢\n"
+"�ѥ���ɤ�᡼����������ޤ�����"
 
 #: Mailman/Cgi/private.py:161
 msgid "Please enter your email address"
@@ -2877,7 +2887,7 @@ msgstr "
 
 #: Mailman/Cgi/private.py:222
 msgid "Private archive file not found"
-msgstr "���������¸�ե����뤬���Ĥ���ޤ���."
+msgstr "���������¸�ե����뤬���Ĥ���ޤ���"
 
 #: Mailman/Cgi/rmlist.py:76
 msgid "No such list %(safelistname)s"
@@ -2899,7 +2909,7 @@ msgstr "
 msgid ""
 "You have successfully deleted the mailing list\n"
 "    <b>%(listname)s</b>."
-msgstr "�᡼��󥰥ꥹ�� <b>%(listname)s</b> �κ������λ���ޤ���."
+msgstr "�᡼��󥰥ꥹ�� <b>%(listname)s</b> �κ������λ���ޤ�����"
 
 #: Mailman/Cgi/rmlist.py:184
 msgid ""
@@ -2908,8 +2918,8 @@ msgid ""
 "%(sitelist)s\n"
 "        for details."
 msgstr ""
-"<b>%(listname)s �᡼��󥰥ꥹ�Ȥ�������ݤ����꤬ȯ�����ޤ���.\n"
-"%(sitelist)s �Υ����ȴ����Ԥ�Ϣ�����Ƥ�������."
+"<b>%(listname)s �᡼��󥰥ꥹ�Ȥ�������ݤ����꤬ȯ�����ޤ�����\n"
+"%(sitelist)s �Υ����ȴ����Ԥ�Ϣ�����Ƥ���������"
 
 #: Mailman/Cgi/rmlist.py:201
 msgid "Permanently remove mailing list <em>%(realname)s</em>"
@@ -2941,19 +2951,20 @@ msgid ""
 "    <p>For your safety, you will be asked to reconfirm the list password.\n"
 "    "
 msgstr ""
-"���Υڡ�����, �ꥹ�ȴ����Ԥˤ��᡼��󥰥ꥹ�Ⱥ���Υڡ����Ǥ�.\n"
-"<strong>���κ�ȤϤ��ľ�����Ǥ��ޤ���</strong>.\n"
-"���Υ᡼��󥰥ꥹ�Ȥ����Ǥ���Ū��ã����, ��Ϥ����פǤ����\n"
-"�ο����Ƥ�����Τ�, �¹Ԥ��Ƥ�������.\n"
-"<p>�ޤ�, ���ε�ǽ��¹Ԥ��Ƥ�, �����ʤ�ٹ��ꥹ�Ȳ���ˤ������ޤ���.\n"
-"�Ĥޤ�, ����, �᡼��󥰥ꥹ�Ȱ��Υ᡼���, \n"
-"�ꥹ�Ȥδ�����ο����᡼��ʤɤϤ��٤ƥ��顼�ˤʤ�ޤ�.\n"
-"<p>�᡼��󥰥ꥹ�Ȥ���¸��ˤ�Ʊ���˺�����륪�ץ���󤬤���ޤ�.\n"
-"�᡼��󥰥ꥹ�Ȥε�Ͽ����¸���Ƥ��������, ��¸��ˤ���<strong>���ʤ�</"
+"���Υڡ�����, �ꥹ�ȴ����Ԥˤ��᡼��󥰥ꥹ�Ⱥ���Υڡ����Ǥ���\n"
+"<strong>���ν����ϸ����᤹���Ȥ��Ǥ��ޤ���</strong>��\n"
+"�Ǥ��Τǡ����Υ᡼��󥰥ꥹ�Ȥ����Ӥ��������򤷡��ޤ����Υꥹ�Ȥ��⤦����"
+"�Ǥ����\n"
+"�����ˤ狼�äƤ��ʤ��¤�ϼ¹Ԥ��٤��ǤϤ���ޤ���\n"
+"<p>�ޤ������ε�ǽ��¹Ԥ��Ƥ⡢�����ʤ�ٹ��ꥹ�Ȳ���ˤ������ޤ���\n"
+"�Ĥޤꡢ���塢�᡼��󥰥ꥹ�Ȱ��Υ᡼��䡢\n"
+"�ꥹ�Ȥδ�����ο����᡼��ʤɤϤ��٤ƥ��顼�ˤʤ�ޤ���\n"
+"<p>�᡼��󥰥ꥹ�Ȥ���¸��ˤ�Ʊ���˺�����륪�ץ���󤬤���ޤ���\n"
+"�᡼��󥰥ꥹ�Ȥε�Ͽ����¸���Ƥ�������ˡ���¸��ˤ���<strong>���ʤ�</"
 "strong>\n"
-"���Ȥ򤪴��ᤷ�ޤ�.\n"
-"<p>�ʤ�, �����Τ���ˤ⤦���٤����ǥꥹ�ȴ����ѥ���ɤ����Ϥ��Ƥ���������"
-"��."
+"���Ȥ򤪴��ᤷ�ޤ���\n"
+"<p>�ʤ��������Τ���ˤ⤦���٤����ǥꥹ�ȴ����ѥ���ɤ����Ϥ��Ƥ���������"
+"����"
 
 #: Mailman/Cgi/rmlist.py:236
 msgid "List password:"
@@ -2977,11 +2988,11 @@ msgstr "CGI
 
 #: Mailman/Cgi/roster.py:118
 msgid "%(realname)s roster authentication failed."
-msgstr "%(realname)s ���̾�� ǧ�ڤ˼���"
+msgstr "%(realname)s ���̾�� ǧ�ڤ˼��ԡ�"
 
 #: Mailman/Cgi/subscribe.py:128
 msgid "You must supply a valid email address."
-msgstr "ͭ���ʥ᡼�륢�ɥ쥹�����Ϥ��Ƥ�������."
+msgstr "ͭ���ʥ᡼�륢�ɥ쥹�����Ϥ��Ƥ���������"
 
 #: Mailman/Cgi/subscribe.py:153
 msgid "reCAPTCHA validation failed: %(e_codes)s"
@@ -3017,11 +3028,11 @@ msgstr "
 
 #: Mailman/Cgi/subscribe.py:203
 msgid "If you supply a password, you must confirm it."
-msgstr "�ѥ���ɤ����Ϥ������, ��ǧ���Ϥ�ɬ�פǤ�."
+msgstr "�ѥ���ɤ����Ϥ�����ϡ���ǧ���Ϥ�ɬ�פǤ���"
 
 #: Mailman/Cgi/subscribe.py:205
 msgid "Your passwords did not match."
-msgstr "�ѥ���ɤ����פ��ޤ���."
+msgstr "�ѥ���ɤ����פ��ޤ���"
 
 #: Mailman/Cgi/subscribe.py:239
 msgid ""
@@ -3032,10 +3043,11 @@ msgid ""
 "moderator.  If confirmation is required, you will soon get a confirmation\n"
 "email which contains further instructions."
 msgstr ""
-"������������դ��ޤ���. �����˽������ޤ�.\n"
-"���Υ᡼��󥰥ꥹ�Ȥ�����ˤ�äưۤʤ�ޤ���,\n"
-"�������Ƴ�ǧ�Υ᡼������ꤹ�뤫, ���뤤�ϥꥹ�Ȼʲ�Ԥ�������ǧ���ޤ�.\n"
-"��ǧ��ɬ�פʤȤ���, �����ˡ��񤤤���ǧ�᡼������ꤷ�ޤ�."
+"������������դ��ޤ����������˽������ޤ���\n"
+"�᡼��󥰥ꥹ�Ȥ����꤬�ɤ��ʤäƤ��뤫�ˤ��ޤ�����\n"
+"�������Ƴ�ǧ�Υ᡼������ꤹ�뤫�����뤤�ϥꥹ�Ȼʲ�Ԥ�������ǧ����"
+"����\n"
+"��ǧ��ɬ�פʤȤ��ϡ������ˡ��񤤤���ǧ�᡼������ꤷ�ޤ���"
 
 #: Mailman/Cgi/subscribe.py:253
 msgid ""
@@ -3043,7 +3055,7 @@ msgid ""
 "        mailing list.  If you think this restriction is erroneous, please\n"
 "        contact the list owners at %(listowner)s."
 msgstr ""
-"�������줿�᡼�륢�ɥ쥹�Ǥ�����϶ػߤ���Ƥ��ޤ�. \n"
+"�������줿�᡼�륢�ɥ쥹�Ǥ�����϶ػߤ���Ƥ��ޤ���\n"
 "�����������¤�����Ͽ�ˤ���ΤȻפ������\n"
 "���Υꥹ�ȴ����԰��ˤ�Ϣ����������: %(listowner)s"
 
@@ -3052,14 +3064,14 @@ msgid ""
 "The email address you supplied is not valid.  (E.g. it must contain an\n"
 "`@'.)"
 msgstr ""
-"���Ϥ��줿�᡼�륢�ɥ쥹�η���������������ޤ���. (���Ȥ��� `@' ���ʤ��ʤ�.)"
+"���Ϥ��줿�᡼�륢�ɥ쥹�η���������������ޤ���(���Ȥ��� `@' ���ʤ��ʤɡ�)"
 
 #: Mailman/Cgi/subscribe.py:261
 msgid ""
 "Your subscription is not allowed because the email address you gave is\n"
 "insecure."
 msgstr ""
-"���Ϥ��줿�᡼�륢�ɥ쥹�ˤϥ������ƥ�������꤬���뤿��, \n"
+"���Ϥ��줿�᡼�륢�ɥ쥹�ˤϥ������ƥ�������꤬���뤿�ᡢ\n"
 "�������ϼ����դ����ޤ���Ǥ���."
 
 #: Mailman/Cgi/subscribe.py:269
@@ -3069,10 +3081,10 @@ msgid ""
 "%(email)s.  Please note your subscription will not start until you confirm\n"
 "your subscription."
 msgstr ""
-"¾�ͤ�̵�Ǥ�������Ͽ���뤳�Ȥ��ɤ������,\n"
-"�ܿͤΥ᡼�륢�ɥ쥹�Ǥγ�ǧ��ɬ�פǤ�. �����������\n"
-"%(email)s ������������᡼��λؼ��˽��äƤ�������.\n"
-"�ܿͤˤ���������γ�ǧ���ʤ��������Ǥ��ޤ���ΤǤ����դ�������."
+"¾�ͤ�̵�Ǥ�������Ͽ���뤳�Ȥ��ɤ�����ˡ�\n"
+"�ܿͤΥ᡼�륢�ɥ쥹�Ǥγ�ǧ��ɬ�פǤ��������������\n"
+"%(email)s ������������᡼��λؼ��˽��äƤ���������\n"
+"�ܿͤˤ���������γ�ǧ���ʤ��������Ǥ��ޤ���ΤǤ����դ���������"
 
 #: Mailman/Cgi/subscribe.py:281
 msgid ""
@@ -3082,13 +3094,13 @@ msgid ""
 "the\n"
 "moderator's decision when they get to your request."
 msgstr ""
-"%(x)s ����ͳ��������������Ǥ��Ƥ��ޤ�.\n"
-"������ꥹ�Ȼʲ�Ԥ�ž�����ޤ����Τ�, �ʲ�Ԥ��᡼��������ä���, \n"
-"�����˴ؤ�������᡼������Τ��ޤ�."
+"%(x)s ����ͳ��������������Ǥ��Ƥ��ޤ���\n"
+"������ꥹ�Ȼʲ�Ԥ�ž�����ޤ����Τǡ��ʲ�Ԥ��᡼��������ä��塢\n"
+"�����˴ؤ�������᡼������Τ��ޤ���"
 
 #: Mailman/Cgi/subscribe.py:288 Mailman/Commands/cmd_confirm.py:61
 msgid "You are already subscribed."
-msgstr "���˲���ˤʤäƤ��ޤ�."
+msgstr "���˲���ˤʤäƤ��ޤ���"
 
 #: Mailman/Cgi/subscribe.py:302
 msgid "Mailman privacy alert"
@@ -3113,29 +3125,29 @@ msgid ""
 "to the list administrator at %(listowner)s.\n"
 msgstr ""
 "%(listaddr)s �Υ᡼��󥰥ꥹ�Ȥˤ��ʤ��Υ��ɥ쥹����Ͽ���褦�Ȥ���\n"
-"��ߤ�����ޤ���. ���ʤ��ϴ��ˤ��Υ᡼��󥰥ꥹ�Ȥ����񤷤Ƥ��ޤ�.\n"
+"��ߤ�����ޤ��������ʤ��ϴ��ˤ��Υ᡼��󥰥ꥹ�Ȥ����񤷤Ƥ��ޤ���\n"
 "\n"
-"���Υꥹ�Ȥϲ�������������ˤ��Ƥ��뤿��, ���Ԥ��������������褦\n"
-"�Ȥ��Ƥ���Τ��⤷��ޤ���. �ץ饤�Х����������ɤ������, ��������\n"
-"�󶡤Ϥ��ޤ���Ǥ���.\n"
+"���Υꥹ�Ȥϲ�������������ˤ��Ƥ��뤿�ᡢ���Ԥ��������������褦\n"
+"�Ȥ��Ƥ���Τ��⤷��ޤ��󡣥ץ饤�Х����������ɤ�����ˡ���������\n"
+"�󶡤Ϥ��ޤ���Ǥ�����\n"
 "\n"
-"�⤷����ѤߤǤ��뤳�Ȥ�˺����������򤷤��ΤǤ����, ���Υ᡼���\n"
-"̵�뤷�Ƥ�������. �⤷, ���ʤ������Υꥹ�Ȥ˲������Ƥ��뤫�ɤ�������\n"
-"����Ū��ï�����᡼��󥰥ꥹ�Ȳ������ߤ��Ȼפ������, �ץ饤��\n"
+"�⤷����ѤߤǤ��뤳�Ȥ�˺����������򤷤��ΤǤ���С����Υ᡼���\n"
+"̵�뤷�Ƥ����������⤷�����ʤ������Υꥹ�Ȥ˲������Ƥ��뤫�ɤ�������\n"
+"����Ū��ï�����᡼��󥰥ꥹ�Ȳ������ߤ��Ȼפ�����ˡ��ץ饤��\n"
 "�����ˤĤ��Ƥη�ǰ�������\n"
-"%(listowner)s ���Υ᡼��ǥꥹ�ȴ����Ԥˤ����̤�������.\n"
+"%(listowner)s ���Υ᡼��ǥꥹ�ȴ����Ԥˤ����̤���������\n"
 
 #: Mailman/Cgi/subscribe.py:322
 msgid "This list does not support digest delivery."
-msgstr "���Υꥹ�ȤǤϡ֤ޤȤ��ɤߡפϤǤ��ޤ���."
+msgstr "���Υꥹ�ȤǤϡ֤ޤȤ��ɤߡפϤǤ��ޤ���"
 
 #: Mailman/Cgi/subscribe.py:324
 msgid "This list only supports digest delivery."
-msgstr "�ޤȤ��ɤ����ѥꥹ�ȤǤ�."
+msgstr "�ޤȤ��ɤ����ѥꥹ�ȤǤ���"
 
 #: Mailman/Cgi/subscribe.py:331
 msgid "You have been successfully subscribed to the %(realname)s mailing list."
-msgstr "%(realname)s �ؤ������³������λ���ޤ���."
+msgstr "%(realname)s �ؤ������³������λ���ޤ�����"
 
 #: Mailman/Commands/cmd_confirm.py:18
 msgid ""
@@ -3147,8 +3159,8 @@ msgid ""
 msgstr ""
 "\n"
 "    confirm <��ǧʸ����>\n"
-"        �¹Ԥ��ǧ���ޤ�. ��ǧʸ�����ɬ�ܤ�, ��ǧ�׵�Υ᡼���\n"
-"        �񤫤�Ƥ��ʤ���Фʤ�ޤ���.\n"
+"        �������ǧ���ޤ�����ǧʸ�����ɬ�ܤǡ���ǧ�׵�Υ᡼���\n"
+"        �񤫤�Ƥ����ΤǤʤ���Фʤ�ޤ���\n"
 
 #: Mailman/Commands/cmd_confirm.py:41 Mailman/Commands/cmd_lists.py:40
 #: Mailman/Commands/cmd_set.py:133 Mailman/Commands/cmd_subscribe.py:69
@@ -3170,15 +3182,15 @@ msgstr ""
 
 #: Mailman/Commands/cmd_confirm.py:56
 msgid "Your request has been forwarded to the list moderator for approval."
-msgstr "������, ��ǧ������뤿��˥ꥹ�Ȼʲ�Ԥ�ž������ޤ���."
+msgstr "�����ϡ���ǧ������뤿��˥ꥹ�Ȼʲ�Ԥ�ž������ޤ�����"
 
 #: Mailman/Commands/cmd_confirm.py:64
 msgid ""
 "You are not currently a member.  Have you already unsubscribed or changed\n"
 "your email address?"
 msgstr ""
-"���ʤ��ϲ���ǤϤ���ޤ���.\n"
-"��񤷤���, �᡼�륢�ɥ쥹���ѹ����ޤ���Ǥ�����?"
+"���ʤ��ϲ���ǤϤ���ޤ���\n"
+"��񤷤������᡼�륢�ɥ쥹���ѹ����ޤ���Ǥ�����?"
 
 #: Mailman/Commands/cmd_confirm.py:69
 msgid ""
@@ -3186,7 +3198,7 @@ msgid ""
 "restriction is erroneous, please contact the list owners at\n"
 "%(owneraddr)s."
 msgstr ""
-"�������줿�᡼�륢�ɥ쥹�Ǥ�����϶ػߤ���Ƥ��ޤ�. \n"
+"�������줿�᡼�륢�ɥ쥹�Ǥ�����϶ػߤ���Ƥ��ޤ���\n"
 "�����������¤�����Ͽ�ˤ���ΤȻפ������\n"
 "���Υꥹ�ȴ����԰��ˤ�Ϣ����������: %(owneraddr)s"
 
@@ -3196,12 +3208,12 @@ msgid ""
 "discarded,\n"
 "and both list administrators have been alerted."
 msgstr ""
-"���ʤ������Ԥ��줿�᡼��󥰥ꥹ�Ȥ�, ���Υ᡼��󥰥ꥹ�ȤǤϤ���ޤ���.\n"
-"ȯ�Ԥ��줿���Ԥ��˴���, �����Υꥹ�ȴ����Ԥ˷ٹ������ޤ���."
+"���ʤ������Ԥ��줿�᡼��󥰥ꥹ�Ȥϡ����Υ᡼��󥰥ꥹ�ȤǤϤ���ޤ���\n"
+"ȯ�Ԥ��줿���Ԥ��˴����������Υꥹ�ȴ����Ԥ˷ٹ������ޤ�����"
 
 #: Mailman/Commands/cmd_confirm.py:78
 msgid "Bad approval password given.  Held message is still being held."
-msgstr "��ǧ�ѥ���ɤ��ְ�äƤ��ޤ�. ��α�᡼�����α��³���ޤ�."
+msgstr "��ǧ�ѥ���ɤ��ְ�äƤ��ޤ�����α�᡼�����α��³���ޤ���"
 
 #: Mailman/Commands/cmd_confirm.py:89 Mailman/Commands/cmd_confirm.py:92
 #: Mailman/Commands/cmd_confirm.py:95
@@ -3216,7 +3228,7 @@ msgid ""
 msgstr ""
 "\n"
 "    echo [����]\n"
-"        ��ǧ���Τ򤽤Τޤ�ɽ�����ޤ�. ���������줿ʸ�����֤äƤ��ޤ�.\n"
+"        ��ǧ���Τ򤽤Τޤ�ɽ�����ޤ������������줿ʸ�����֤äƤ��ޤ���\n"
 
 #: Mailman/Commands/cmd_end.py:17
 msgid ""
@@ -3228,8 +3240,8 @@ msgid ""
 msgstr ""
 "\n"
 "    end\n"
-"        ���ޥ�ɽ�������ߤ��ޤ�. ��ưŪ�˽�̾���ɲä���\n"
-"        �᡼�륽�եȤ���Ѥ��Ƥ���Ȥ���, �����ȤäƤ�������.\n"
+"        ���ޥ�ɽ�������ߤ��ޤ�����ưŪ�˽�̾���ɲä���\n"
+"        �᡼�륽�եȤ���Ѥ��Ƥ���Ȥ��ϡ������ȤäƤ���������\n"
 
 #: Mailman/Commands/cmd_help.py:17
 msgid ""
@@ -3239,7 +3251,7 @@ msgid ""
 msgstr ""
 "\n"
 "    help\n"
-"        ���Υإ�ץ᡼���ɽ�����ޤ�.\n"
+"        ���Υإ�ץ�å�������ɽ�����ޤ���\n"
 
 #: Mailman/Commands/cmd_help.py:47
 msgid "You can access your personal options via the following url:"
@@ -3253,7 +3265,7 @@ msgid ""
 msgstr ""
 "\n"
 "    info\n"
-"        ���Υ᡼��󥰥ꥹ�Ȥΰ������󤻤ޤ�.\n"
+"        ���Υ᡼��󥰥ꥹ�Ȥΰ������󤻤ޤ���\n"
 
 #: Mailman/Commands/cmd_info.py:39 Mailman/Commands/cmd_lists.py:62
 msgid "n/a"
@@ -3285,11 +3297,11 @@ msgstr "
 
 #: Mailman/Commands/cmd_join.py:17
 msgid "The `join' command is synonymous with `subscribe'.\n"
-msgstr "`join'���ޥ�ɤ�`subscribe'��Ʊ����Ǥ�.\n"
+msgstr "`join'���ޥ�ɤ�`subscribe'��Ʊ����Ǥ���\n"
 
 #: Mailman/Commands/cmd_leave.py:17
 msgid "The `leave' command is synonymous with `unsubscribe'.\n"
-msgstr "`leave'���ޥ�ɤ�`unsubscribe'��Ʊ����Ǥ�.\n"
+msgstr "`leave'���ޥ�ɤ�`unsubscribe'��Ʊ����Ǥ���\n"
 
 #: Mailman/Commands/cmd_lists.py:17
 msgid ""
@@ -3299,7 +3311,7 @@ msgid ""
 msgstr ""
 "\n"
 "    lists\n"
-"        ���� GNU Mailman �����Фθ����᡼��󥰥ꥹ�Ȥΰ����򸫤�.\n"
+"        ���� GNU Mailman �����Фθ����᡼��󥰥ꥹ�Ȥΰ����򸫤롣\n"
 
 #: Mailman/Commands/cmd_lists.py:44
 msgid "Public mailing lists at %(hostname)s:"
@@ -3336,14 +3348,14 @@ msgid ""
 msgstr ""
 "\n"
 "    password [<��ѥ����> <���ѥ����>] [address=<���ɥ쥹>]\n"
-"        �ѥ���ɤ���󤻤����ѹ����ޤ�. �������դ����˼¹Ԥ����, \n"
-"        ���ߤΥѥ���ɤ���󤻤ޤ�.\n"
-"        ������<��ѥ����>��<���ѥ����>���դ����, �ѥ���ɤ�\n"
-"        �ѹ����ޤ�.\n"
-"        �����Ͽ���줿���ɥ쥹�ʳ�����᡼��������������,\n"
+"        �ѥ���ɤ���󤻤����ѹ����ޤ����������դ����˼¹Ԥ���ȡ�\n"
+"        ���ߤΥѥ���ɤ���󤻤ޤ���\n"
+"        ������<��ѥ����>��<���ѥ����>���դ���ȡ��ѥ���ɤ�\n"
+"        �ѹ����ޤ���\n"
+"        �����Ͽ���줿���ɥ쥹�ʳ�����᡼�������������ϡ�\n"
 "        `address=<���ɥ쥹>' (������̤��������դ��ʤ�) ��\n"
-"        ��Ͽ���륢�ɥ쥹����ꤷ�Ƥ�������. ���ξ��, �ֿ�����Ͽ\n"
-"        ���줿���ɥ쥹�������ޤ��ΤǤ����դ�������.\n"
+"        ��Ͽ���륢�ɥ쥹����ꤷ�Ƥ������������ξ�硢�ֿ�����Ͽ\n"
+"        ���줿���ɥ쥹�������ޤ��ΤǤ����դ���������\n"
 
 #: Mailman/Commands/cmd_password.py:51 Mailman/Commands/cmd_password.py:66
 msgid "Your password is: %(password)s"
@@ -3362,9 +3374,9 @@ msgid ""
 "your\n"
 "current password, then try again."
 msgstr ""
-"��ѥ���ɤ��ְ�äƤ�������, �ѥ���ɤ��ѹ�����ޤ���Ǥ���.\n"
-"�������դ����� password ���ޥ�ɤ�¹Ԥ�, ���ߤΥѥ���ɤ���\n"
-"�󤻤Ƥ���, �⤦���ٻ�Ƥ�������."
+"��ѥ���ɤ��ְ�äƤ������ᡢ�ѥ���ɤ��ѹ�����ޤ���Ǥ�����\n"
+"�������դ����� password ���ޥ�ɤ�¹Ԥ������ߤΥѥ���ɤ���\n"
+"�󤻤Ƥ��顢�⤦���ٻ�Ƥ���������"
 
 #: Mailman/Commands/cmd_password.py:89 Mailman/Commands/cmd_password.py:115
 msgid ""
@@ -3376,7 +3388,7 @@ msgstr ""
 
 #: Mailman/Commands/cmd_remove.py:17
 msgid "The `remove' command is synonymous with `unsubscribe'.\n"
-msgstr "`remove'��`unsubscribe'��Ʊ����Ǥ�.\n"
+msgstr "`remove'��`unsubscribe'��Ʊ����Ǥ���\n"
 
 #: Mailman/Commands/cmd_set.py:26
 msgid ""
@@ -3393,13 +3405,13 @@ msgid ""
 msgstr ""
 "\n"
 "    set ...\n"
-"        ������ץ���������, ��ǧ�򤷤ޤ�.\n"
+"        ������ץ���������, ��ǧ�򤷤ޤ���\n"
 "\n"
 "        `set help' (��������դ��ʤ�) ���ѹ���ǽ�ʥ��ץ����ΰ�����\n"
-"        ���뤳�Ȥ��Ǥ��ޤ�.\n"
+"        ���뤳�Ȥ��Ǥ��ޤ���\n"
 "\n"
 "        `set show' (��������դ��ʤ�) �Ǹ��ߤΥ��ץ����򸫤뤳�Ȥ�\n"
-"        �Ǥ��ޤ�.\n"
+"        �Ǥ��ޤ���\n"
 
 #: Mailman/Commands/cmd_set.py:37
 msgid ""
@@ -3474,62 +3486,62 @@ msgid ""
 msgstr ""
 "\n"
 "    set help\n"
-"        ������������󤻤�.\n"
+"        ������������󤻤롣\n"
 "\n"
 "    set show [address=<���ɥ쥹>]\n"
-"        ���ߤΥ��ץ��������򸫤�. �����Ͽ���ɥ쥹�ʳ�����᡼���\n"
-"        �����������, ��Ͽ���ɥ쥹�� `address=<���ɥ쥹>' �η�����\n"
-"        ���ꤷ�Ƥ�������. (�᡼�륢�ɥ쥹�ˤϡ�<�ס�>�פ��դ��ʤ�����.\n"
+"        ���ߤΥ��ץ��������򸫤롣�����Ͽ���ɥ쥹�ʳ�����᡼���\n"
+"        ����������ϡ���Ͽ���ɥ쥹�� `address=<���ɥ쥹>' �η�����\n"
+"        ���ꤷ�Ƥ���������(�᡼�륢�ɥ쥹�ˤϡ�<�ס�>�פ��դ��ʤ����ȡ�\n"
 "        �ޤ����ޥ�ɤ��'�פǰϤޤʤ�����)\n"
 "\n"
 "    set authenticate <�ѥ����> [address=<���ɥ쥹>]\n"
-"        ���ץ��������ꤹ�����, �ޤ����Υ��ޥ�ɤ�¹Ԥ���ɬ�פ�\n"
-"        ����ޤ�. <�ѥ����>�ϼ�ʬ�β���ѥ���ɤǤ�. �����Ͽ\n"
+"        ���ץ��������ꤹ����ϡ��ޤ����Υ��ޥ�ɤ�¹Ԥ���ɬ�פ�\n"
+"        ����ޤ���<�ѥ����>�ϼ�ʬ�β���ѥ���ɤǤ��������Ͽ\n"
 "        �������ɥ쥹�ʳ�����᡼����������, ��Ͽ���ɥ쥹��\n"
-"        `address=<���ɥ쥹>' �η����ǻ��ꤷ�Ƥ�������. (�᡼�륢�ɥ쥹\n"
-"        �ˤϡ�<�ס�>�פ��դ��ʤ�����. �ޤ����ޥ�ɤ��'�פǰϤޤʤ�����)\n"
+"        `address=<���ɥ쥹>' �η����ǻ��ꤷ�Ƥ���������(�᡼�륢�ɥ쥹\n"
+"        �ˤϡ�<�ס�>�פ��դ��ʤ����ȡ��ޤ����ޥ�ɤ��'�פǰϤޤʤ�����)\n"
 "\n"
 "    set ack on\n"
 "    set ack off\n"
-"        `ack' ���ץ����� on �ˤ����, �᡼��󥰥ꥹ�Ȥ˥᡼���\n"
-"        ��Ƥ��뤿�Ӥ�, ��ǧ���ΤΥ᡼�뤬������褦�ˤʤ�ޤ�.\n"
+"        `ack' ���ץ����� on �ˤ���ȡ��᡼��󥰥ꥹ�Ȥ˥᡼���\n"
+"        ��Ƥ��뤿�Ӥˡ���ǧ���ΤΥ᡼�뤬������褦�ˤʤ�ޤ���\n"
 "\n"
 "    set digest plain\n"
 "    set digest mime\n"
 "    set digest off\n"
-"        `digest' ���ץ����� off �ˤ����, ��Ƥ��줿�᡼�뤬ľ����\n"
-"        ���ޤ�. ���̤��Υ᡼���ޤȤ��ʿʸ����(RFC 1153 ��������\n"
-"        ����)�Ǽ�����ꤿ������ `set digest plain' ��ȤäƤ�������. \n"
-"        MIME�����Ǽ�����ꤿ�����ˤ� `set digest mime' ��Ȥ��ޤ�.\n"
+"        `digest' ���ץ����� off �ˤ���ȡ���Ƥ��줿�᡼�뤬ľ����\n"
+"        ���ޤ������̤��Υ᡼���ޤȤ��ʿʸ����(RFC 1153 ��������\n"
+"        ����)�Ǽ�����ꤿ������ `set digest plain' ��ȤäƤ���������\n"
+"        MIME�����Ǽ�����ꤿ�����ˤ� `set digest mime' ��Ȥ��ޤ���\n"
 "\n"
 "    set delivery on\n"
 "    set delivery off\n"
-"        ������ on/off ���ޤ�. �����, ���ǤϤʤ�, ���Ū�� Mailman \n"
-"        ����Υ᡼����������ߤ��ޤ�. �����, �ٲˤǥ᡼���������\n"
-"        �ʤ��Ȥ��ʤɤ˻Ȥ��ޤ�. �ٲˤ��鵢�ä���, `set delivery on' ��\n"
+"        ������ on/off ���ޤ�������ϡ����ǤϤʤ������Ū�� Mailman \n"
+"        ����Υ᡼����������ߤ��ޤ�������ϡ��ٲˤǥ᡼���������\n"
+"        �ʤ��Ȥ��ʤɤ˻Ȥ��ޤ����ٲˤ��鵢�ä��顢`set delivery on' ��\n"
 "        �᤹���Ȥ�˺��ʤ�!\n"
 "\n"
 "    set myposts on\n"
 "    set myposts off\n"
-"        `set myposts off' ����ꤹ���, ��ʬ���Ȥ���Ƥ����᡼���\n"
-"        ��������ʤ��ʤ�ޤ�. �ޤȤ��ɤߤ����ꤷ�Ƥ������̵���Ǥ�.\n"
+"        `set myposts off' ����ꤹ��ȡ���ʬ���Ȥ���Ƥ����᡼���\n"
+"        ��������ʤ��ʤ�ޤ����ޤȤ��ɤߤ����ꤷ�Ƥ������̵���Ǥ���\n"
 "\n"
 "    set hide on\n"
 "    set hide off\n"
-"        `set hide on' ����ꤹ���, �᡼�륢�ɥ쥹����̾����\n"
-"        ɽ�����ޤ���.\n"
+"        `set hide on' ����ꤹ��ȡ��᡼�륢�ɥ쥹����̾����\n"
+"        ɽ�����ޤ���\n"
 "\n"
 "    set duplicates on\n"
 "    set duplicates off\n"
-"        `set duplicates off' ����ꤹ���, ��ʬ�Υ��ɥ쥹������Ū��\n"
+"        `set duplicates off' ����ꤹ��ȡ���ʬ�Υ��ɥ쥹������Ū��\n"
 "        To: �ޤ��� Cc: �˵��Ҥ���Ƥ���᡼��ϥ᡼��󥰥ꥹ�Ȥ���\n"
-"        ��������ޤ���. ����ˤ��, ���Ƥ���ʣ����᡼��ο��򸺤�\n"
-"        ���ޤ�.\n"
+"        ��������ޤ��󡣤���ˤ�ꡢ���Ƥ���ʣ����᡼��ο��򸺤�\n"
+"        ���ޤ���\n"
 "\n"
 "    set reminders on\n"
 "    set reminders off\n"
-"        `set reminders off' ����ꤹ���, �᡼��󥰥ꥹ�Ȥ������\n"
-"        ������ѥ������˺���Τ���������ߤ��ޤ�. \n"
+"        `set reminders off' ����ꤹ��ȡ��᡼��󥰥ꥹ�Ȥ������\n"
+"        ������ѥ������˺���Τ���������ߤ��ޤ���\n"
 
 #: Mailman/Commands/cmd_set.py:122
 msgid "Bad set command: %(subcmd)s"
@@ -3610,7 +3622,7 @@ msgstr "    reminders (
 
 #: Mailman/Commands/cmd_set.py:224
 msgid "You did not give the correct password"
-msgstr "�ѥ���ɤ�����������ޤ���."
+msgstr "�ѥ���ɤ�����������ޤ���"
 
 #: Mailman/Commands/cmd_set.py:236 Mailman/Commands/cmd_set.py:283
 msgid "Bad argument: %(arg)s"
@@ -3654,7 +3666,7 @@ msgstr "reminder (
 
 #: Mailman/Commands/cmd_stop.py:17
 msgid "stop is synonymous with the end command.\n"
-msgstr "stop �� end ���ޥ�ɤ�Ʊ����̣�Ǥ�.\n"
+msgstr "stop �� end ���ޥ�ɤ�Ʊ����̣�Ǥ���\n"
 
 #: Mailman/Commands/cmd_subscribe.py:17
 msgid ""
@@ -3675,13 +3687,13 @@ msgid ""
 msgstr ""
 "\n"
 "    subscribe [�ѥ����] [digest|nodigest] [address=<���ɥ쥹>]\n"
-"        ���Υ᡼��󥰥ꥹ�Ȥ����񤹤�. �ѥ���ɤ����䥪�ץ�����\n"
-"        �ѹ���ɬ�פǤ���, �⤷��ά�������ˤϼ�ưŪ����������ޤ�.\n"
-"        ���Ū�˥ѥ���ɤ���˺���Τ������ޤ�.\n"
+"        ���Υ᡼��󥰥ꥹ�Ȥ����񤹤롣�ѥ���ɤ����䥪�ץ�����\n"
+"        �ѹ���ɬ�פǤ������⤷��ά�������ˤϼ�ưŪ����������ޤ���\n"
+"        ���Ū�˥ѥ���ɤ���˺���Τ������ޤ���\n"
 "\n"
-"        ���ΰ����� `nondigest' �ޤ��� `digest' (������ʤ���!).\n"
-"        �⤷, �᡼���ȯ�������ΤȤϰ㤦���ɥ쥹�����ˤ������Τ�\n"
-"        �����, `address=<���ɥ쥹>' �η����ǻ���Ǥ��ޤ�.\n"
+"        ���ΰ����� `nondigest' �ޤ��� `digest' (������ʤ���!)��\n"
+"        �⤷���᡼���ȯ�������ΤȤϰ㤦���ɥ쥹�����ˤ������Τ�\n"
+"        ����С�`address=<���ɥ쥹>' �η����ǻ���Ǥ��ޤ���\n"
 "        (���å����������դ��ʤ�����!)\n"
 
 #: Mailman/Commands/cmd_subscribe.py:62
@@ -3698,7 +3710,7 @@ msgid ""
 "If you think this restriction is erroneous, please contact the list\n"
 "owners at %(listowner)s."
 msgstr ""
-"�������줿�᡼�륢�ɥ쥹�Ǥ�����϶ػߤ���Ƥ��ޤ�. \n"
+"�������줿�᡼�륢�ɥ쥹�Ǥ�����϶ػߤ���Ƥ��ޤ���\n"
 "�����������¤�����Ͽ�ˤ���ΤȻפ������\n"
 "���Υꥹ�ȴ����԰��ˤ�Ϣ����������: %(listowner)s"
 
@@ -3707,7 +3719,7 @@ msgid ""
 "Mailman won't accept the given email address as a valid address.\n"
 "(E.g. it must have an @ in it.)"
 msgstr ""
-"���ꤵ�줿�᡼�륢�ɥ쥹�η���������������ޤ���.\n"
+"���ꤵ�줿�᡼�륢�ɥ쥹�η���������������ޤ���\n"
 "(���Ȥ��Х��ɥ쥹�ˤ�ɬ�� @ ���ޤޤ�Ƥ��ʤ���Фʤ�ޤ���)"
 
 #: Mailman/Commands/cmd_subscribe.py:124
@@ -3715,8 +3727,8 @@ msgid ""
 "Your subscription is not allowed because\n"
 "the email address you gave is insecure."
 msgstr ""
-"�������줿�᡼�륢�ɥ쥹�ϥ������ƥ�������꤬���뤿��, \n"
-"�������ϼ����դ����ޤ���Ǥ���."
+"�������줿�᡼�륢�ɥ쥹�ϥ������ƥ�������꤬���뤿�ᡢ\n"
+"�������ϼ����դ����ޤ���Ǥ�����"
 
 #: Mailman/Commands/cmd_subscribe.py:129
 msgid "You are already subscribed!"
@@ -3735,8 +3747,8 @@ msgid ""
 "Your subscription request has been forwarded to the list administrator\n"
 "at %(listowner)s for review."
 msgstr ""
-"���Ƥ�����å����뤿���, ��������ꥹ�ȴ����Ԥ� \n"
-"%(listowner)s ��ž�����ޤ���."
+"���Ƥ�����å����뤿��ˡ���������ꥹ�ȴ����Ԥ�\n"
+"%(listowner)s ��ž�����ޤ�����"
 
 #: Mailman/Commands/cmd_subscribe.py:147
 msgid "Subscription request succeeded."
@@ -3757,31 +3769,31 @@ msgid ""
 msgstr ""
 "\n"
 "    unsubscribe [�ѥ����] [address=<���ɥ쥹>]\n"
-"        �᡼��󥰥ꥹ�Ȥ�����񤷤ޤ�. �ѥ���ɤ��դ�����,\n"
-"        ��Ͽ���줿�ѥ���ɤ˰��פ��ʤ��Ȥ����ޤ���. �ѥ����\n"
-"        ����ά���줿����, ��񤹤륢�ɥ쥹���˳�ǧ�Υ᡼�����\n"
-"        ��ޤ�. ��񤹤륢�ɥ쥹�ʳ��Υ��ɥ쥹��Ȥäƿ����᡼��\n"
-"        ������Ȥ���, `address=<���ɥ쥹>' ����ꤷ�Ƥ�������. \n"
+"        �᡼��󥰥ꥹ�Ȥ�����񤷤ޤ����ѥ���ɤ��դ����硢\n"
+"        ��Ͽ���줿�ѥ���ɤ˰��פ��ʤ��Ȥ����ޤ��󡣥ѥ����\n"
+"        ����ά���줿���ϡ���񤹤륢�ɥ쥹���˳�ǧ�Υ᡼�����\n"
+"        ��ޤ�����񤹤륢�ɥ쥹�ʳ��Υ��ɥ쥹��Ȥäƿ����᡼��\n"
+"        ������Ȥ��ϡ�`address=<���ɥ쥹>' ����ꤷ�Ƥ��������� \n"
 "        (���ξ��Υ᡼�륢�ɥ쥹�ˤ� <> �� \" ���դ��ʤ��Ǥ�������!)\n"
 
 #: Mailman/Commands/cmd_unsubscribe.py:62
 msgid "%(address)s is not a member of the %(listname)s mailing list"
-msgstr "%(address)s �� %(listname)s �Υꥹ�Ȳ���ǤϤ���ޤ���."
+msgstr "%(address)s �� %(listname)s �Υꥹ�Ȳ���ǤϤ���ޤ���"
 
 #: Mailman/Commands/cmd_unsubscribe.py:69
 msgid ""
 "Your unsubscription request has been forwarded to the list administrator "
 "for\n"
 "approval."
-msgstr "��ǧ�Τ�����������ꥹ�ȴ����Ԥ�ž�����ޤ���."
+msgstr "��ǧ�Τ�����������ꥹ�ȴ����Ԥ�ž�����ޤ�����"
 
 #: Mailman/Commands/cmd_unsubscribe.py:84
 msgid "You gave the wrong password"
-msgstr "�ѥ���ɤ��㤤�ޤ�."
+msgstr "�ѥ���ɤ��㤤�ޤ�"
 
 #: Mailman/Commands/cmd_unsubscribe.py:87
 msgid "Unsubscription request succeeded."
-msgstr "���������λ���ޤ���."
+msgstr "���������λ���ޤ�����"
 
 #: Mailman/Commands/cmd_who.py:27
 msgid ""
@@ -3794,10 +3806,10 @@ msgid ""
 msgstr ""
 "\n"
 "    who\n"
-"        ���Υ᡼��󥰥ꥹ�Ȥα������Ǥʤ�����򸫤�.\n"
+"        ���Υ᡼��󥰥ꥹ�Ȥα������Ǥʤ�����򸫤롣\n"
 "    who password\n"
-"        ���Υ᡼��󥰥ꥹ�Ȥ�������򸫤�. password �ϥꥹ�ȴ�����\n"
-"        �ޤ��ϻʲ�ԤΥѥ����.\n"
+"        ���Υ᡼��󥰥ꥹ�Ȥ�������򸫤롣password �ϥꥹ�ȴ�����\n"
+"        �ޤ��ϻʲ�ԤΥѥ���ɡ�\n"
 
 #: Mailman/Commands/cmd_who.py:35
 msgid ""
@@ -3813,13 +3825,13 @@ msgid ""
 msgstr ""
 "\n"
 "    who �ѥ���� [address=<���ɥ쥹>]\n"
-"        ���Υ᡼��󥰥ꥹ�Ȥβ��̾���򸫤�. ̾�������ϥꥹ�Ȳ����\n"
-"        ���¤���Ƥ��ޤ��Τ�, �����ˤϲ���ѥ���ɤ�ɬ�פǤ�. ��Ͽ\n"
+"        ���Υ᡼��󥰥ꥹ�Ȥβ��̾���򸫤롣̾�������ϥꥹ�Ȳ����\n"
+"        ���¤���Ƥ��ޤ��Τ�, �����ˤϲ���ѥ���ɤ�ɬ�פǤ�����Ͽ\n"
 "        ���ɥ쥹�ʳ����饳�ޥ�ɥ᡼���������� `address=<���ɥ쥹>'\n"
-"        �Dz�����ɥ쥹����ꤷ�Ƥ�������. (�᡼�륢�ɥ쥹�� <> �ǰϤ�\n"
-"        �ʤ�����. ���줫�饯�����ơ������ޡ�����ޤޤʤ�!)\n"
-"        �ꥹ�ȴ��������ϻʲ�ԤΥѥ���ɤ�������, ��������ޤޤ�\n"
-"        �ޤ�.\n"
+"        �Dz�����ɥ쥹����ꤷ�Ƥ���������(�᡼�륢�ɥ쥹�� <> �ǰϤ�\n"
+"        �ʤ����ȡ����줫�饯�����ơ������ޡ�����ޤޤʤ�!)\n"
+"        �ꥹ�ȴ��������ϻʲ�ԤΥѥ���ɤ������ȡ���������ޤޤ�\n"
+"        �ޤ���\n"
 
 #: Mailman/Commands/cmd_who.py:46
 msgid ""
@@ -3831,17 +3843,17 @@ msgid ""
 msgstr ""
 "\n"
 "    who �ѥ����\n"
-"        ���Υ᡼��󥰥ꥹ�Ȥβ��̾���򸫤�. ̾���α����ϥꥹ�ȴ�\n"
-"        ���ԤȻʲ�Ԥ����¤���Ƥ��ޤ�. �ꥹ�ȴ����ԤΥѥ���ɤ�\n"
-"        �ʲ�ԤΥѥ���ɤ��դ��Ƥ�������.\n"
+"        ���Υ᡼��󥰥ꥹ�Ȥβ��̾���򸫤롣̾���α����ϥꥹ�ȴ�\n"
+"        ���ԤȻʲ�Ԥ����¤���Ƥ��ޤ����ꥹ�ȴ����ԤΥѥ���ɤ�\n"
+"        �ʲ�ԤΥѥ���ɤ��դ��Ƥ���������\n"
 
 #: Mailman/Commands/cmd_who.py:128
 msgid "You are not allowed to retrieve the list membership."
-msgstr "�᡼��󥰥ꥹ�Ȳ��̾���α������Ĥ�����ޤ���."
+msgstr "�᡼��󥰥ꥹ�Ȳ��̾���α������Ĥ�����ޤ���"
 
 #: Mailman/Commands/cmd_who.py:134
 msgid "This list has no members."
-msgstr "���Υꥹ�Ȥˤϲ�������ޤ���."
+msgstr "���Υꥹ�Ȥˤϲ�������ޤ���"
 
 #: Mailman/Commands/cmd_who.py:148
 msgid "Non-digest (regular) members:"
@@ -4018,8 +4030,8 @@ msgid ""
 "notices like the password reminder will be sent to\n"
 "your membership administrative address, %(addr)s."
 msgstr ""
-"����: ����ϥ᡼��󥰥ꥹ���ѤΥꥹ�ȤǤ�. �ѥ������˺���Τʤɤ�\n"
-"�������Τ�, ����������ɥ쥹 %(addr)s �������ޤ�."
+"����: ����ϥ᡼��󥰥ꥹ���ѤΥꥹ�ȤǤ����ѥ������˺���Τʤɤ�\n"
+"�������Τϡ�����������ɥ쥹 %(addr)s �������ޤ���"
 
 #: Mailman/Deliverer.py:73
 msgid " (Digest mode)"
@@ -4031,7 +4043,7 @@ msgstr "\"%(realname)s\" 
 
 #: Mailman/Deliverer.py:89
 msgid "You have been unsubscribed from the %(realname)s mailing list"
-msgstr "%(realname)s ���������³������λ���ޤ���."
+msgstr "%(realname)s ���������³������λ���ޤ���"
 
 #: Mailman/Deliverer.py:116
 msgid "%(listfullname)s mailing list reminder"
@@ -4052,9 +4064,9 @@ msgid ""
 "invitation to your list.  We just thought you'd like to know.  No further\n"
 "action by you is required."
 msgstr ""
-"¾�Υ᡼��󥰥ꥹ�Ȥ˾��Ԥ��줿 %(address)s ��, \n"
+"¾�Υ᡼��󥰥ꥹ�Ȥ˾��Ԥ��줿 %(address)s ����\n"
 "���Υ᡼��󥰥ꥹ�Ȥ����񤷤褦�Ȥ��ޤ���. \n"
-"���⤹��ɬ�פϤ���ޤ���, ǰ�Τ���ˤ��Τ餻���ޤ�. "
+"���⤹��ɬ�פϤ���ޤ��󤬡�ǰ�Τ���ˤ��Τ餻���ޤ���"
 
 #: Mailman/Deliverer.py:188
 msgid ""
@@ -4064,9 +4076,9 @@ msgid ""
 "you\n"
 "is required."
 msgstr ""
-"���Υ᡼��󥰥ꥹ�Ȥ˾��Ԥ��� %(address)s ��, ȯ�Ԥ��줿��ǧʸ�����\n"
-"¾�Υ᡼��󥰥ꥹ�Ȥ����񤷤褦���ޤ���. ���⤹��ɬ�פϤ���ޤ���,\n"
-"ǰ�Τ��ᤪ�Τ餻���ޤ�."
+"���Υ᡼��󥰥ꥹ�Ȥ˾��Ԥ��� %(address)s ����ȯ�Ԥ��줿��ǧʸ�����\n"
+"¾�Υ᡼��󥰥ꥹ�Ȥ����񤷤褦���ޤ��������⤹��ɬ�פϤ���ޤ��󤬡�\n"
+"ǰ�Τ��ᤪ�Τ餻���ޤ���"
 
 #: Mailman/Deliverer.py:221
 msgid "%(listname)s mailing list probe message"
@@ -4102,7 +4114,7 @@ msgstr "
 
 #: Mailman/Gui/Archive.py:37
 msgid "Is archive file source for public or private archival?"
-msgstr "��¸��ˤϳ����˸������ޤ���, ����Ȥ����˸��ꤷ�ޤ���?"
+msgstr "��¸��ˤϳ����˸������ޤ���������Ȥ����˸��ꤷ�ޤ���?"
 
 #: Mailman/Gui/Archive.py:40 Mailman/Gui/Digest.py:78
 msgid "Monthly"
@@ -4149,9 +4161,9 @@ msgid ""
 "text\n"
 "box, or you can specify a file on your local system to upload as the text."
 msgstr ""
-"��ư����������.<p>\n"
+"��ư������������<p>\n"
 "\n"
-"�ʲ��Υƥ����ȥե�����ɤǤ�, \n"
+"�ʲ��Υƥ����ȥե�����ɤǤϡ�\n"
 "�ʲ����ִ��ѿ����Ȥ��ޤ�:\n"
 "<p><ul>\n"
 "   <li><b>listname</b> - <em>���Υꥹ�Ȥ�̾��</em>\n"
@@ -4159,8 +4171,8 @@ msgstr ""
 "   <li><b>requestemail</b> - <em>���Υꥹ�Ȥ� -request ���ɥ쥹</em>\n"
 "   <li><b>owneremail</b> - <em>���Υꥹ�Ȥ� -owner ���ɥ쥹</em>\n"
 "</ul>\n"
-"<p>�ƥƥ����ȥե�����ɤ�, ľ��ʸ�̤������뤳�Ȥ��Ǥ��ޤ�. \n"
-"�ޤ���ʬ�Υ���ԥ塼���Υե�����򥢥åץ����ɤ��뤳�Ȥ�Ǥ��ޤ�. "
+"<p>�ƥƥ����ȥե�����ɤˡ�ľ��ʸ�̤������뤳�Ȥ��Ǥ��ޤ���\n"
+"�ޤ���ʬ�Υ���ԥ塼���Υե�����򥢥åץ����ɤ��뤳�Ȥ�Ǥ��ޤ���"
 
 #: Mailman/Gui/Autoresponse.py:55
 msgid ""
@@ -4170,7 +4182,7 @@ msgstr "
 
 #: Mailman/Gui/Autoresponse.py:60
 msgid "Auto-response text to send to mailing list posters."
-msgstr "�᡼��󥰥ꥹ����ƼԤؤμ�ư������ʸ"
+msgstr "�᡼��󥰥ꥹ����ƼԤؤμ�ư������ʸ��"
 
 #: Mailman/Gui/Autoresponse.py:63
 msgid ""
@@ -4180,15 +4192,15 @@ msgstr "-owner 
 
 #: Mailman/Gui/Autoresponse.py:68
 msgid "Auto-response text to send to -owner emails."
-msgstr "-owner ���Υ᡼����Ф��뼫ư������ʸ"
+msgstr "-owner ���Υ᡼����Ф��뼫ư������ʸ��"
 
 #: Mailman/Gui/Autoresponse.py:71
 msgid "Yes, w/discard"
-msgstr "�Ϥ�, �˴�"
+msgstr "�Ϥ����˴�"
 
 #: Mailman/Gui/Autoresponse.py:71
 msgid "Yes, w/forward"
-msgstr "�Ϥ�, ž��"
+msgstr "�Ϥ���ž��"
 
 #: Mailman/Gui/Autoresponse.py:72
 msgid ""
@@ -4198,12 +4210,12 @@ msgid ""
 "             system as a normal mail command."
 msgstr ""
 "-request ���ɥ쥹�ؤΥ᡼��˼�ư�������ޤ���? \n"
-"�Ϥ� �����־��, ���Υ᡼����˴����뤫, ����Ȥ��̾�Υ᡼�륳�ޥ��\n"
-"��Ʊ�ͤ˥����ƥ��ž�����뤫������Ǥ�������."
+"�֤Ϥ��פ����־�硢���Υ᡼����˴����뤫������Ȥ��̾�Υ᡼�륳�ޥ��\n"
+"��Ʊ�ͤ˥����ƥ��ž�����뤫������Ǥ���������"
 
 #: Mailman/Gui/Autoresponse.py:79
 msgid "Auto-response text to send to -request emails."
-msgstr "����(-request)�᡼����Ф��뼫ư������ʸ"
+msgstr "����(-request)�᡼����Ф��뼫ư������ʸ��"
 
 #: Mailman/Gui/Autoresponse.py:82
 msgid ""
@@ -4213,8 +4225,8 @@ msgid ""
 "             every message)."
 msgstr ""
 "�᡼��󥰥ꥹ�Ȥ� -request/-owner ����, Ʊ��ȯ���Ԥ���������\n"
-"�᡼��˼�ư��������ֳ֤�����. ����(�ޤ�����ο�)�����Ϥ����,\n"
-"�᡼�뤬��뤿�Ӥ˱������뤳�Ȥˤʤ�ޤ�. "
+"�᡼��˼�ư��������ֳ֤�����������(�ޤ�����ο�)�����Ϥ���ȡ�\n"
+"�᡼�뤬��뤿�Ӥ˱������뤳�Ȥˤʤ�ޤ���"
 
 #: Mailman/Gui/Bounce.py:26
 msgid "Bounce processing"
@@ -4280,41 +4292,41 @@ msgid ""
 "            disabled.  You should tune both of these to the frequency and\n"
 "            traffic volume of your list."
 msgstr ""
-"Mailman�μ�ư���顼�᡼�뼫ư���������ƥ�����椹�����ˤ����ꤷ�ޤ�.\n"
-"�����γ��פϰʲ����̤�Ǥ�.\n"
+"Mailman�μ�ư���顼�᡼�뼫ư���������ƥ�����椹�����ˤ����ꤷ�ޤ���\n"
+"�����γ��פϰʲ����̤�Ǥ���\n"
 "\n"
-" <p>Mailman��, ������ä��������顼���Τ���2����ξ����������褦��\n"
-" ���ޤ�: �Ĥޤ�, ����Υ᡼�륢�ɥ쥹��, ���顼�򵯤�����\n"
-" �����ο����٤Ǥ�. �����٤�<em>��</em>�ޤ���<em>��</em>��, \n"
-" ���줾����̿Ū���顼�ޤ��ϰ��Ū���顼���б����ޤ�. Ƚ�Ǥ��񤷤�\n"
-" ����, ���������٤Ȥ��ޤ�.\n"
+" <p>Mailman�ϡ�������ä��������顼���Τ���2����ξ����������褦��\n"
+" ���ޤ�: �Ĥޤꡢ����Υ᡼�륢�ɥ쥹�ȡ����顼�򵯤�����\n"
+" �����ο����٤Ǥ��������٤�<em>��</em>�ޤ���<em>��</em>�ǡ�\n"
+" ���줾����̿Ū���顼�ޤ��ϰ��Ū���顼���б����ޤ���Ƚ�Ǥ��񤷤�\n"
+" ���ϡ����������٤Ȥ��ޤ���\n"
 "\n"
-" <p>���顼�᡼�뤫�������ɥ쥹�����Ф��ʤ����, ����\n"
-" ���顼�᡼���̵�뤵��ޤ�. ���ɥ쥹�����Ф�������, ���β����\n"
-" <em>���顼��</em>��Ϳ�����, ���顼���Τ��Ȥ�������û����ޤ�.\n"
-" �������顼��1��, �夤���顼�� 0.5����û����ޤ�.\n"
-" ���顼������1����1��û����ޤ�. �������ä�, ���������鶯��\n"
-" ���顼��1����10�󤢤äƤ�, ��������1�������û�����ޤ���.\n"
+" <p>���顼�᡼�뤫�������ɥ쥹�����Ф��ʤ���С�����\n"
+" ���顼�᡼���̵�뤵��ޤ������ɥ쥹�����Ф������ϡ����β����\n"
+" <em>���顼��</em>��Ϳ����졢���顼���Τ��Ȥ�������û����ޤ���\n"
+" �������顼�� 1�����夤���顼�� 0.5����û����ޤ���\n"
+" ���顼������1����1��û����ޤ����������äơ����������鶯��\n"
+" ���顼��1����10�󤢤äƤ⡢��������1�������û�����ޤ���\n"
 "\n"
 " <p>�������Υ��顼����\n"
 " <a href=\"?VARHELP=bounce/bounce_score_threshold\">���票�顼��</a>\n"
-" ��Ķ�����, ���������ߤ��ޤ�. ���������ߤ��줿�����,\n"
-" (�ܿͤޤ��ϴ����Ԥ�)����Ū�˲���������褹��ޤ�, �ꥹ�Ȥ����\n"
-" �᡼��������뤳�ȤϤ���ޤ���. ������, ���������ߤ���\n"
-" ���뤳�Ȥ��������Τ���, �������Τˤϲ����������ˡ���񤫤�Ƥ��ޤ�.\n"
+" ��Ķ����ȡ����������ߤ��ޤ������������ߤ��줿����ϡ�\n"
+" (�ܿͤޤ��ϴ����Ԥ�)����Ū�˲���������褹��ޤǡ��ꥹ�Ȥ����\n"
+" �᡼��������뤳�ȤϤ���ޤ��󡣤����������������ߤ���\n"
+" ���뤳�Ȥ��������Τ��졢�������Τˤϲ����������ˡ���񤫤�Ƥ��ޤ���\n"
 "\n"
-"<p>�ޤ�, ���β���˰��ƤƽФ����Τ�, \n"
+"<p>�ޤ������β���˰��ƤƽФ����Τϡ�\n"
 "<a href=\"?VARHELP=bounce/bounce_you_are_disabled_warnings\">\n"
 "���Τβ��</a> �� \n"
 "<a href=\"?VARHELP=bounce/bounce_you_are_disabled_warnings_interval\">\n"
-"����</a> ��2�Ĥ��ѿ�������Ǥ��ޤ�.\n"
+"����</a> ��2�Ĥ��ѿ�������Ǥ��ޤ���\n"
 "\n"
-"<p>����ˤ⤦��Ľ��פ�������ܤ�����ޤ�: �������٤δ��֤��᤮����,\n"
-" -- ���δ֤ˤ��β������Υ��顼�᡼�뤬��ʤ��ä��� -- ���顼�����,\n"
+"<p>����ˤ⤦��Ľ��פ�������ܤ�����ޤ�: �������٤δ��֤��᤮���顢\n"
+" -- ���δ֤ˤ��β������Υ��顼�᡼�뤬��ʤ��ä��� -- ���顼����ϡ�\n"
 "<a href=\"?VARHELP=bounce/bounce_info_stale_after\">�Ť��ʤä�</a>\n"
-"��ΤȤ����˴�����ޤ�. �������ä�, �����ͤȥ��顼����Ĵ�����뤳��\n"
-"��, ���顼�򵯤�������ؤ���������ߤ���ޤǤδ��֤�����Ǥ��ޤ�.\n"
-"�������ͤ�, �ꥹ�Ȥ�ή�����Ƥ����٤ˤ��Ĵ�����Ƥ�������."
+"��ΤȤ����˴�����ޤ����������ä�, �����ͤȥ��顼����Ĵ�����뤳��\n"
+"�ǡ����顼�򵯤�������ؤ���������ߤ���ޤǤδ��֤�����Ǥ��ޤ���\n"
+"�������ͤϡ��ꥹ�Ȥ�ή�����Ƥ����٤ˤ��Ĵ�����Ƥ���������"
 
 #: Mailman/Gui/Bounce.py:75
 msgid "Bounce detection sensitivity"
@@ -4332,16 +4344,16 @@ msgid ""
 "administrator\n"
 "             isn't inundated with them."
 msgstr ""
-"�����ͤ�<em>������</em>�����ꤹ���, ���Υꥹ�ȤǤϼ�ư���顼������\n"
-"���ʤ��ʤ�ޤ�. ���ξ����Ϥꥨ�顼�᡼����˴�����ޤ�����, \n"
-"�����Ԥ��Ѥ蘆��뤳�ȤϤ���ޤ���."
+"�����ͤ�<em>������</em>�����ꤹ��ȡ����Υꥹ�ȤǤϼ�ư���顼������\n"
+"���ʤ��ʤ�ޤ������ξ����Ϥꥨ�顼�᡼����˴�����ޤ����顢\n"
+"�����Ԥ��Ѥ蘆��뤳�ȤϤ���ޤ���"
 
 #: Mailman/Gui/Bounce.py:85
 msgid ""
 "The maximum member bounce score before the member's\n"
 "             subscription is disabled.  This value can be a floating point\n"
 "             number."
-msgstr "���������ߤ������Υ��顼��. �������ư�����Ǥ�褤."
+msgstr "���������ߤ������Υ��顼�����������ư�����Ǥ⤫�ޤ��ޤ���"
 
 #: Mailman/Gui/Bounce.py:88
 msgid ""
@@ -4360,15 +4372,15 @@ msgid ""
 "             score, above which they are automatically disabled, but not\n"
 "             removed from the mailing list."
 msgstr ""
-"����ˤϤ��줾����ư�����Υ��顼�������դ����ޤ�. Mailman ���ꥹ��\n"
-"������饨�顼�᡼����������, ���β���Υ��顼�����û�����ޤ�\n"
+"����ˤϤ��줾����ư�����Υ��顼�������դ����ޤ���Mailman ���ꥹ��\n"
+"������饨�顼�᡼���������ȡ����β���Υ��顼�����û�����ޤ���\n"
 "�������顼(��̿Ū���顼)��1��, �夤���顼(���Ū���顼)��0.5����\n"
-"�û����ޤ�. ���顼������1����1��û����ޤ�. ���äƤ�������1����\n"
-"10�󥨥顼���֤��Ƥ�, ������1�����������ޤ���.\n"
+"�û����ޤ������顼������1����1��û����ޤ������äƤ�������1����\n"
+"10�󥨥顼���֤��Ƥ⡢������1�����������ޤ���\n"
 "\n"
-"�����ѿ��ϲ���Υ��顼�����ξ���ͤ��ꤷ�ޤ�. �����ͤ�ۤ����\n"
+"�����ѿ��ϲ���Υ��顼�����ξ���ͤ��ꤷ�ޤ��������ͤ�ۤ����\n"
 "����ؤ������ϼ�ưŪ����ߤ��ޤ����᡼��󥰥ꥹ�Ȥ�����񤵤���\n"
-"�櫓�ǤϤ���ޤ���."
+"�櫓�ǤϤ���ޤ���"
 
 #: Mailman/Gui/Bounce.py:102
 msgid ""
@@ -4376,8 +4388,8 @@ msgid ""
 "             is discarded, if no new bounces have been received in the\n"
 "             interim.  This value must be an integer."
 msgstr ""
-"���������δ��������顼��̵�����, �������顼������˴�����.\n"
-"���������ͤ�����."
+"���������δ��������顼��̵����С��������顼������˴����ޤ���\n"
+"���������ͤ������Ǥ���"
 
 #: Mailman/Gui/Bounce.py:107
 msgid ""
@@ -4389,10 +4401,10 @@ msgid ""
 "             the list once their bounce score exceeds the threshold.  This\n"
 "             value must be an integer."
 msgstr ""
-"<em>��������</em>�ηٹ�᡼��򲿲����äƤ���, �ºݤ�\n"
-" ���β����᡼��󥰥ꥹ�Ȥ��������ޤ���? 0 �����ꤹ���,\n"
-" ���顼���������ͤ�ã����������¨�¤����������ޤ�.\n"
-" ���������ͤ�����."
+"<em>��������</em>�ηٹ�᡼��򲿲����äƤ��顢�ºݤ�\n"
+" ���β����᡼��󥰥ꥹ�Ȥ��������ޤ���? 0 �����ꤹ��ȡ�\n"
+" ���顼���������ͤ�ã����������¨�¤����������ޤ���\n"
+" ���������ͤ������Ǥ���"
 
 #: Mailman/Gui/Bounce.py:114
 msgid ""
@@ -4400,7 +4412,7 @@ msgid ""
 "             Is Disabled</em> warnings.  This value must be an integer."
 msgstr ""
 "<em>��������</em>�ηٹ�᡼������ֳ֤�����ޤ���?\n"
-" ���������ͤ�����."
+" ���������ͤ������Ǥ���"
 
 #: Mailman/Gui/Bounce.py:117 Mailman/Gui/General.py:332
 msgid "Notifications"
@@ -4414,7 +4426,7 @@ msgid ""
 "             is recommended."
 msgstr ""
 "�������顼��ư���ФǸ��ΤǤ��ʤ��ä����顼�᡼���ꥹ�ȴ�����\n"
-"��������ޤ���? <em>�Ϥ�</em>��侩���ޤ�."
+"��������ޤ���? <em>�Ϥ�</em>��侩���ޤ���"
 
 #: Mailman/Gui/Bounce.py:124
 msgid ""
@@ -4446,23 +4458,23 @@ msgid ""
 "\">autoresponse\n"
 "             message</a> for email to the -owner and -admin address."
 msgstr ""
-"Mailman ���������顼���Х����ƥ�����ˤ��ä��ꤷ�Ƥ��ޤ���,\n"
-"��������������顼�����򤹤٤Ʋ��Ϥ��뤳�Ȥ��Բ�ǽ�Ǥ�.\n"
-"����2�Ĥ���ͳ��, �����ѿ���<em>�Ϥ�</em>�����ꤷ�Ƥ����٤��Ǥ�.\n"
-"1) �����ˤ��β���Υ��顼���������ʤ��ΤǤ����, ��ư��������\n"
-"�򤹤�ɬ�פ����뤫��. 2) Mailman��ȯ�Ԥ˥��顼�᡼�������, \n"
-"�������������б������Ƥ�餦���Ȥ��Ǥ��뤫��. \n"
-"<p>���顼�᡼����Ѥ蘆�줿���ʤ����, �����ѿ���<em>������</em>\n"
-"�ˤ����, ���ФǤ��ʤ��ä��������顼���Τ��˴���, �ʸ�ν�����\n"
-"�����ʤ��褦�ˤǤ��ޤ�.\n"
+"Mailman ���������顼���Х����ƥ�����ˤ��ä��ꤷ�Ƥ��ޤ�����\n"
+"��������������顼�����򤹤٤Ʋ��Ϥ��뤳�Ȥ��Բ�ǽ�Ǥ���\n"
+"����2�Ĥ���ͳ�ǡ������ѿ���<em>�Ϥ�</em>�����ꤷ�Ƥ����٤��Ǥ���\n"
+"1) �����ˤ��β���Υ��顼���������ʤ��ΤǤ���С���ư��������\n"
+"�򤹤�ɬ�פ����뤫�顣 2) Mailman��ȯ�Ԥ˥��顼�᡼������ꡢ\n"
+"�������������б������Ƥ�餦���Ȥ��Ǥ��뤫�顣\n"
+"<p>���顼�᡼����Ѥ蘆�줿���ʤ���С������ѿ���<em>������</em>\n"
+"�ˤ���ȡ����ФǤ��ʤ��ä��������顼���Τ��˴������ʸ�ν�����\n"
+"�����ʤ��褦�ˤǤ��ޤ���\n"
 "<p><b>����:</b> ���������, ���Υꥹ�Ȥ� -admin���ɥ쥹���᡼��\n"
-"���٤Ƥ˱ƶ����ޤ�. ���Υ��ɥ쥹�ϸ��߻��Ѥ���Ƥ��餺, �����\n"
-"���Ѥ��ƤϤ����ޤ���, �����ϻȤ��Ƥ��ޤ���. �⤷ï��������\n"
-"���ɥ쥹���˥᡼���Ф������, ������<em>������</em>��\n"
-"���ꤵ��Ƥ����, ���Υ᡼����˴�����Ƥ��ޤ��ޤ�.\n"
+"���٤Ƥ˱ƶ����ޤ������Υ��ɥ쥹�ϸ��߻��Ѥ���Ƥ��餺�������\n"
+"���Ѥ��ƤϤ����ޤ��󤬡������ϻȤ��Ƥ��ޤ������⤷ï��������\n"
+"���ɥ쥹���˥᡼���Ф�����硢������<em>������</em>��\n"
+"���ꤵ��Ƥ���ȡ����Υ᡼����˴�����Ƥ��ޤ��ޤ���\n"
 "<a href=\"?VARHELP=autoreply/autoresponse_admin_text\">��ư����\n"
 "</a>��Ȥä� -owner �� -admin ���ƤΥ᡼����б������ۤ����褤\n"
-"���⤷��ޤ���."
+"���⤷��ޤ���"
 
 #: Mailman/Gui/Bounce.py:147
 msgid ""
@@ -4488,7 +4500,7 @@ msgstr ""
 msgid ""
 "Should Mailman notify you, the list owner, when bounces\n"
 "             cause a member's subscription to be disabled?"
-msgstr "���顼���ΤΤ�����������ߤ�����, �ꥹ�ȴ����Ԥ����Τ��ޤ���?"
+msgstr "���顼���ΤΤ�����������ߤ����硢�ꥹ�ȴ����Ԥ����Τ��ޤ���?"
 
 #: Mailman/Gui/Bounce.py:158
 msgid ""
@@ -4498,9 +4510,9 @@ msgid ""
 "             when a member's delivery is disabled due to excessive bounces.\n"
 "             An attempt to notify the member will always be made."
 msgstr ""
-"<em>������</em>�����ꤹ���, �������顼�ˤ��\n"
-"����ؤ���������ߤ�ꥹ�ȴ����ͤ����Τ��ޤ���.\n"
-"����������ؤ����Τ�³�����ޤ�."
+"<em>������</em>�����ꤹ��ȡ��������顼�ˤ��\n"
+"����ؤ���������ߤ�ꥹ�ȴ����ͤ����Τ��ޤ���\n"
+"����������ؤ����Τ�³�����ޤ���"
 
 #: Mailman/Gui/Bounce.py:165
 msgid ""
@@ -4516,9 +4528,9 @@ msgid ""
 "             when a member is unsubscribed due to excessive bounces.  An\n"
 "             attempt to notify the member will always be made."
 msgstr ""
-"<em>������</em>�����ꤹ���, �������顼�ˤ��\n"
-"����ꥹ�ȴ����ͤ����Τ��ޤ���.\n"
-"����������ؤ����Τ�³�����ޤ�."
+"<em>������</em>�����ꤹ��ȡ��������顼�ˤ��\n"
+"����ꥹ�ȴ����ͤ����Τ��ޤ���\n"
+"����������ؤ����Τ�³�����ޤ���"
 
 #: Mailman/Gui/Bounce.py:194
 msgid ""
@@ -4579,32 +4591,32 @@ msgid ""
 "            >convert_html_to_plaintext</a> is enabled and the site is\n"
 "            configured to allow these conversions."
 msgstr ""
-"�ۿ�����᡼���ź�եե�����˴ؤ�������.\n"
+"�ۿ�����᡼���ź�եե�����˴ؤ������ˡ�\n"
 "\n"
 "<p>ź�եե��������ե��륿��ư��ϼ����̤�Ǥ�: \n"
-"ź�եե������������ꤵ��Ƥ����, �ꥹ�Ȥ����夷���᡼��˴ޤޤ��\n"
+"ź�եե������������ꤵ��Ƥ���С��ꥹ�Ȥ����夷���᡼��˴ޤޤ��\n"
 "�ġ���ź�եե�����Ϥޤ�\n"
 "<a href=\"?VARHELP=contentfilter/filter_mime_types\">���������</a>\n"
-"����Ӥ���ޤ�.  ź�եե�����Υե����륿���פ�\n"
-"���ꤵ�줿��������פΤɤ줫�����פ���С����Υե�������˴�����ޤ�.\n"
+"����Ӥ���ޤ���ź�եե�����Υե����륿���פ�\n"
+"���ꤵ�줿��������פΤɤ줫�����פ���С����Υե�������˴�����ޤ���\n"
 "\n"
-"<p>����, <a href=\"?VARHELP=contentfilter/pass_mime_types\">�̲᥿����</a>\n"
-"���������Ƥ����, ���ꤵ�줿�̲᥿���פ˰��פ��ʤ�ź�եե������\n"
-"�˴�����ޤ�. �̲᥿���פ��������Ƥ��ʤ����, �����å����ά���ޤ�.\n"
+"<p>���ˡ�<a href=\"?VARHELP=contentfilter/pass_mime_types\">�̲᥿����</a>\n"
+"���������Ƥ���С����ꤵ�줿�̲᥿���פ˰��פ��ʤ�ź�եե������\n"
+"�˴�����ޤ����̲᥿���פ��������Ƥ��ʤ���С������å����ά���ޤ���\n"
 "\n"
 "<p>���ν����������Ƥ����ˤʤä�<tt>�ޥ���ѡ���</tt>��\n"
-"ź�եե����뤬�����, ����ź�եե�����������ޤ�. ���ֳ�¦\n"
-"�Υ�å����������ˤʤä�����, ���Υ᡼�����Τ��˴����ޤ�.\n"
+"ź�եե����뤬����С�����ź�եե�����������ޤ������ֳ�¦\n"
+"�Υ�å����������ˤʤä����ϡ����Υ᡼�����Τ��˴����ޤ���\n"
 "\n"
-"<p>������, �⤷, <a href=\"?VARHELP=contentfilter/collapse_alternatives\"\n"
-">collapse_alternatives</a>�����ꤵ��Ƥ����, ���줾���\n"
-"<tt>multipart/alternative</tt>���Τ�, ��Ƭ��\n"
-"����Ǥʤ�alternative�����Ƥ��֤��������ޤ�.\n"
+"<p>�����ơ��⤷��<a href=\"?VARHELP=contentfilter/collapse_alternatives\"\n"
+">collapse_alternatives</a>�����ꤵ��Ƥ���С����줾���\n"
+"<tt>multipart/alternative</tt>���Τ�����Ƭ��\n"
+"����Ǥʤ�alternative�����Ƥ��֤��������ޤ���\n"
 "\n"
-"<p>�Ǹ��, <a href=\"?VARHELP=contentfilter/convert_html_to_plaintext\">\n"
-"convert_html_to_plaintext</a>�����ꤵ��Ƥ���,\n"
-"�����Ȥ������ʿʸ�ؤ��Ѵ����������Ƥ����, \n"
-"�Ĥ��<tt>text/html</tt>��<tt>text/plain</tt>���Ѵ�����ޤ�."
+"<p>�Ǹ�ˡ�<a href=\"?VARHELP=contentfilter/convert_html_to_plaintext\">\n"
+"convert_html_to_plaintext</a>�����ꤵ��Ƥ��ơ�\n"
+"�����Ȥ������ʿʸ�ؤ��Ѵ����������Ƥ���С�\n"
+"�Ĥ��<tt>text/html</tt>��<tt>text/plain</tt>���Ѵ�����ޤ���"
 
 #: Mailman/Gui/ContentFilter.py:75
 msgid ""
@@ -4616,7 +4628,7 @@ msgstr "
 msgid ""
 "Remove message attachments that have a matching content\n"
 "             type."
-msgstr "�ʲ��Υ����פ����ƤϤޤ�ź�եե������������."
+msgstr "�ʲ��Υ����פ����ƤϤޤ�ź�եե�����������롣"
 
 #: Mailman/Gui/ContentFilter.py:82
 msgid ""
@@ -4632,16 +4644,16 @@ msgid ""
 "             <p>See also <a href=\"?VARHELP=contentfilter/pass_mime_types\"\n"
 "             >pass_mime_types</a> for a content type whitelist."
 msgstr ""
-"���Υ��ץ����ǻ��ꤹ�륿���פ�ź�եե������������ޤ�.\n"
+"���Υ��ץ����ǻ��ꤹ�륿���פ�ź�եե������������ޤ���\n"
 "�ƹԤˤ� MIME ��<tt>type/subtype</tt> (��: <tt>image/gif</tt>)\n"
-"��ҤȤĤ��Ľ񤭤ޤ�. subtype ���ά����Ȥ��� type ����Ĥ��٤Ƥ�\n"
-"�ե�����������ޤ�(��: <tt>image</tt>). \n"
+"��ҤȤĤ��Ľ񤭤ޤ���subtype ���ά����Ȥ��� type ����Ĥ��٤Ƥ�\n"
+"�ե�����������ޤ�(��: <tt>image</tt>)��\n"
 "\n"
-"<p>����Ԥ�̵�뤵��ޤ�.\n"
+"<p>����Ԥ�̵�뤵��ޤ���\n"
 "\n"
 "<p>���Ĥ���ե����륿���פ������\n"
 "<a href=\"?VARHELP=contentfilter/pass_mime_types\">pass_mime_types</a>\n"
-"�򻲾Ȥ��Ƥ�������."
+"�򻲾Ȥ��Ƥ���������"
 
 #: Mailman/Gui/ContentFilter.py:94
 msgid ""
@@ -4649,8 +4661,8 @@ msgid ""
 "             content type.  Leave this field blank to skip this filter\n"
 "             test."
 msgstr ""
-"���ꤵ�줿�ե����륿���װʳ���ź�եե�����������ޤ�.\n"
-"����ˤ��Ƥ�����, ���θ������ά���ޤ�."
+"���ꤵ�줿�ե����륿���װʳ���ź�եե�����������ޤ���\n"
+"����ˤ��Ƥ����ȡ����θ������ά���ޤ���"
 
 #: Mailman/Gui/ContentFilter.py:98
 msgid ""
@@ -4665,20 +4677,21 @@ msgid ""
 "             <tt>multipart</tt> to this list, any messages with attachments\n"
 "             will be rejected by the pass filter."
 msgstr ""
-"���Υ��ץ����Ǥ�, ���ꤵ�줿�ե����륿���װʳ���ź�եե�����������ޤ�.\n"
+"���Υ��ץ����Ǥϡ����ꤵ�줿�ե����륿���װʳ���ź�եե������������"
+"����\n"
 "�����ɬ�פʾ��ȷ�����\n"
 "<a href=\"?VARHELP=contentfilter/filter_mime_types\">filter_mime_types</a>\n"
-"��Ʊ���Ǥ�.\n"
+"��Ʊ���Ǥ���\n"
 "\n"
-"<p><b>����:</b>���Υꥹ�Ȥ˹��ܤ��ɲä���Ȥ���,\n"
-"ɬ��<tt>multipart</tt>����ꤷ�Ƥ�������.\n"
-"multipart���ʤ����ź�եե�����Τ���᡼��Ϥ��٤Ƶ��ݤ���ޤ�."
+"<p><b>����:</b>���Υꥹ�Ȥ˹��ܤ��ɲä���Ȥ��ϡ�\n"
+"ɬ��<tt>multipart</tt>����ꤷ�Ƥ���������\n"
+"multipart���ʤ����ź�եե�����Τ���᡼��Ϥ��٤Ƶ��ݤ���ޤ���"
 
 #: Mailman/Gui/ContentFilter.py:108
 msgid ""
 "Remove message attachments that have a matching filename\n"
 "             extension."
-msgstr "�ʲ��γ�ĥ�Ҥ����ź�եե������������."
+msgstr "�ʲ��γ�ĥ�Ҥ����ź�եե�����������롣"
 
 #: Mailman/Gui/ContentFilter.py:112
 msgid ""
@@ -4687,8 +4700,8 @@ msgid ""
 "filter\n"
 "             test."
 msgstr ""
-"���ꤵ�줿��ĥ�Ұʳ���ź�եե�����������ޤ�.\n"
-"����ˤ��Ƥ�����, ���θ������ά���ޤ�."
+"���ꤵ�줿��ĥ�Ұʳ���ź�եե�����������ޤ���\n"
+"����ˤ��Ƥ����ȡ����θ������ά���ޤ���"
 
 #: Mailman/Gui/ContentFilter.py:117
 msgid ""
@@ -4704,13 +4717,13 @@ msgid ""
 "             stripped."
 msgstr ""
 "<tt>text/html</tt>����ʬ��ʿʸ���Ѵ����ޤ���?\n"
-"�����Ѵ���ź�եե����뤬�������줿��˼¹Ԥ���ޤ�."
+"�����Ѵ���ź�եե����뤬�������줿��˼¹Ԥ���ޤ���"
 
 #: Mailman/Gui/ContentFilter.py:127
 msgid ""
 "Action to take when a message matches the content filtering\n"
 "             rules."
-msgstr "�᡼�뤬ź�եե�������§�˥ޥå������Ȥ���ư��."
+msgstr "�᡼�뤬ź�եե�������§�˥ޥå������Ȥ���ư�"
 
 #: Mailman/Gui/ContentFilter.py:130
 msgid ""
@@ -4742,28 +4755,29 @@ msgid ""
 "             option is only available if enabled by the site\n"
 "             administrator."
 msgstr ""
-"�᡼�뤬ź�եե�������§�˹��פ����Ȥ���ư������ꤷ�ޤ�.\n"
-"�Ĥޤ�, ���ֳ�¦��Content-Type��, \n"
+"�᡼�뤬ź�եե�������§�˹��פ����Ȥ���ư������ꤷ�ޤ���\n"
+"�Ĥޤꡢ���ֳ�¦��Content-Type����\n"
 "<a href=\"?VARHELP=contentfilter/filter_mime_types\">���������</a>\n"
-"�Τɤ줫�˥ޥå����뤫, \n"
+"�Τɤ줫�˥ޥå����뤫��\n"
 "<a href=\"?VARHELP=contentfilter/pass_mime_types\">�̲᥿����</a>\n"
-"�˥ޥå�<b>���ʤ���</b>,\n"
-"���̤Υѡ��Ȥ����������, �᡼�뤬���ˤʤä�����ư��Ǥ�.\n"
+"�˥ޥå�<b>���ʤ���</b>��\n"
+"���̤Υѡ��Ȥ���������̡��᡼�뤬���ˤʤä�����ư��Ǥ���\n"
 "\n"
 "<p>�ѡ��Ȥ�������줿��˻Ĥä�ź�եե�������Ф��Ƥ�\n"
-"�����Ǥ������Ŭ�Ѥ��줺, ����˥᡼�뤬��������ޤ��ΤǤ����դ�������.\n"
+"�����Ǥ������Ŭ�Ѥ��줺������˥᡼�뤬��������ޤ��ΤǤ����դ���������\n"
 "\n"
-"<p>�˴������֤ȥ᡼����˴�����, ���Υ᡼��� Message-ID��\n"
-"�����˵�Ͽ����ޤ�. ����, �ޤ��ϥꥹ�ȴ����Ԥ�ž�����줿����,\n"
-"�᡼�����ƼԤؤΥ��顼���Τ˵��ݤ���ͳ�����ܤ���ޤ�.\n"
-"�ݴɤ����֤�, �᡼��ϥۥ��ȥ���ԥ塼�������̤ʥǥ��쥯�ȥ���ݴɤ���ޤ�.\n"
-"�����Ȥδ�����(�ꥹ�Ȥδ����ԤǤϤ���ޤ���)��, �ݴɤ��줿�᡼���\n"
-"�����������褵���뤫, ���뤤���˴����ޤ�.\n"
-"�ݴɥ��ץ�����, �����ȴ����Ԥ�ͭ���ˤ������ˤΤ�����Ǥ��ޤ�."
+"<p>�˴������֤ȥ᡼����˴����졢���Υ᡼��� Message-ID��\n"
+"�����˵�Ͽ����ޤ������ݡ��ޤ��ϥꥹ�ȴ����Ԥ�ž�����줿���ϡ�\n"
+"�᡼�����ƼԤؤΥ��顼���Τ˵��ݤ���ͳ�����ܤ���ޤ���\n"
+"�ݴɤ����֤ȡ��᡼��ϥۥ��ȥ���ԥ塼�������̤ʥǥ��쥯�ȥ���ݴɤ����"
+"����\n"
+"�����Ȥδ�����(�ꥹ�Ȥδ����ԤǤϤ���ޤ���)�ϡ��ݴɤ��줿�᡼���\n"
+"�����������褵���뤫�����뤤���˴����ޤ���\n"
+"�ݴɥ��ץ����ϡ������ȴ����Ԥ�ͭ���ˤ������ˤΤ�����Ǥ��ޤ���"
 
 #: Mailman/Gui/ContentFilter.py:171
 msgid "Bad MIME type ignored: %(spectype)s"
-msgstr "MIME�����פ˸��꤬����ޤ�. ̵�뤷�ޤ�: %(spectype)s"
+msgstr "MIME�����פ˸��꤬����ޤ���̵�뤷�ޤ�: %(spectype)s"
 
 #: Mailman/Gui/Digest.py:36
 msgid "Digest options"
@@ -4799,15 +4813,15 @@ msgstr "ʿʸ"
 
 #: Mailman/Gui/Digest.py:56
 msgid "When receiving digests, which format is default?"
-msgstr "�ޤȤ��ɤߤ���������Ȥ�, �ɤ���η�����ǥե�����ͤˤ��ޤ���?"
+msgstr "�ޤȤ��ɤߤ���������Ȥ����ɤ���η�����ǥե�����ͤˤ��ޤ���?"
 
 #: Mailman/Gui/Digest.py:59
 msgid ""
 "How big in Kb should a digest be before it gets sent out?  0 implies no "
 "maximum size."
 msgstr ""
-"��ƥ᡼�뤬��Kb �ʾ�ˤʤä���֤ޤȤ��ɤߡפ�ȯ�����ޤ���?0 �����ꤹ��ȥ�"
-"�������äˤ��ȯ���Ϥ���ޤ���."
+"��ƥ᡼�뤬��Kb �ʾ�ˤʤä���֤ޤȤ��ɤߡפ�ȯ�����ޤ���? 0 �����ꤹ��ȥ�"
+"�������äˤ��ȯ���Ϥ���ޤ���"
 
 #: Mailman/Gui/Digest.py:63
 msgid ""
@@ -4822,7 +4836,7 @@ msgstr "
 msgid ""
 "Text attached (as an initial message, before the table of contents) to the "
 "top of digests. "
-msgstr "�֤ޤȤ��ɤߡפ���Ƭ���դ���ʸ (�ܼ������κǽ����ʸ)"
+msgstr "�֤ޤȤ��ɤߡפ���Ƭ���դ���ʸ��(�ܼ������κǽ����ʸ)"
 
 #: Mailman/Gui/Digest.py:73
 msgid "Footer added to every digest"
@@ -4830,7 +4844,7 @@ msgstr "
 
 #: Mailman/Gui/Digest.py:74
 msgid "Text attached (as a final message) to the bottom of digests. "
-msgstr "�֤ޤȤ��ɤߡפ�������ź�դ���ʸ"
+msgstr "�֤ޤȤ��ɤߡפ�������ź�դ���ʸ��"
 
 #: Mailman/Gui/Digest.py:80
 msgid "How often should a new digest volume be started?"
@@ -4841,8 +4855,8 @@ msgid ""
 "When a new digest volume is started, the volume number is\n"
 "             incremented and the issue number is reset to 1."
 msgstr ""
-"�֤ޤȤ��ɤߡפο����������Ϥޤ��, �����ϤҤȤ�����, \n"
-" ����� 1 �˥ꥻ�åȤ���ޤ�."
+"�֤ޤȤ��ɤߡפο����������Ϥޤ�ȡ������ϤҤȤ�������\n"
+" ����� 1 �˥ꥻ�åȤ���ޤ���"
 
 #: Mailman/Gui/Digest.py:85
 msgid "Should Mailman start a new digest volume?"
@@ -4854,27 +4868,27 @@ msgid ""
 "             with the next digest sent out."
 msgstr ""
 "���Υ��ץ����򥻥åȤ���� Mailman �ϼ��Ρ֤ޤȤ��ɤߡפ�\n"
-"ȯ���λ����鿷�������򥹥����Ȥ��ޤ�."
+"ȯ���λ����鿷�������򥹥����Ȥ��ޤ���"
 
 #: Mailman/Gui/Digest.py:90
 msgid ""
 "Should Mailman send the next digest right now, if it is not\n"
 "             empty?"
-msgstr "�����Ǥ���᡼�뤬�����, �������ˡ֤ޤȤ��ɤߡפ�ȯ�����ޤ���?"
+msgstr "�����Ǥ���᡼�뤬����С��������ˡ֤ޤȤ��ɤߡפ�ȯ�����ޤ���?"
 
 #: Mailman/Gui/Digest.py:145
 msgid ""
 "The next digest will be sent as volume\n"
 "            %(volume)s, number %(number)s"
-msgstr "���ΤޤȤ��ɤߤ��� %(volume)s ��, �� %(number)s ��Ǥ�."
+msgstr "���ΤޤȤ��ɤߤ��� %(volume)s ��, �� %(number)s ��Ǥ���"
 
 #: Mailman/Gui/Digest.py:150
 msgid "A digest has been sent."
-msgstr "�ޤȤ��ɤߤ�ȯ�����ޤ���."
+msgstr "�ޤȤ��ɤߤ�ȯ�����ޤ�����"
 
 #: Mailman/Gui/Digest.py:152
 msgid "There was no digest to send."
-msgstr "ȯ�����٤�, �ޤȤ��ɤߤ�����ޤ���."
+msgstr "ȯ�����٤����ޤȤ��ɤߤ�����ޤ���"
 
 #: Mailman/Gui/GUIBase.py:173
 msgid "Invalid value for variable: %(property)s"
@@ -4895,7 +4909,7 @@ msgid ""
 msgstr ""
 "ʸ���� <code>%(property)s</code> ���ִ��ѿ��ν񼰤�����������ޤ���:\n"
 " <code>%(bad)s</code>\n"
-"<p>�����������ޤǤ�, �᡼��󥰥ꥹ�Ȥ�����˵�ǽ���ޤ���."
+"<p>�����������ޤǤϡ��᡼��󥰥ꥹ�Ȥ�����˵�ǽ���ޤ���"
 
 #: Mailman/Gui/GUIBase.py:218
 msgid ""
@@ -4905,9 +4919,9 @@ msgid ""
 "                    double check that this is what you intended.\n"
 "                    "
 msgstr ""
-"<code>%(property)s</code>�ο�����ʸ�˽�����ǽ�����꤬����ޤ�.\n"
-"������Ԥä����Ŭ�Ѥ��ޤ���, ����Ǥ褤��, ��Ť˥����å�\n"
-"���Ƥ�������."
+"<code>%(property)s</code>�ο�����ʸ�˽�����ǽ�����꤬����ޤ���\n"
+"������Ԥä����Ŭ�Ѥ��ޤ���������Ǥ褤������Ť˥����å�\n"
+"���Ƥ���������"
 
 #: Mailman/Gui/General.py:37
 msgid "General Options"
@@ -4933,7 +4947,7 @@ msgstr "
 msgid ""
 "Fundamental list characteristics, including descriptive\n"
 "            info and basic behaviors."
-msgstr "����Ū�ʥꥹ�Ȥ�����, ��������, ����ư��"
+msgstr "����Ū�ʥꥹ�Ȥ��������������󡢴���ư��"
 
 #: Mailman/Gui/General.py:65
 msgid "General list personality"
@@ -4941,7 +4955,7 @@ msgstr "
 
 #: Mailman/Gui/General.py:68
 msgid "The public name of this list (make case-changes only)."
-msgstr "��ɽ����뤳�Υꥹ�Ȥ�̾�� (��ʸ���ؤ��ѹ�������ǽ)."
+msgstr "��ɽ����뤳�Υꥹ�Ȥ�̾�� (��ʸ���ؤ��ѹ�������ǽ)��"
 
 #: Mailman/Gui/General.py:69
 msgid ""
@@ -4955,12 +4969,12 @@ msgid ""
 "             addresses are not case sensitive, but they are sensitive to\n"
 "             almost everything else :-)"
 msgstr ""
-"��ʸ����Ȥ��ȸ�ͭ̾��Ȥ���ǧ�����Ƥ�館��Τ�,\n"
-" ��ǫ�ʲ�Ҥػ��äƤ��äƤ����Ѥ��ޤ�. \n"
-" �ޤ�, Ƭʸ����ά�����ʸ����ɽ�����Ƥ�褤�Ǥ��礦. \n"
-" ������, ̾���ϥ᡼�륢�ɥ쥹�Ȥ��ƹ��𤵤��Τ�\n"
-" (���Ȥ���, �����ǧ�᡼��ʤɤ�)\n"
-" ¾��ʸ�����֤������뤳�Ȥ�<em>�Ǥ��ޤ���</em>. \n"
+"��ʸ����Ȥ��ȸ�ͭ̾��Ȥ���ǧ�����Ƥ�館��Τǡ�\n"
+" ��ǫ�ʲ�Ҥػ��äƤ��äƤ����Ѥ��ޤ���\n"
+" �ޤ���Ƭʸ����ά�����ʸ����ɽ�����Ƥ�褤�Ǥ��礦��\n"
+" ��������̾���ϥ᡼�륢�ɥ쥹�Ȥ��ƹ��𤵤��Τ�\n"
+" (���Ȥ��С������ǧ�᡼��ʤɤ�)\n"
+" ¾��ʸ�����֤������뤳�Ȥ�<em>�Ǥ��ޤ���</em>��\n"
 " (�Żҥ᡼�륢�ɥ쥹���羮ʸ���ζ��̤򤷤ޤ���\n"
 " ¾�ΤۤȤ�ɤΤ��Ȥ϶��̤��ޤ� :-)"
 
@@ -4969,8 +4983,8 @@ msgid ""
 "The list administrator email addresses.  Multiple\n"
 "             administrator addresses, each on separate line is okay."
 msgstr ""
-"�ꥹ�ȴ����ԤΥ᡼�륢�ɥ쥹. ʣ���δ����Ԥ�\n"
-" �̡��ιԤˤʤ�٤Ƥ�褤."
+"�ꥹ�ȴ����ԤΥ᡼�륢�ɥ쥹��ʣ���δ����Ԥ�\n"
+" �̡��ιԤˤʤ�٤Ƥ�褤��"
 
 #: Mailman/Gui/General.py:81
 msgid ""
@@ -4999,30 +5013,30 @@ msgid ""
 "             addresses of the list moderators</a>.  Note that the field you\n"
 "             are changing here specifies the list administrators."
 msgstr ""
-"�᡼��󥰥ꥹ�Ȥδ�����(��ͭ��)�ˤϣ��Ĥ���䤬����ޤ�. \n"
+"�᡼��󥰥ꥹ�Ȥδ�����(��ͭ��)�ˤ�2�Ĥ���䤬����ޤ���\n"
 "<em>�ꥹ�ȴ�����</em>�Ϥ��Υ᡼��󥰥ꥹ�ȤΤ��٤ƤΥѥ�᡼����\n"
-"�Ĥ��Ƶ�ˤ������Ԥʤ��ޤ�. ����Web�ڡ������̤����ѹ��Ǥ���\n"
-"���٤Ƥ������ѿ����ѹ����뤳�Ȥ��Ǥ��ޤ�. \n"
+"�Ĥ��Ƶ�ˤ������Ԥʤ��ޤ�������Web�ڡ������̤����ѹ��Ǥ���\n"
+"���٤Ƥ������ѿ����ѹ����뤳�Ȥ��Ǥ��ޤ���\n"
 "\n"
-"<p>����, <em>�ꥹ�Ȼʲ��</em> �λŻ���, �����ꤵ��Ƥ��ޤ�. \n"
-"�ꥹ�Ȥ������ѿ����ѹ����뤳�ȤϤǤ��ޤ���, ��α��δ���������\n"
-"�������뤳�Ȥ��Ǥ��ޤ�. �Ĥޤ�, ��α�����������ǧ��������ݤ��뤳��, \n"
-"��α�����ƥ᡼���������뤳�ȤʤɤǤ�. �������, <em>�ꥹ�ȴ�����</em>\n"
-"��, ���������򤹤뤳�Ȥ��Ǥ��ޤ�. \n"
+"<p>������<em>�ꥹ�Ȼʲ��</em> �λŻ��ϡ������ꤵ��Ƥ��ޤ���\n"
+"�ꥹ�Ȥ������ѿ����ѹ����뤳�ȤϤǤ��ޤ��󤬡���α��δ���������\n"
+"�������뤳�Ȥ��Ǥ��ޤ����Ĥޤꡢ��α�����������ǧ��������ݤ��뤳�ȡ�\n"
+"��α�����ƥ᡼���������뤳�ȤʤɤǤ����������<em>�ꥹ�ȴ�����</em>\n"
+"�⡢���������򤹤뤳�Ȥ��Ǥ��ޤ���\n"
 "\n"
-"<p>�ꥹ�Ƚ�ͭ�ԤλŻ�������ԤȻʲ�Ԥ�ʬ����ˤ�, \n"
+"<p>�ꥹ�Ƚ�ͭ�ԤλŻ�������ԤȻʲ�Ԥ�ʬ����ˤϡ�\n"
 "<a href=\"passwords\">�̤λʲ�ԥѥ���ɤ�����</a>\n"
-"���Ƥ�������. �ޤ�, <a href=\"?VARHELP=general/moderator\">�ʲ�Ԥ�\n"
-"�᡼�륢�ɥ쥹��</a>�������Ƥ�������. ������, �ѹ����褦�Ȥ��Ƥ���Τ�\n"
-"�ꥹ�ȴ����ԤˤĤ��ƤǤ�. "
+"���Ƥ����������ޤ���<a href=\"?VARHELP=general/moderator\">�ʲ�Ԥ�\n"
+"�᡼�륢�ɥ쥹��</a>�������Ƥ��������������ǡ��ѹ����褦�Ȥ��Ƥ���Τ�\n"
+"�ꥹ�ȴ����ԤˤĤ��ƤǤ���"
 
 #: Mailman/Gui/General.py:102
 msgid ""
 "The list moderator email addresses.  Multiple\n"
 "             moderator addresses, each on separate line is okay."
 msgstr ""
-"�ꥹ�Ȼʲ�ԤΥ᡼�륢�ɥ쥹. ʣ���λʲ�Ԥ�\n"
-" �̡��ιԤˤʤ�٤Ƥ�褤."
+"�ꥹ�Ȼʲ�ԤΥ᡼�륢�ɥ쥹��ʣ���λʲ�Ԥ�\n"
+" �̡��ιԤˤʤ�٤Ƥ�褤��"
 
 #: Mailman/Gui/General.py:105
 msgid ""
@@ -5050,27 +5064,27 @@ msgid ""
 "             this section.  Note that the field you are changing here\n"
 "             specifies the list moderators."
 msgstr ""
-"�᡼��󥰥ꥹ�Ȥδ�����(��ͭ��)�ˤϣ��Ĥ���䤬����ޤ�. \n"
+"�᡼��󥰥ꥹ�Ȥδ�����(��ͭ��)�ˤ�2�Ĥ���䤬����ޤ���\n"
 "<em>�ꥹ�ȴ�����</em>�Ϥ��Υ᡼��󥰥ꥹ�ȤΤ��٤ƤΥѥ�᡼����\n"
-"�Ĥ��Ƶ�ˤ������Ԥʤ��ޤ�. ����Web�ڡ������̤����ѹ��Ǥ���\n"
-"���٤Ƥ������ѿ����ѹ����뤳�Ȥ��Ǥ��ޤ�. \n"
+"�Ĥ��Ƶ�ˤ������Ԥʤ��ޤ�������Web�ڡ������̤����ѹ��Ǥ���\n"
+"���٤Ƥ������ѿ����ѹ����뤳�Ȥ��Ǥ��ޤ���\n"
 "\n"
-"<p>����, <em>�ꥹ�Ȼʲ��</em> �λŻ���, �����ꤵ��Ƥ��ޤ�. \n"
-"�ꥹ�Ȥ������ѿ����ѹ����뤳�ȤϤǤ��ޤ���, ��α��δ���������\n"
-"�������뤳�Ȥ��Ǥ��ޤ�. �Ĥޤ�, ��α�����������ǧ��������ݤ��뤳��, \n"
-"��α�����ƥ᡼���������뤳�ȤʤɤǤ�. �������, <em>�ꥹ�ȴ�����</em>\n"
-"��, ���������򤹤뤳�Ȥ��Ǥ��ޤ�. \n"
+"<p>������<em>�ꥹ�Ȼʲ��</em> �λŻ��ϡ������ꤵ��Ƥ��ޤ���\n"
+"�ꥹ�Ȥ������ѿ����ѹ����뤳�ȤϤǤ��ޤ��󤬡���α��δ���������\n"
+"�������뤳�Ȥ��Ǥ��ޤ����Ĥޤꡢ��α�����������ǧ��������ݤ��뤳�ȡ�\n"
+"��α�����ƥ᡼���������뤳�ȤʤɤǤ����������<em>�ꥹ�ȴ�����</em>\n"
+"�⡢���������򤹤뤳�Ȥ��Ǥ��ޤ���\n"
 "\n"
-"<p>�ꥹ�Ƚ�ͭ�ԤλŻ�������ԤȻʲ�Ԥ�ʬ����ˤ�, \n"
+"<p>�ꥹ�Ƚ�ͭ�ԤλŻ�������ԤȻʲ�Ԥ�ʬ����ˤϡ�\n"
 "<a href=\"passwords\">\n"
-"�̤λʲ�ԥѥ���ɤ�����</a>���Ƥ�������. �ޤ�, ���Υ��������ˤϻʲ��"
+"�̤λʲ�ԥѥ���ɤ�����</a>���Ƥ����������ޤ������Υ��������ˤϻʲ��"
 "��\n"
-"�᡼�륢�ɥ쥹�������Ƥ�������. ������, �ѹ����褦�Ȥ��Ƥ���Τ�\n"
-"�ꥹ�Ȼʲ�ԤˤĤ��ƤǤ�. "
+"�᡼�륢�ɥ쥹�������Ƥ��������������ǡ��ѹ����褦�Ȥ��Ƥ���Τ�\n"
+"�ꥹ�Ȼʲ�ԤˤĤ��ƤǤ���"
 
 #: Mailman/Gui/General.py:126
 msgid "A terse phrase identifying this list."
-msgstr "�᡼��󥰥ꥹ�Ȥ����Ƥ�ɽ�����."
+msgstr "�᡼��󥰥ꥹ�Ȥ����Ƥ�ɽ����硣"
 
 #: Mailman/Gui/General.py:128
 msgid ""
@@ -5081,9 +5095,9 @@ msgid ""
 "what\n"
 "                the list is."
 msgstr ""
-"����������, �᡼��󥰥ꥹ�Ȱ����Ǥ�������إå���ʬ�˻Ȥ��ޤ�. \n"
-"�Ǥ�������ʷ��, �����ƥꥹ�Ȥ���Ū�����Ӥ�狼��䤹����������\n"
-"���򵭽Ҥ��Ƥ�������."
+"���������ϡ��᡼��󥰥ꥹ�Ȱ����Ǥ�������إå���ʬ�˻Ȥ��ޤ���\n"
+"�Ǥ�������ʷ�ˡ������ƥꥹ�Ȥ���Ū�����Ӥ�狼��䤹����������\n"
+"���򵭽Ҥ��Ƥ���������"
 
 #: Mailman/Gui/General.py:134
 msgid ""
@@ -5093,10 +5107,10 @@ msgid ""
 "             page.  Carriage returns will end a paragraph - see the details\n"
 "             for more info."
 msgstr ""
-"���Υ᡼��󥰥ꥹ�ȤξҲ�ʸ (����������). \n"
-"���ξҲ�ʸ��, �������Υڡ����� HTML�Ȥ��ư��Ѥ���ޤ�. \n"
-"�ʤ�, ���Ԥϲ��ԥ������Ѵ�����ޤ���,\n"
-"�ܤ��������� info�ξܺ٤򻲾Ȥ��Ƥ�������. "
+"���Υ᡼��󥰥ꥹ�ȤξҲ�ʸ (����������)��\n"
+"���ξҲ�ʸ�ϡ��������Υڡ����� HTML�Ȥ��ư��Ѥ���ޤ���\n"
+"�ʤ������Ԥϲ��ԥ������Ѵ�����ޤ�����\n"
+"�ܤ��������� info�ξܺ٤򻲾Ȥ��Ƥ���������"
 
 #: Mailman/Gui/General.py:138
 msgid ""
@@ -5111,15 +5125,15 @@ msgid ""
 "             display of the entire listinfo page."
 msgstr ""
 "����ʸ�ϲ��Ԥ� &lt;br&gt; ���ѹ�����뤳��<em>�ʳ�</em>��\n"
-" HTML�Ȥ��ư����뤿��, ��󥯤������Ѥߥƥ����ȤʤȤ��Ȥ��ޤ�.\n"
-" ������, �����ʬ������ʳ��ϲ��Ԥ��ʤ��Ǥ�������.\n"
+" HTML�Ȥ��ư����뤿�ᡢ��󥯤������Ѥߥƥ����ȤʤȤ��Ȥ��ޤ���\n"
+" �������������ʬ������ʳ��ϲ��Ԥ��ʤ��Ǥ���������\n"
 " �ޤ�, �ѹ���ʬ��褯�����å����Ƥ������� - \n"
 " HTML�˴ְ㤤�������(�������Ĥ��Ƥ��ʤ��ʤ�)����Υڡ���������\n"
-" ɽ������ʤ����Ȥ⤢��ޤ�."
+" ɽ������ʤ����Ȥ⤢��ޤ���"
 
 #: Mailman/Gui/General.py:146
 msgid "Prefix for subject line of list postings."
-msgstr "��̾����Ƭ���դ�����"
+msgstr "��̾����Ƭ���դ����硣"
 
 #: Mailman/Gui/General.py:147
 msgid ""
@@ -5135,12 +5149,12 @@ msgid ""
 "                            (listname %%05d) -> (listname 00123)\n"
 "             "
 msgstr ""
-"���ꤷ�������̾����Ƭ���դ��ޤ�.\n"
-"�᡼�륽�եȤΰ������̤�, �ꥹ�Ȥ���Υ᡼�뤬���̤��䤹���ʤ�ޤ�.\n"
-"���ꤹ����ϴʷ�ˤ��Ƥ�������. \n"
-"�ꥹ��̾��Ĺ���Ȥ���, �狼�����٤�û������Ȥ����Ǥ��礦. \n"
-"�����, \n"
-"%%d �ؼ��Ҥ��̤��ֹ������뤳�Ȥ��Ǥ��ޤ�.\n"
+"���ꤷ�������̾����Ƭ���դ��ޤ���\n"
+"�᡼�륽�եȤΰ������̤ǡ��ꥹ�Ȥ���Υ᡼�뤬���̤��䤹���ʤ�ޤ���\n"
+"���ꤹ����ϴʷ�ˤ��Ƥ���������\n"
+"�ꥹ��̾��Ĺ���Ȥ��ϡ��狼�����٤�û������Ȥ����Ǥ��礦��\n"
+"����ˡ�\n"
+"%%d �ؼ��Ҥ��̤��ֹ������뤳�Ȥ��Ǥ��ޤ���\n"
 "��: [listname %%d] -> [listname 123], (listname %%05d) -> (listname 00123)"
 
 #: Mailman/Gui/General.py:158 Mailman/Gui/Privacy.py:288
@@ -5157,9 +5171,9 @@ msgid ""
 "             address to mitigate issues stemming from the original From:\n"
 "             domain's DMARC or similar policies."
 msgstr ""
-"From: �إå����Υ᡼�륢�ɥ쥹��ꥹ�Ȥ���ƥ��ɥ쥹���֤�����,\n"
+"From: �إå����Υ᡼�륢�ɥ쥹��ꥹ�Ȥ���ƥ��ɥ쥹���֤�������\n"
 "             ���� From: �ɥᥤ��� DMARC ���뤤������Υݥꥷ���ˤ��\n"
-"             �������������¤��ޤ�."
+"             �������������¤��ޤ���"
 
 #: Mailman/Gui/General.py:162
 msgid ""
@@ -5242,44 +5256,44 @@ msgid ""
 msgstr ""
 "�᡼���񤤤��ͤΥ��ɥ쥹(�ĤޤꡢFrom: �إå������ե������)��\n"
 "             �ɥᥤ��λ��ѤˤĤ��Ƥ����������ǧ���뤿��ˤ����Ĥ��\n"
-"             �ץ��ȥ��뤬�����ǤϹ����Ȥ��Ƥ��ޤ�. ���������ץ��ȥ����\n"
+"             �ץ��ȥ��뤬�����ǤϹ����Ȥ��Ƥ��ޤ������������ץ��ȥ����\n"
 "             ��ˤϥեå���ǽ�Τ褦�˥᡼��󥰥ꥹ�Ȥˤ褯����褦��\n"
 "             ��ǽ�����Ƥ�ʤ����Ȥ⤢�ꡢ�ꥹ�Ȼ��äΤ���Υ����ӥ���\n"
 "             From: �ե�����ɤΤ����������ͳ���������顼���������������\n"
-"             ���ޤ�. <b>���η�̲���ϥ᡼�����������ʤ�������뤳�Ȥ�\n"
-"             �Ǥ���ˤ�ؤ�餺����񤵤����뤳�Ȥˤʤ�ޤ�.</b>\n"
+"             ���ޤ���<b>���η�̲���ϥ᡼�����������ʤ�������뤳�Ȥ�\n"
+"             �Ǥ���ˤ�ؤ�餺����񤵤����뤳�Ȥˤʤ�ޤ���</b>\n"
 "             <p>\n"
 "             �ʲ��ν����򤳤������򤷤���硢����ϥꥹ�Ȥ����Ƥ�\n"
-"             ��å�������Ŭ�Ѥ���ޤ�. From: �إå��Υɥᥤ�󤬤�������\n"
+"             ��å�������Ŭ�Ѥ���ޤ��� From: �إå��Υɥᥤ�󤬤�������\n"
 "             �ץ��ȥ������Ѥ���褦�ʥɥᥤ��Ǥ����å��������Ф���\n"
 "             �Τߤ����ν�����Ŭ�Ѥ���ˤϡ�\n"
 "             �֥ץ饤�Х��������ץ����... -&gt; �����ԥե��륿�פ�<a\n"
 "             href=\"?VARHELP=privacy/sender/dmarc_moderation_action\">\n"
-"             dmarc_moderation_action</a> �򻲾Ȥ��Ƥ�������.\n"
+"             dmarc_moderation_action</a> �򻲾Ȥ��Ƥ���������\n"
 "             <p>����:<p>\n"
 "             <dl>\n"
 "             <dt>������</dt>\n"
-"             <dd>�������̤ʤ��ȤϤ��ޤ���. �����ƿ̾�ꥹ�Ȥ˸����Ƥ��ޤ�.\n"
+"             <dd>�������̤ʤ��ȤϤ��ޤ��󡣤����ƿ̾�ꥹ�Ȥ˸����Ƥ��ޤ���\n"
 "             ��Ƹ��¤������ƼԤ� From: �Υ��ɥ쥹�Υɥᥤ��\n"
 "             DMARC �䤽�������Υݥꥷ����ȤäƤ��ʤ��褦�ʾ��ˤϡ�\n"
-"             ���ʥ������ѤΥꥹ�Ȥˤ�����Ƥ��ޤ�. �ޤ������Υꥹ�Ȥ�\n"
+"             ���ʥ������ѤΥꥹ�Ȥˤ�����Ƥ��ޤ����ޤ������Υꥹ�Ȥ�\n"
 "             �Ф��� dmarc_moderation_action ��־�ǧ�װʳ������ꤷ��\n"
-"             ���ˤ�����Ƥ��ޤ�.</dd>\n"
+"             ���ˤ�����Ƥ��ޤ���</dd>\n"
 "             <dt>From ��񤭴���</dt>\n"
 "             <dd>���ε�ǽ�� From: �إå�����ƼԤΥ��ɥ쥹��ꥹ�Ȥ�\n"
 "             ����ѥ��ɥ쥹���֤���������ƼԤΥ��ɥ쥹�򸵤� Reply-To: \n"
-"             �إå��Υ��ɥ쥹���ɲä��ޤ�. </dd>\n"
+"             �إå��Υ��ɥ쥹���ɲä��ޤ���</dd>\n"
 "             <dt>�᡼�����ź��</dt>\n"
-"             <dd>From: �إå����˥ꥹ�Ȥ�����ѥ��ɥ쥹�ˤ�����Ƥ� From: \n"
+"             <dd>From: �إå�����ꥹ�Ȥ�����ѥ��ɥ쥹�Ȥ�����Ƥ� From: \n"
 "             ���ɥ쥹�򸵤� Reply-To: �إå����˲ä�����¦�Υ�å�������\n"
 "             ��Ƥ��줿��å������� Content-Type: message/rfc822 �Ȥ���\n"
 "             ��ƥ�å�������ź�դ��ޤ��� ����ϼ¼�Ū�ˤ�ñ��Υ�å�����\n"
-"             ����ʤ�MIME�����Υ�����������(�ޤȤ��ɤ�)�Ǥ�.</dd>\n"
+"             ����ʤ�MIME�����Υ�����������(�ޤȤ��ɤ�)�Ǥ���</dd>\n"
 "             </dl>\n"
 "             <p>anonymous_list ���Ф���񤭴����Ϥ����Τ�����ν�����\n"
-"             ����Ŭ�Ѥ���ޤ�. ƿ̾�ꥹ�Ȥ��Ф��Ƥϡ֤������װʳ��ν�����\n"
+"             ����Ŭ�Ѥ���ޤ���ƿ̾�ꥹ�Ȥ��Ф��Ƥϡ֤������װʳ��ν�����\n"
 "             Ŭ�Ѥ���Τ�̵�פǤ������⤷����򤷤��顢���η�̤�\n"
-"             �ä����Ȥˤʤ�Ǥ��礦.\n"
+"             �ä����Ȥˤʤ�Ǥ��礦��\n"
 "             <p>�ʲ���Reply-To: �إå��ν񤭴����ν����ϼ��Τ褦��\n"
 "             ��������ߤ˺��Ѥ��ޤ�:\n"
 "             <p> first_strip_reply_to = Yes (�Ϥ�)�ξ����Ϥ���\n"
@@ -5288,28 +5302,28 @@ msgstr ""
 "             ��ƼԤΥ��ɥ쥹�Τߡ���ƼԤΥ��ɥ쥹�ȥꥹ�Ȥ�\n"
 "             ����ѥ��ɥ쥹�����뤤����ƼԤΥ��ɥ쥹������Ū��\n"
 "             reply_to_address �Ȥ������Ǥ��������ƼԤΥ��ɥ쥹��\n"
-"             ���������å������� Reply-To: �˲ä��ޤ�.\n"
+"             ���������å������� Reply-To: �˲ä��ޤ���\n"
 "             first_strip_reply_to = No (������)��� Reply-To: \n"
 "             �إå�����ƼԤ� From: �إå��Υ��ɥ쥹�����Ǥ�\n"
 "             �ޤޤ�Ƥ��ʤ����ˤ� Reply-To: �إå��ˤ��ä����Ƥ�\n"
-"             ���ɥ쥹�˲ä�����ƼԤΥ��ɥ쥹�򤽤��˲ä��ޤ�.\n"
+"             ���ɥ쥹�˲ä�����ƼԤΥ��ɥ쥹�򤽤��˲ä��ޤ���\n"
 "             <p>�����ν����ϡ����������򤷤��ˤ���<a\n"
 "             href=\"?VARHELP=privacy/sender/dmarc_moderation_action\">\n"
 "             dmarc_moderation_action</a>������ˤ����ˤ���\n"
 "             ������������(�ޤȤ��ɤ�)����¸��ˡ��᡼�� &lt;-&gt; \n"
-"             �˥塼����������Υ�å������ˤ�Ŭ�Ѥ���ޤ���.\n"
+"             �˥塼����������Υ�å������ˤ�Ŭ�Ѥ���ޤ���\n"
 "             <p><a\n"
 "             href=\"?VARHELP=privacy/sender/dmarc_moderation_action\">\n"
 "             dmarc_moderation_action</a>���־�ǧ�װʳ���Ŭ�Ѥ����\n"
 "             ��ƥ�å������ˤĤ��Ƥϡ����ν����ǤϤʤ������餬\n"
-"             Ŭ�Ѥ���ޤ�."
+"             Ŭ�Ѥ���ޤ���"
 
 #: Mailman/Gui/General.py:224
 msgid ""
 "Hide the sender of a message, replacing it with the list\n"
 "             address (Removes From, Sender and Reply-To fields)"
 msgstr ""
-"�᡼��������Ԥ򱣤���, �ꥹ�ȤΥ��ɥ쥹���֤�������\n"
+"�᡼��������Ԥ򱣤��ơ��ꥹ�ȤΥ��ɥ쥹���֤�������\n"
 "(From, Sender �� Reply-To �������ޤ�)"
 
 #: Mailman/Gui/General.py:227
@@ -5323,10 +5337,10 @@ msgid ""
 "             regardless of whether an explict <tt>Reply-To:</tt> header is\n"
 "             added by Mailman or not."
 msgstr ""
-"�⤷, <tt>Reply-To:</tt>�إå����᡼����դ����Ƥ�����,\n"
-"�����������ޤ���? �⤷�����ʤ�, <tt>Reply-To:</tt>�إå�\n"
-"�� Mailman �ˤ�ä��դ���줿��, �Ϥ��ᤫ���դ��Ƥ�������\n"
-"������餺��������ޤ�."
+"�⤷��<tt>Reply-To:</tt>�إå����᡼����դ����Ƥ����顢\n"
+"�����������ޤ���? �⤷�����ʤ顢<tt>Reply-To:</tt>�إå�\n"
+"�� Mailman �ˤ�ä��դ���줿�����Ϥ��ᤫ���դ��Ƥ�������\n"
+"������餺��������ޤ���"
 
 #: Mailman/Gui/General.py:236
 msgid "Explicit address"
@@ -5347,9 +5361,9 @@ msgid ""
 "mailing\n"
 "             lists."
 msgstr ""
-"��Ƥ��줿�������ֿ��������Ǥ�������.\n"
+"��Ƥ��줿�������ֿ��������Ǥ���������\n"
 "�ۤȤ�ɤΥ᡼��󥰥ꥹ�ȤǤ� <tt>��Ƽ�</tt>\n"
-"�����֤��Ȥ� <em>����</em> �侩���ޤ�. "
+"�����֤��Ȥ� <em>����</em> �侩���ޤ���"
 
 #: Mailman/Gui/General.py:242
 msgid ""
@@ -5394,38 +5408,38 @@ msgid ""
 "             list."
 msgstr ""
 "���Υ᡼��󥰥ꥹ�Ȥ��ۿ������᡼���\n"
-"<tt>Reply-To:</tt> �إå����Ф����������ޤ�. \n"
-"<em>��Ƽ�</em>�����֤�, ������<tt>Reply-To:</tt>�إå����դ��ä����ޤ�"
-"��.\n"
-"��������ƼԤ���Υ᡼����դ��Ƥ�����ΤϤ��Τޤޤˤ��ޤ�.\n"
-"<em>���Υꥹ��</em>�ޤ���<em>�̤Υ��ɥ쥹</em>�����֤�, \n"
-"Mailman �Ϥ��٤ƤΥ᡼��˻��ꤵ�줿<tt>Reply-To:</tt>�إå����դ��ޤ�. \n"
-"ɬ�פʾ��ϸ��Υإå���񤭴����ޤ�. \n"
-"(<em>�̤Υ��ɥ쥹</em> �����֤�, \n"
+"<tt>Reply-To:</tt> �إå����Ф����������ޤ���\n"
+"<em>��Ƽ�</em>�����֤ȡ�������<tt>Reply-To:</tt>�إå����դ��ä����ޤ�"
+"��\n"
+"��������ƼԤ���Υ᡼����դ��Ƥ�����ΤϤ��Τޤޤˤ��ޤ���\n"
+"<em>���Υꥹ��</em>�ޤ���<em>�̤Υ��ɥ쥹</em>�����֤ȡ�\n"
+"Mailman �Ϥ��٤ƤΥ᡼��˻��ꤵ�줿<tt>Reply-To:</tt>�إå����դ��ޤ���\n"
+"ɬ�פʾ��ϸ��Υإå���񤭴����ޤ���\n"
+"(<em>�̤Υ��ɥ쥹</em> �����֤ȡ�\n"
 "<a href=\"?VARHELP=general/reply_to_address\">reply_to_address</a>��\n"
-"���ꤵ�줿���ɥ쥹���������ޤ�. )\n"
+"���ꤵ�줿���ɥ쥹���������ޤ���)\n"
 " \n"
 "<p><tt>Reply-To:</tt> �إå����դ��ä������ѹ�����٤��ǤϤʤ�\n"
-"��ͳ�Ϥ������󤢤�ޤ�. \n"
-"�ҤȤĤ�, <tt>Reply-To:</tt> �ˤ���ֿ������ꤷ�����ͤ�����Ȥ������Ȥ�"
-"��.\n"
-"�ޤ�, <tt>Reply-To:</tt>���ѹ�����ȸĿ�Ū���ֿ���\n"
-"���ݤˤʤ�Ȥ�����ͳ�⤢��ޤ�. \n"
+"��ͳ�Ϥ������󤢤�ޤ���\n"
+"�ҤȤĤϡ�<tt>Reply-To:</tt> �ˤ���ֿ������ꤷ�����ͤ�����Ȥ������Ȥ�"
+"����\n"
+"�ޤ���<tt>Reply-To:</tt>���ѹ�����ȸĿ�Ū���ֿ���\n"
+"���ݤˤʤ�Ȥ�����ͳ�⤢��ޤ���\n"
 "<a href=\"http://marc.merlins.org/netrants/reply-to-harmful.html\">`Reply-"
 "To' Munging\n"
-"Considered Harmful</a> ��, ���η�˴ؤ�������Ū�ʵ������ɤळ�Ȥ��Ǥ��ޤ�. \n"
-"������Ф���ȿ����, \n"
+"Considered Harmful</a> �ǡ����η�˴ؤ�������Ū�ʵ������ɤळ�Ȥ��Ǥ��ޤ���\n"
+"������Ф���ȿ���ϡ�\n"
 "<a href=\"http://marc.merlins.org/netrants/reply-to-useful.html\">Reply-To\n"
-"Munging Considered Useful</a> �ˤ���ޤ��Τǻ��ͤˤ��Ƥ�������. \n"
+"Munging Considered Useful</a> �ˤ���ޤ��Τǻ��ͤˤ��Ƥ���������\n"
 " \n"
-"<p>�᡼��󥰥ꥹ�Ȥˤ�äƤ���Ƥ����¤�, �¹Ԥ���Ƥ���Ѥ�\n"
-"�ꥹ�Ȥ����֤��뤳�Ȥ⤢��ޤ�. ��Ȥ��Ƥ� `patches' �� `checkin' �ꥹ��\n"
-"������ޤ�. �����Υꥹ�Ȥ�, ���եȥ��������ѹ�����ӥ������������ƥ�\n"
-"(RCS) ������Ƥ���ޤ�. ������, �ѹ��ˤĤ��Ƥε�����\n"
-"�̤γ�ȯ�ԥ᡼��󥰥ꥹ�ȤǹԤ��ޤ�. \n"
-"���Τ褦�ʥ᡼��󥰥ꥹ�Ȥα��Ѥˤ�, <tt>�̤Υ��ɥ쥹</tt>\n"
-"������, ���� <tt>Reply-To:</tt> ���ɥ쥹���¹ԥꥹ�Ȥ���ƥ��ɥ쥹��\n"
-"���ꤷ�Ƥ�������. "
+"<p>�᡼��󥰥ꥹ�Ȥˤ�äƤ���Ƥ����¤����¹Ԥ���Ƥ���Ѥ�\n"
+"�ꥹ�Ȥ����֤��뤳�Ȥ⤢��ޤ�����Ȥ��Ƥ� `patches' �� `checkin' �ꥹ��\n"
+"������ޤ��������Υꥹ�Ȥϡ����եȥ��������ѹ�����ӥ������������ƥ�\n"
+"(RCS) ������Ƥ���ޤ������������ѹ��ˤĤ��Ƥε�����\n"
+"�̤γ�ȯ�ԥ᡼��󥰥ꥹ�ȤǹԤ��ޤ���\n"
+"���Τ褦�ʥ᡼��󥰥ꥹ�Ȥα��Ѥˤϡ�<tt>�̤Υ��ɥ쥹</tt>\n"
+"�����ӡ����� <tt>Reply-To:</tt> ���ɥ쥹���¹ԥꥹ�Ȥ���ƥ��ɥ쥹��\n"
+"���ꤷ�Ƥ���������"
 
 #: Mailman/Gui/General.py:274
 msgid "Explicit <tt>Reply-To:</tt> header."
@@ -5471,36 +5485,36 @@ msgid ""
 "             <p>Note that if the original message contains a\n"
 "             <tt>Reply-To:</tt> header, it will not be changed."
 msgstr ""
-"���Υ��ɥ쥹��, <a href=\"?VARHELP=general/reply_goes_to_list"
+"���Υ��ɥ쥹����<a href=\"?VARHELP=general/reply_goes_to_list"
 "\">reply_goes_to_list</a>\n"
 "  ��<em>�̤Υ��ɥ쥹</em>�����ꤷ���Ȥ� <tt>Reply-To:</tt> �إå��˻Ȥ���"
-"��.\n"
+"����\n"
 "<p><tt>Reply-To:</tt> �Τ褦�ʥإå���\n"
-"  ¾�ͤΥ᡼����դ��ä��ʤ��Ȥ����Τˤ�, ¿������ͳ������ޤ�. \n"
+"  ¾�ͤΥ᡼����դ��ä��ʤ��Ȥ����Τˤϡ�¿������ͳ������ޤ���\n"
 "  �ͤˤ�äƤϼ�ʬ���Ȥ�<tt>Reply-To:</tt> ���դ����ֻ����Ϥ���\n"
-"  �ۤ����᡼�륢�ɥ쥹�����ꤷ�ޤ�. \n"
-"  �̤���ͳ�Ȥ���, <tt>Reply-To:</tt>���ѹ�����ȸĿ�Ū���ֻ���\n"
-"  ���뤳�Ȥ��񤷤��ʤ�Ȥ����Τ⤢��ޤ�. \n"
+"  �ۤ����᡼�륢�ɥ쥹�����ꤷ�ޤ���\n"
+"  �̤���ͳ�Ȥ��ơ�<tt>Reply-To:</tt>���ѹ�����ȸĿ�Ū���ֻ���\n"
+"  ���뤳�Ȥ��񤷤��ʤ�Ȥ����Τ⤢��ޤ���\n"
 "  <a href=\"http://marc.merlins.org/netrants/reply-to-harmful.html\">`Reply-"
 "To' Munging\n"
-"  Considered Harmful</a>  �ˤ�, ����ˤĤ��Ƥΰ���Ū�ʵ���������ޤ�. \n"
+"  Considered Harmful</a>  �ˤϡ�����ˤĤ��Ƥΰ���Ū�ʵ���������ޤ���\n"
 "  <a href=\"http://marc.merlins.org/netrants/reply-to-useful.html\">Reply-"
 "To\n"
-"  Munging Considered Useful</a> ��ȿ�аո��⻲�ͤˤ��Ƥ�������. \n"
+"  Munging Considered Useful</a> ��ȿ�аո��⻲�ͤˤ��Ƥ���������\n"
 "\n"
-"<p>�᡼��󥰥ꥹ�Ȥˤ�äƤ���Ƥ����¤�Ĥ���, ʿ�Ԥ���Ƥ���Τ����\n"
-"  �ꥹ�Ȥ��äƤ�����⤢��ޤ�. ��Ȥ��Ƥ� `patches' �� `checkin' �ꥹ"
+"<p>�᡼��󥰥ꥹ�Ȥˤ�äƤ���Ƥ����¤�Ĥ��ơ��¹Ԥ���Ƥ���Τ����\n"
+"  �ꥹ�Ȥ��äƤ�����⤢��ޤ�����Ȥ��Ƥ� `patches' �� `checkin' �ꥹ"
 "��\n"
-"  ������ޤ�. ���ξ�祽�եȥ��������ѹ��� revision control system\n"
-"  (���������浡��) ������Ƥ���ޤ�. ������, �ѹ��ˤĤ��Ƥε�����\n"
-"  �̤γ�ȯ�ԥ᡼��󥰥ꥹ�ȤǹԤ��ޤ�. \n"
-"  ���Υ����פΥ᡼��󥰥ꥹ�Ȥ򥵥ݡ��Ȥ��뤿��ˤ�, "
-"<tt>reply_goes_to_list</tt>��\n"
-"  <tt>�̤Υ��ɥ쥹</tt>�������, ������ <tt>Reply-To:</tt> ���ɥ쥹�����ꤷ��"
-"��������. \n"
+"  ������ޤ������ξ�祽�եȥ��������ѹ��� revision control system\n"
+"  (���������浡��) ������Ƥ���ޤ������������ѹ��ˤĤ��Ƥε�����\n"
+"  �̤γ�ȯ�ԥ᡼��󥰥ꥹ�ȤǹԤ��ޤ���\n"
+"  ���Υ����פΥ᡼��󥰥ꥹ�Ȥ򥵥ݡ��Ȥ��뤿��ˤϡ�"
+"<tt>reply_goes_to_list</tt>�ˤ�\n"
+"  <tt>�̤Υ��ɥ쥹</tt>���������塢������ <tt>Reply-To:</tt> ���ɥ쥹������"
+"���Ƥ���������\n"
 "\n"
-"<p>�⤷���ꥸ�ʥ�Υ᡼���<tt>Reply-To:</tt>�إå����դ��Ƥ����, ������ѹ�"
-"����ޤ���."
+"<p>�ʤ���������ƥ᡼���<tt>Reply-To:</tt>�إå����դ��Ƥ���ȡ�������ѹ���"
+"��ޤ���"
 
 #: Mailman/Gui/General.py:305
 msgid "Umbrella list settings"
@@ -5510,7 +5524,7 @@ msgstr "
 msgid ""
 "Send password reminders to, eg, \"-owner\" address instead of\n"
 "             directly to user."
-msgstr "�ѥ������˺���Τ�ľ�ܲ�������餺, \"-owner\" ��������ޤ�."
+msgstr "�ѥ������˺���Τ�ľ�ܲ�������餺��\"-owner\" ��������ޤ���"
 
 #: Mailman/Gui/General.py:311
 msgid ""
@@ -5523,10 +5537,10 @@ msgid ""
 msgstr ""
 "¾�Υ᡼��󥰥ꥹ��(�ҥꥹ��)���������뤿��Υ᡼��󥰥ꥹ��(�ƥꥹ��)��"
 "��\n"
-"�֤Ϥ��פ�����Ǥ�������.\n"
-"�֤Ϥ��פ����֤ȳ�ǧ��ѥ������˺���Τʤɤ�, \n"
+"�֤Ϥ��פ�����Ǥ���������\n"
+"�֤Ϥ��פ����֤ȳ�ǧ��ѥ������˺���Τʤɤϡ�\n"
 "����Υ��ɥ쥹�˰ʲ��ǻ��ꤹ�� \"umbrella_member_suffix\" ��\n"
-"�դ������ɥ쥹�������ޤ�. "
+"�դ������ɥ쥹�������ޤ���"
 
 #: Mailman/Gui/General.py:319
 msgid ""
@@ -5535,7 +5549,7 @@ msgid ""
 "             setting."
 msgstr ""
 "��� \"umbrella_list\" �����ꤷ�Ƥ��Υ᡼��󥰥ꥹ�Ȥ�ƥꥹ��\n"
-"�ˤ������Υ᡼�������˻Ȥ����ե��å���."
+"�ˤ������Υ᡼�������˻Ȥ����ե��å�����"
 
 #: Mailman/Gui/General.py:323
 msgid ""
@@ -5551,14 +5565,14 @@ msgid ""
 "\"\n"
 "             is \"No\"."
 msgstr ""
-"\"umbrella_list\" �����ꤹ���, ���Υ᡼��󥰥ꥹ�Ȥ�\n"
-"¾�Υ᡼��󥰥ꥹ��(�ҥꥹ��)�����Ȥ���ƥꥹ�Ȥˤʤ�ޤ�.\n"
-"���ξ��, ��ǧ��ѥ������˺���Τʤɤδ���������Τ�, \n"
-"����ꥹ�ȤΥ��ɥ쥹�ˤ����餺��, ���Υꥹ�Ȥδ����Ԥ�\n"
-"����ʤ���Фʤ�ޤ���. ����Υ��ɥ쥹�ˤ��������ꤹ��\n"
-"���ե��å������դ��ä����������ޤ�. �̾�, ���Υ��ե��å���\n"
-"�ˤ� \"-owner\" ��Ȥ��ޤ�. ��� \"umbrella_list\" ��\n"
-"�֤������פ���������, ��������ϻȤ��ޤ���."
+"\"umbrella_list\" �����ꤹ��ȡ����Υ᡼��󥰥ꥹ�Ȥ�\n"
+"¾�Υ᡼��󥰥ꥹ��(�ҥꥹ��)�����Ȥ���ƥꥹ�Ȥˤʤ�ޤ���\n"
+"���ξ�硢��ǧ��ѥ������˺���Τʤɤδ���������Τϡ�\n"
+"����ꥹ�ȤΥ��ɥ쥹�ˤ����餺�ˡ����Υꥹ�Ȥδ����Ԥ�\n"
+"����ʤ���Фʤ�ޤ��󡣲���Υ��ɥ쥹�ˤ��������ꤹ��\n"
+"���ե��å������դ��ä����������ޤ����̾���Υ��ե��å���\n"
+"�ˤ� \"-owner\" ��Ȥ��ޤ������ \"umbrella_list\" ��\n"
+"�֤������פ��������硢��������ϻȤ��ޤ���"
 
 #: Mailman/Gui/General.py:335
 msgid "Send monthly password reminders?"
@@ -5571,8 +5585,8 @@ msgid ""
 "their\n"
 "             own individual password reminders."
 msgstr ""
-"����ѥ���ɤ���˺���Τ�����������, ON �ˤ��ޤ�.\n"
-"����ϳƼ��ѥ������˺���Τ���������ߤ��뤳�Ȥ��Ǥ��ޤ�."
+"���1��ѥ���ɤ���˺���Τ����������硢ON �ˤ��ޤ���\n"
+"����ϳƼ��ѥ������˺���Τ���������ߤ��뤳�Ȥ��Ǥ��ޤ���"
 
 #: Mailman/Gui/General.py:342
 msgid ""
@@ -5602,17 +5616,17 @@ msgid ""
 "                 <li>A blank line separates paragraphs.\n"
 "             </ul>"
 msgstr ""
-"����ʸ�Ϥ�, ���������񤷤�����ؤδ���ʸ��\n"
-" �Ϥ���˽񤭤��ޤ�ޤ�. ����ʸ�λĤ����ʬ�ˤ�\n"
+"����ʸ�Ϥ������������񤷤�����ؤδ���ʸ��\n"
+" �Ϥ���˽񤭤��ޤ�ޤ�������ʸ�λĤ����ʬ�ˤ�\n"
 " �ꥹ�Ȥǽ��פʥ᡼�륢�ɥ쥹�� URL �ˤĤ��Ƥ�������\n"
-" ���餫����������Ƥ��ޤ�. �Ǥ����餽�����ä����\n"
-" ��Τ������ɬ�פϤ���ޤ���. �����ˤϥꥹ�Ȥ���Ū��\n"
+" ���餫����������Ƥ��ޤ����Ǥ����餽�����ä����\n"
+" ��Τ������ɬ�פϤ���ޤ��󡣤����ˤϥꥹ�Ȥ���Ū��\n"
 " �������åȤΥݥꥷ���Ȥ��ä���ͭ�������\n"
-" �Ĥ��ƽ񤤤Ƥ�������. <p>���� ����ʸ�Ϥϰʲ��ε�§�˽��äƹ������ޤ��֤�����"
+" �Ĥ��ƽ񤤤Ƥ���������<p>���� ����ʸ�Ϥϰʲ��ε�§�˽��äƹ������ޤ��֤�����"
 "����ޤ�:\n"
-"<ul><li>���Ԥ�70ʸ������ˤʤ�褦�˹Եͤ᤬�ʤ���ޤ�.\n"
-"    <li>����ʸ���ǻϤޤ�ԤϹԵͤᤵ��ޤ���.\n"
-"    <li>����Ԥ�����ζ��ڤ�ˤʤ�ޤ�.\n"
+"<ul><li>1�Ԥ�70ʸ������ˤʤ�褦�˹Եͤ᤬�ʤ���ޤ���\n"
+"    <li>����ʸ���ǻϤޤ�ԤϹԵͤᤵ��ޤ���\n"
+"    <li>����Ԥ�����ζ��ڤ�ˤʤ�ޤ���\n"
 "</ul>"
 
 #: Mailman/Gui/General.py:362
@@ -5629,16 +5643,16 @@ msgid ""
 "             list manager to Mailman."
 msgstr ""
 "�⤷���������Ԥ���ư����Ͽ���Ƥ��Τ��Ȥ�\n"
-"�Τ餻�����ʤ��ä��� OFF �ˤ��Ƥ�������. ¾�Υ᡼��󥰥ꥹ\n"
-"�ȴ����ץ�����फ�� Mailman �˰ܹԤ�����ʤɤ�ͭ���Ǥ��礦. "
+"�Τ餻�����ʤ��ä��� OFF �ˤ��Ƥ���������¾�Υ᡼��󥰥ꥹ\n"
+"�ȴ����ץ�����फ�� Mailman �˰ܹԤ�����ʤɤ�ͭ���Ǥ��礦��"
 
 #: Mailman/Gui/General.py:369
 msgid ""
 "Text sent to people leaving the list.  If empty, no special\n"
 "             text will be added to the unsubscribe message."
 msgstr ""
-"�ꥹ�����Ԥ���������ʸ��.  ����ˤ����\n"
-" ���԰��᡼��ˤϲ����ɲä���ޤ���. "
+"�ꥹ�����Ԥ���������ʸ�ϡ�����ˤ����\n"
+" ���԰��᡼��ˤϲ����ɲä���ޤ���"
 
 #: Mailman/Gui/General.py:373
 msgid "Send goodbye message to members when they are unsubscribed?"
@@ -5649,7 +5663,7 @@ msgid ""
 "Should the list moderators get immediate notice of new\n"
 "             requests, as well as daily notices about collected ones?"
 msgstr ""
-"�������������褿��, 1��1��ޤȤ���Τ餻������Ǥʤ�, �����˻ʲ�Ԥ��Τ餻��"
+"�������������褿�顢1��1��ޤȤ���Τ餻������Ǥʤ��������˻ʲ�Ԥ��Τ餻��"
 "����?"
 
 #: Mailman/Gui/General.py:379
@@ -5662,16 +5676,16 @@ msgid ""
 "             another.  Setting this option causes notices to be sent\n"
 "             immediately on the arrival of new requests as well."
 msgstr ""
-"�ʲ��(�ȴ�����)����α��δ��������˴ؤ�����˺���Τ������������ޤ�. \n"
-" ���Ȥ���������Υꥹ�Ȥؤβ���������, ���餫����ͳ��\n"
-" ��α����Ƥ�����ƤʤɤǤ�. ���Υ��ץ��������ꤹ���\n"
-" ��������������뤿�Ӥ�ľ�������Τ���ޤ�."
+"�ʲ��(�ȴ�����)����α��δ��������˴ؤ�����˺���Τ������������ޤ���\n"
+" ���Ȥ���������Υꥹ�Ȥؤβ��������䡢���餫����ͳ��\n"
+" ��α����Ƥ�����ƤʤɤǤ������Υ��ץ��������ꤹ���\n"
+" ��������������뤿�Ӥ�ľ�������Τ���ޤ���"
 
 #: Mailman/Gui/General.py:386
 msgid ""
 "Should administrator get notices of subscribes and\n"
 "             unsubscribes?"
-msgstr "����/���η�̤�����Ԥ����Τ��ޤ���? "
+msgstr "����/���η�̤�����Ԥ����Τ��ޤ���?"
 
 #: Mailman/Gui/General.py:391
 msgid "Send mail to poster when their posting is held for approval?"
@@ -5683,7 +5697,7 @@ msgstr "
 
 #: Mailman/Gui/General.py:397
 msgid "Emergency moderation of all list traffic."
-msgstr "���٤Ƥ���Ƥ�۵���α�ˤ��ޤ�."
+msgstr "���٤Ƥ���Ƥ�۵���α�ˤ��ޤ���"
 
 #: Mailman/Gui/General.py:398
 msgid ""
@@ -5693,23 +5707,23 @@ msgid ""
 "off\n"
 "             period."
 msgstr ""
-"���Υ��ץ�����ͭ���ˤ����, �ꥹ�Ȥؤ���Ƥ򤹤٤ƶ۵ޤ����¤�, \n"
-"��ǧ�Τ������α���ޤ�. ���Ȥ��Хꥹ�ȤǤε��������𤷤Ƽ꤬�Ĥ����\n"
-"�ʤ��ʤä�����, ��Ѵ��֤��ߤ���褦�ʤȤ��˻Ȥ��ޤ�."
+"���Υ��ץ�����ͭ���ˤ���ȡ��ꥹ�Ȥؤ���Ƥ򤹤٤ƶ۵ޤ����¤���\n"
+"��ǧ�Τ������α���ޤ������Ȥ��Хꥹ�ȤǤε��������𤷤Ƽ꤬�Ĥ����\n"
+"�ʤ��ʤä����ˡ���Ѵ��֤��ߤ���褦�ʤȤ��˻Ȥ��ޤ���"
 
 #: Mailman/Gui/General.py:410
 msgid ""
 "Default options for new members joining this list.<input\n"
 "             type=\"hidden\" name=\"new_member_options\" value=\"ignore\">"
 msgstr ""
-"��������Υǥե����������.\n"
+"��������ν�������͡�\n"
 "<input type=\"hidden\" name=\"new_member_options\" value=\"ignore\">"
 
 #: Mailman/Gui/General.py:413
 msgid ""
 "When a new member is subscribed to this list, their initial\n"
 "             set of options is taken from this variable's setting."
-msgstr "�����ѿ����꤬������ν������˻Ȥ��ޤ�."
+msgstr "�����ѿ��ˤ�����꤬������ν�����֤˻Ȥ��ޤ���"
 
 #: Mailman/Gui/General.py:417
 msgid ""
@@ -5728,23 +5742,24 @@ msgid ""
 "request,\n"
 "             in the process."
 msgstr ""
-"�������ޥ�ɸ����Ǥ���Ƥ�����å�����, ���줬������\n"
-" ������ο����Ǥ��뤫��Ĵ�٤ޤ�. (���Ȥ��� \n"
-" subscribe, unsubscribe, ��), �����ƴ����Ԥ�����˲ä�\n"
+"�������ޥ�ɸ����Ǥ���Ƥ�����å����ơ����줬������\n"
+" ������ο����Ǥ��뤫��Ĵ�٤ޤ�(���Ȥ���\n"
+" subscribe, unsubscribe, ��)�������ƴ����Ԥ�����˲ä�\n"
 " �����Ԥ˿�������������Ƥ��뤳�Ȥ�\n"
-" �Τ餻�ޤ�. "
+" �Τ餻�ޤ��� "
 
 #: Mailman/Gui/General.py:427
 msgid ""
 "Maximum length in kilobytes (KB) of a message body.  Use 0\n"
 "             for no limit."
-msgstr "��ƥ᡼����ʸ�κ��祵����(KB). 0 �����ꤹ���̵����. "
+msgstr ""
+"��ƥ᡼����ʸ�κ��祵����(KB)��̵���¤ˤ���ˤ� 0 �����ꤷ�Ƥ���������"
 
 #: Mailman/Gui/General.py:431
 msgid ""
 "Maximum number of members to show on one page of the\n"
 "             Membership List."
-msgstr "����ꥹ�Ȥ� 1 �ڡ�����ɽ����������β����."
+msgstr "����ꥹ�Ȥ� 1 �ڡ�����ɽ����������β������"
 
 #: Mailman/Gui/General.py:435
 msgid "Host name this list prefers for email."
@@ -5761,10 +5776,10 @@ msgid ""
 "has\n"
 "             multiple addresses."
 msgstr ""
-"\"host_name\" ��, ���Υۥ��Ȥ��Żҥ᡼��� Mailman �Υ��ɥ쥹��\n"
-" �Ȥ�����̾����, ���̤Ϥ��Υۥ��ȤΥ᡼���(MX) ���ɥ쥹�Ǥ�.\n"
-" ʣ���Υ��ɥ쥹�����ѤǤ�����, \n"
-" ���Ѥ��륢�ɥ쥹�򤳤������ꤷ�ޤ�."
+"\"host_name\" �ϡ����Υۥ��Ȥ��Żҥ᡼��� Mailman �Υ��ɥ쥹��\n"
+" �Ȥ�����̾���ǡ����̤Ϥ��Υۥ��ȤΥ᡼���(MX) ���ɥ쥹�Ǥ���\n"
+" ʣ���Υ��ɥ쥹�����ѤǤ����硢\n"
+" ���Ѥ��륢�ɥ쥹�򤳤������ꤷ�ޤ���"
 
 #: Mailman/Gui/General.py:449
 msgid ""
@@ -5774,9 +5789,9 @@ msgid ""
 "                 (i.e. <tt>List-*</tt>) headers?  <em>Yes</em> is highly\n"
 "                 recommended."
 msgstr ""
-"���Υ᡼��󥰥ꥹ�Ȥ���Υ᡼��� \n"
+"���Υ᡼��󥰥ꥹ�Ȥ���Υ᡼���\n"
 "<a href=\"http://www.faqs.org/rfcs/rfc2369.html\">RFC 2369</a> �إå�\n"
-"(<tt>List-*</tt>) ���դ��ޤ���? <em>�Ϥ�</em>�ˤ��뤳�Ȥ�侩���ޤ�."
+"(<tt>List-*</tt>) ���դ��ޤ���? <em>�Ϥ�</em>�ˤ��뤳�Ȥ�侩���ޤ���"
 
 #: Mailman/Gui/General.py:454
 msgid ""
@@ -5801,16 +5816,16 @@ msgid ""
 "disable\n"
 "                 these headers may eventually go away)."
 msgstr ""
-"RFC 2369��, �᡼��󥰥ꥹ�Ȥβ�����᡼����ɲä��� List-* �إå�����\n"
-"�������Ƥ��ޤ�. �����Τإå���, ɸ��˽�򤷤��᡼�륽�եȤ����Ѽ�\n"
-"�ˤϤȤƤ���Ω���ޤ�. ����դ���褦�ˤ���������.\n"
-"<p>������, ɬ�����⤹�٤ƤΥ᡼�륽�եȤ��ޤ�ɸ��˽�򤷤Ƥ���櫓�Ǥ�\n"
-"����ޤ���. �ޤ�, �������¿����ɸ��˽�򤷤Ƥ��ʤ��᡼�륽�եȤ�Ȥ�\n"
-"�Ƥ�����, �����Υإå����Ф����������Ф뤫�⤷��ޤ���. ���ξ���,\n"
-"�ޤ�, �����Υإå���������ͳ�����򤵤���, �᡼�륽�եȤ�ɽ�����鱣��\n"
-"��ˡ�򶵤���٤��Ǥ�. �Ǹ������Ȥ���, �����Υإå����դ��ʤ������\n"
-"�Ǥ��ޤ���, �����ᤷ�ޤ���. (����Υ�꡼���Ǥ�, ���Υإå��˴ؤ�������\n"
-"���Ǥ��ʤ��褦�ˤ��뤫�⤷��ޤ���.)"
+"RFC 2369�ǡ��᡼��󥰥ꥹ�Ȥβ�����᡼����ɲä��� List-* �إå�����\n"
+"�������Ƥ��ޤ��������Τإå��ϡ�ɸ��˽�򤷤��᡼�륽�եȤ����Ѽ�\n"
+"�ˤϤȤƤ���Ω���ޤ����̾�Ͼ����Ϳ����٤��Ǥ���\n"
+"<p>��������ɬ�����⤹�٤ƤΥ᡼�륽�եȤ��ޤ�ɸ��˽�򤷤Ƥ���櫓�Ǥ�\n"
+"�ʤ����ޤ����������¿����ɸ��˽�򤷤Ƥ��ʤ��᡼�륽�եȤ�ȤäƤ���\n"
+"��硢�����Υإå����Բ��˻פ����⤷��ޤ��󡣤��ξ��ϡ��ޤ�������\n"
+"��Υإå���������ͳ�����򤷤Ƥ�����������ǡ��᡼�륽�եȤ�ɽ�����鱣\n"
+"����ˡ�򶵤��뤳�Ȥ���Ϥ��٤��Ǥ����Ǹ������Ȥ��ơ������Υإå�\n"
+"���դ��ʤ������Ǥ��ޤ����������ᤷ�ޤ���(����Υ�꡼���Ǥϡ�����\n"
+"�إå��˴ؤ������꤬�Ǥ��ʤ��褦�ˤ��뤫�⤷��ޤ���)"
 
 #: Mailman/Gui/General.py:472
 msgid "Should postings include the <tt>List-Post:</tt> header?"
@@ -5834,12 +5849,12 @@ msgid ""
 "             headers.)"
 msgstr ""
 "<a href=\"http://www.faqs.org/rfcs/rfc2369.html\">RFC 2369</a>�ˤ��\n"
-"<tt>List-Post:</tt> �إå����դ��뤳�Ȥ��侩����Ƥ��ޤ�. \n"
-"������, ���Ȥ���<em>���ʥ�������</em>�Υ᡼��󥰥ꥹ�ȤʤɤǤ�, \n"
-"���������β��������ƤǤ���, ���̤β������Ƥ��Ǥ��ޤ���. \n"
-"���Τ褦�ʥꥹ�ȤǤ�, <tt>List-Post:</tt>�إå��ϸ���θ��ˤʤ�ޤ�����,\n"
-"<em>������</em>�������, ���Υإå���Ĥ��ʤ��褦�ˤ��ޤ�. \n"
-"(���������¾�� <tt>List-*:</tt>�إå��˱ƶ����ޤ���.)"
+"<tt>List-Post:</tt> �إå����դ��뤳�Ȥ��侩����Ƥ��ޤ���\n"
+"�����������Ȥ���<em>���ʥ�������</em>�Υ᡼��󥰥ꥹ�ȤʤɤǤϡ�\n"
+"���������β��������ƤǤ��������̤β������Ƥ��Ǥ��ޤ���\n"
+"���Τ褦�ʥꥹ�ȤǤϡ�<tt>List-Post:</tt>�إå��ϸ���θ��ˤʤ�ޤ����顢\n"
+"<em>������</em>������ǡ����Υإå���Ĥ��ʤ��褦�ˤ��ޤ���\n"
+"(���������¾�� <tt>List-*:</tt>�إå��˱ƶ����ޤ���)"
 
 #: Mailman/Gui/General.py:489
 msgid ""
@@ -5847,8 +5862,8 @@ msgid ""
 "                 mailing list to avoid stray bounces?  <em>Yes</em> is\n"
 "                 recommended."
 msgstr ""
-"<tt>Sender (������)</tt> �إå�����Ѥ���, ���顼�᡼�뤬�»Ҥ�\n"
-" �ʤ�ʤ��褦�ˤ��ޤ���? <em>�Ϥ�</em>��侩���ޤ�."
+"<tt>Sender (������)</tt> �إå�����Ѥ��ơ����顼�᡼�뤬�»Ҥ�\n"
+" �ʤ�ʤ��褦�ˤ��ޤ���? <em>�Ϥ�</em>��侩���ޤ���"
 
 #: Mailman/Gui/General.py:493
 msgid ""
@@ -5871,25 +5886,28 @@ msgid ""
 "                 bounce address on reply-to-all), so it can be disabled \n"
 "                 here."
 msgstr ""
-"<a href=\"http://www.faqs.org/rfcs/rfc2822.html\">RFC 2822</a>\n"
-"��, <tt>Sender (������)</tt>�إå����������, \"�ºݤΥ᡼��������\n"
-"��Ǥ����������� (agent) �Υ᡼��ܥå���\" �ȤʤäƤ���. \n"
-"Mailman �Ϥ��Υإå���ꥹ�ȤΥ��顼���� (bounce) ���ɥ쥹���֤������Ƥ���.\n"
+"<a href=\"http://www.faqs.org/rfcs/rfc5322.html\">RFC 5322</a>\n"
+"�ǡ�<tt>Sender (������)</tt>�إå���������졢\"�ºݤΥ᡼��������\n"
+"��Ǥ����������� (agent) �Υ᡼��ܥå���\" �ȤʤäƤ��ޤ���\n"
+"Mailman �Ϥ��Υإå���ꥹ�ȤΥ��顼���� (bounce) ���ɥ쥹���֤�\n"
+"�����Ƥ��ޤ���\n"
 "<p>\n"
-"Mailman �����Τ褦�������ͤǤ��뤫�ɤ����ˤĤ��Ƥϵ�����;�Ϥ����뤬,\n"
-"�ְ�ä������� MTA ����Υ��顼���Τ����������ɥ쥹�˸�����Τ�����Ƥ���.\n"
-"�����Ǥ���᡼��꡼���Ϥ��Υإå������ꤵ��Ƥ���ȴ��ԤϤ����ư��򤹤�.\n"
-"(�㤨��, ž�������Ȥ��˥��ɥ쥹������ˤʤ�Ȥ�, ���������ֿ��פ����Ȥ���\n"
-"���Υ��顼���Υ��ɥ쥹�ˤ���������Ȥ�) ���ä�, ������̵���ˤǤ���褦�ˤ�"
-"��.\n"
+"Mailman �����Τ褦�������ͤǤ��뤫�ɤ����ˤĤ��Ƥϵ�����;�Ϥ�����ޤ�����\n"
+"��������������Ƥ��ʤ� MTA �����顼���Τ����������ɥ쥹�˰��Ƥ�Τ���Ω�äƤ�"
+"�ޤ���\n"
+"�����ǡ����Υإå������ꤵ��Ƥ���Ȼפ�����ʤ�ư��򤹤�᡼�륽�եȤ⤢"
+"��ޤ���\n"
+"(�㤨�С�ž�������Ȥ��˥��ɥ쥹������ˤʤä��ꡢ���������ֿ��פ����Ȥ���\n"
+"���Υ��顼���Υ��ɥ쥹�ˤ�����������) ���äơ�������̵���ˤǤ���褦�ˤ��ޤ�"
+"����\n"
 
 #: Mailman/Gui/General.py:511
 msgid ""
 "Discard held messages older than this number of days.\n"
 "            Use 0 for no automatic discarding."
 msgstr ""
-"�����������Ť���α�᡼����˴����ޤ�.\n"
-"��ư�˴��򤷤ʤ����� 0 �ˤ��Ƥ�������."
+"�����������Ť���α�᡼����˴����ޤ���\n"
+"��ư�˴��򤷤ʤ����� 0 �ˤ��Ƥ���������"
 
 #: Mailman/Gui/General.py:521
 msgid ""
@@ -5898,7 +5916,7 @@ msgid ""
 "            only."
 msgstr ""
 "<b>real_name</b>°�����ѹ�����ޤ���!\n"
-"�ꥹ��̾����ʸ����ʸ�����ѹ�������������ޤ�."
+"�ꥹ��̾����ʸ����ʸ�����ѹ�������������ޤ���"
 
 #: Mailman/Gui/General.py:549
 msgid ""
@@ -5913,12 +5931,12 @@ msgid ""
 "mlist.info.\n"
 "                        "
 msgstr ""
-"���ʤ�����¸���� <b>info</b> °���ˤ�, �桼���򥯥��������ȥ�����ץȹ����\n"
-"���餹�褦�ʵ��路�� HTML�����ɤ��ޤޤ�Ƥ��ޤ�.���Τ���, �ѹ��ϵѲ����ޤ�"
-"��. �⤷, �ɤ����Ƥ��ѹ���ɬ�פǤ����, \n"
-"Mailman �����Ф˥����륢���������ʤ���Фʤ�ޤ���.\n"
-"�ѹ��ˤ� bin/withlist ���� bin/config_list ��Ȥä�\n"
-"mlist.info �����ꤷ�ޤ�.\n"
+"���ʤ�����¸���� <b>info</b> °���ˤϡ��桼���򥯥��������ȥ�����ץȹ����\n"
+"���餹�褦�ʵ��路�� HTML�����ɤ��ޤޤ�Ƥ��ޤ������Τ��ᡢ�ѹ��ϵѲ����ޤ�"
+"�����⤷���ɤ����Ƥ��ѹ���ɬ�פǤ���С�\n"
+"Mailman �����Ф˥����륢���������ʤ���Фʤ�ޤ���\n"
+"�ѹ��ˤ� bin/withlist ���뤤�� bin/config_list ��Ȥä�\n"
+"mlist.info �����ꤷ�ޤ���\n"
 
 #: Mailman/Gui/General.py:560
 msgid ""
@@ -5926,7 +5944,7 @@ msgid ""
 "            changed!  It must be an integer > 0."
 msgstr ""
 "<b>admin_member_chunksize</b>°�����ѹ��Ǥ��ޤ���!\n"
-"<b>admin_member_chunksize</b>�����������Ǥʤ���Фʤ�ޤ���."
+"<b>admin_member_chunksize</b>�����������Ǥʤ���Фʤ�ޤ���"
 
 #: Mailman/Gui/General.py:566
 msgid ""
@@ -5934,15 +5952,15 @@ msgid ""
 "                It must be a valid domain name."
 msgstr ""
 "<b>host_name</b>°�����ѹ��Ǥ��ޤ���!\n"
-"<b>host_name</b>°���ˤ������ʥɥᥤ��̾����ꤷ�Ƥ�������."
+"<b>host_name</b>°���ˤ������ʥɥᥤ��̾����ꤷ�Ƥ���������"
 
 #: Mailman/Gui/General.py:578
 msgid ""
 "You cannot add a Reply-To: to an explicit\n"
 "            address if that address is blank.  Resetting these values."
 msgstr ""
-"¾��<tt>Reply-To:</tt>����ꤹ��Ȥ��ˤ�, ���Υ��ɥ쥹���ά�Ǥ��ޤ���.\n"
-"�������ͤ�ꥻ�åȤ��ޤ�."
+"¾��<tt>Reply-To:</tt>����ꤹ��Ȥ��ˤϡ����Υ��ɥ쥹���ά�Ǥ��ޤ���\n"
+"�������ͤ�ꥻ�åȤ��ޤ���"
 
 #: Mailman/Gui/Language.py:34
 msgid "Language&nbsp;options"
@@ -5954,7 +5972,7 @@ msgstr "
 
 #: Mailman/Gui/Language.py:71
 msgid "Default language for this list."
-msgstr "���Υ᡼��󥰥ꥹ�ȤΥǥե���ȸ���"
+msgstr "���Υ᡼��󥰥ꥹ�ȤΥǥե���ȸ��졣"
 
 #: Mailman/Gui/Language.py:72
 msgid ""
@@ -5969,13 +5987,14 @@ msgid ""
 "             applies to both web-based and email-based messages, but not to\n"
 "             email posted by list members."
 msgstr ""
-"���������, ���Υ᡼��󥰥ꥹ�ȤΥǥե�����ͤȤ������ꤵ��Ƥ������Ǥ�.\n"
+"��������ϡ����Υ᡼��󥰥ꥹ�ȤΥǥե�����ͤȤ������ꤵ��Ƥ�������"
+"����\n"
 "<a href=\"?VARHELP=language/available_languages\">¾�θ���</a>\n"
-"�����ꤹ���, ����������ƥ��������˻��ѤǤ�����줬\n"
-"���٤�褦�ˤʤ�ޤ�.\n"
-"����¾�Τ��٤Ƥ����ϥǥե���Ȥθ���ǹԤ��ޤ�.\n"
-"���������Web�ȥ᡼��Υ�å�������Ŭ�Ѥ���ޤ���,\n"
-"�������Ƥ���᡼��ˤ�Ŭ�Ѥ���ޤ���."
+"�����ꤹ��ȡ�����������ƥ��������˻��ѤǤ�����줬\n"
+"���٤�褦�ˤʤ�ޤ���\n"
+"����¾�Τ��٤Ƥ����ϥǥե���Ȥθ���ǹԤ��ޤ���\n"
+"���������Web�ȥ᡼��Υ�å�������Ŭ�Ѥ���ޤ�����\n"
+"�������Ƥ���᡼��ˤ�Ŭ�Ѥ���ޤ���"
 
 #: Mailman/Gui/Language.py:82
 msgid "Languages supported by this list."
@@ -5988,9 +6007,9 @@ msgid ""
 "             <a href=\"?VARHELP=language/preferred_language\">default\n"
 "             language</a> must be included."
 msgstr ""
-"�ʲ���, ���Υ᡼��󥰥ꥹ�Ȥǻ��ѤǤ������ΰ����Ǥ�.\n"
+"�ʲ��ϡ����Υ᡼��󥰥ꥹ�Ȥǻ��ѤǤ������ΰ����Ǥ���\n"
 "<a href=\"?VARHELP=language/preferred_language\">�ǥե���Ȥθ���</a>\n"
-"�Ͼ�����򤵤�ޤ�."
+"�Ͼ�����򤵤�ޤ���"
 
 #: Mailman/Gui/Language.py:90
 msgid "Always"
@@ -6040,21 +6059,21 @@ msgid ""
 "             extra, or missing spaces between the prefix and the original\n"
 "             header."
 msgstr ""
-"���ܸ�ʤ�, ASCII�ʳ���ʸ�������Ȥ����줬���Υ᡼��󥰥ꥹ�Ȥ�\n"
-"�ǥե���Ȥθ�������ꤵ��Ƥ���, \n"
-"��Ƥ��줿�᡼��η�̾�����֤���ASCII�ʳ���ʸ�����ޤޤ����,\n"
-"�������֤���ɸ��Ū����ˡ����沽����ޤ�. ���֤���ASCIIʸ��\n"
-"�����ȤäƤ��ʤ����, <em>���ʤ�</em>���������沽���ʤ��褦�ˤǤ��ޤ�.\n"
-"��粽���ʤ����Ȥ�, ��ASCII����沽���б����Ƥ��ʤ��᡼�륽�եȤǤ�,\n"
-"��̾���ɤߤ䤹���ʤ�ޤ�.\n"
-"<p>��Ƥ����᡼��η�̾����粽����Ƥ�����, \n"
-"��粽����Ƥ��ʤ��ä��ꤹ�����,\n"
-"���������<em>ɬ�פ˱�����</em>�����Ӥޤ�.\n"
-"<em>ɬ�פ˱�����</em>�����֤�, \n"
-"���֤��ʳ��η�̾��ASCIIʸ�������ʤ����֤�����沽����, \n"
-"��ASCIIʸ����ޤ�Ǥ��������֤�����沽���ޤ�. ����ˤ��\n"
+"���ܸ�ʤɡ�ASCII�ʳ���ʸ�������Ȥ����줬���Υ᡼��󥰥ꥹ�Ȥ�\n"
+"�ǥե���Ȥθ�������ꤵ��Ƥ��ơ�\n"
+"��Ƥ��줿�᡼��η�̾�����֤���ASCII�ʳ���ʸ�����ޤޤ���硢\n"
+"�������֤���ɸ��Ū����ˡ����沽����ޤ������֤���ASCIIʸ��\n"
+"�����ȤäƤ��ʤ���С�<em>���ʤ�</em>���������沽���ʤ��褦�ˤǤ��ޤ���\n"
+"��粽���ʤ����Ȥǡ���ASCII����沽���б����Ƥ��ʤ��᡼�륽�եȤǤ⡢\n"
+"��̾���ɤߤ䤹���ʤ�ޤ���\n"
+"<p>��Ƥ����᡼��η�̾����粽����Ƥ����ꡢ\n"
+"��粽����Ƥ��ʤ��ä��ꤹ����ϡ�\n"
+"���������<em>ɬ�פ˱�����</em>�����Ӥޤ���\n"
+"<em>ɬ�פ˱�����</em>�����֤ȡ�\n"
+"���֤��ʳ��η�̾��ASCIIʸ�������ʤ����֤�����沽������\n"
+"��ASCIIʸ����ޤ�Ǥ��������֤�����沽���ޤ�������ˤ��\n"
 "����Υ᡼�륽�եȤ����֤��ȸ��Υإå��δ֤ζ�����������ä����ꤹ��\n"
-"��������Ǥ��ޤ�."
+"��������Ǥ��ޤ���"
 
 #: Mailman/Gui/Membership.py:26
 msgid "Membership&nbsp;Management..."
@@ -6082,13 +6101,13 @@ msgstr "
 
 #: Mailman/Gui/NonDigest.py:43
 msgid "Policies concerning immediately delivered list traffic."
-msgstr "���������˴ؤ����������"
+msgstr "���������˴ؤ���������ˡ�"
 
 #: Mailman/Gui/NonDigest.py:46
 msgid ""
 "Can subscribers choose to receive mail immediately, rather\n"
 "             than in batched digests?"
-msgstr "�ޤȤ��ɤ������β����, ���������ؤ��ѹ�����Ĥ��ޤ���?"
+msgstr "�ޤȤ��ɤ������β���ˡ����������ؤ��ѹ�����Ĥ��ޤ���?"
 
 #: Mailman/Gui/NonDigest.py:53
 msgid "Full Personalization"
@@ -6104,9 +6123,9 @@ msgid ""
 "                 issues."
 msgstr ""
 "���������᡼���Ŀ��̤˥������ޥ������ޤ���?\n"
-"���ʥ����ѤΥꥹ�ȤǤ������ʤ��Ȥ�����ޤ�.\n"
-"������, �����θ�Ψ�˴ؤ������꤬����ޤ��Τ�\n"
-"<a href=\"?VARHELP=nondigest/personalize\">�ܺ�</a>�⤪�ɤߤ�������."
+"���ʥ����ѤΥꥹ�ȤǤ������ʤ��Ȥ�����ޤ���\n"
+"�������������θ�Ψ�˴ؤ������꤬����ޤ��Τ�\n"
+"<a href=\"?VARHELP=nondigest/personalize\">�ܺ�</a>�⤪�ɤߤ���������"
 
 #: Mailman/Gui/NonDigest.py:61
 msgid ""
@@ -6165,35 +6184,35 @@ msgid ""
 "                 </ul>\n"
 "                 "
 msgstr ""
-"�̾�, Mailman��, ���������Υ᡼���ޤȤ�ƥ᡼�륵���Ф��������ޤ�. \n"
+"�̾Mailman�ϡ����������Υ᡼���ޤȤ�ƥ᡼�륵���Ф��������ޤ���\n"
 "������ˡ�� Mailman �ȥ᡼�륵���д֤��̿��̤򸺤餻��Τ�\n"
-"��Ψ���⤤��ˡ�Ǥ�. \n"
+"��Ψ���⤤��ˡ�Ǥ���\n"
 "<p>\n"
-"������, �Ŀͤ��Ȥ˥᡼������뤳�Ȥ˰�̣������᡼��󥰥ꥹ�Ȥ⤢��ޤ�.\n"
-"���ξ��, Mailman���̾�������ꥹ�Ȥβ�����Ȥ�, ������\n"
-"�᡼�����ʸ���������ޤ�. ��������ϥ��������Τ���ǽ�����ǽ����\n"
-"����ޤ���, ��������β��ͤ����뤫�ɤ���, ¾����ˡ�Ϥʤ��Τ���\n"
-"��ʬ�˸�Ƥ���Ƥ�������. \n"
-"�ޤ�, �����ƥ����٤�ʬ�ƻ뤷��, ��������˥����ƥब�Ѥ����뤳�Ȥ�\n"
-"��ǧ���Ƥ�������.\n"
-"\n"
-"<p><em>������</em>�����֤�, �᡼���Ŀ��̤���������, �ޤȤ���������ޤ�.\n"
-"<em>�Ϥ�</em>�����֤ȸĿ��̤�������, �إå��ȥեå���\n"
-"�������ִ��ѿ���Ȥ���褦�ˤʤ�ޤ�. <em>�����ĿͲ�</em>�����֤�\n"
-"<code>To:</code>�إå��Υ��ɥ쥹���ꥹ�ȤΥ��ɥ쥹�ǤϤʤ�,\n"
-"�Ʋ���Υ��ɥ쥹�ˤʤ�ޤ�.\n"
-"\n"
-"<p>�Ŀ��������Ǥ�, �㴳���ִ��ѿ���<a href=\"?VARHELP=nondigest/msg_header"
+"���������Ŀͤ��Ȥ˥᡼������뤳�Ȥ˰�̣������᡼��󥰥ꥹ�Ȥ⤢��ޤ���\n"
+"���ξ�硢Mailman���̾�������ꥹ�Ȥβ�����Ȥˡ�������\n"
+"�᡼�����ʸ���������ޤ�����������ϥ��������Τ���ǽ�����ǽ����\n"
+"����ޤ�������������β��ͤ����뤫�ɤ�����¾����ˡ�Ϥʤ��Τ���\n"
+"��ʬ�˸�Ƥ���Ƥ���������\n"
+"�ޤ��������ƥ����٤�ʬ�ƻ뤷�ơ���������˥����ƥब�Ѥ����뤳�Ȥ�\n"
+"��ǧ���Ƥ���������\n"
+"\n"
+"<p><em>������</em>�����֤ȡ��᡼���Ŀ��̤������������ޤȤ���������ޤ���\n"
+"<em>�Ϥ�</em>�����֤ȸĿ��̤����������إå��ȥեå���\n"
+"�������ִ��ѿ���Ȥ���褦�ˤʤ�ޤ���<em>�����ĿͲ�</em>�����֤�\n"
+"<code>To:</code>�إå��Υ��ɥ쥹���ꥹ�ȤΥ��ɥ쥹�ǤϤʤ���\n"
+"�Ʋ���Υ��ɥ쥹�ˤʤ�ޤ���\n"
+"\n"
+"<p>�Ŀ��������Ǥϡ��㴳���ִ��ѿ���<a href=\"?VARHELP=nondigest/msg_header"
 "\">\n"
 "�إå�</a>��<a href=\"?VARHELP=nondigest/msg_footer\">�եå�</a>��\n"
-"�������褦�ˤʤ�ޤ�. \n"
-"\n"
-"<p>�Ŀ��������Ǥ�, �ʲ����ѿ���إå��ȥեå���������ޤ�:\n"
-"<ul><li><b>user_address</b> - ����Υ��ɥ쥹(��ʸ���ˤʤ�)\n"
-"    <li><b>user_delivered_to</b> - �������Ͽ�����羮ʸ����ޤॢ�ɥ쥹\n"
-"    <li><b>user_password</b> - ����Υѥ����\n"
-"    <li><b>user_name</b> - ����Υե�͡���\n"
-"    <li><b>user_optionsurl</b> - ������ץ����ڡ����� URL\n"
+"�������褦�ˤʤ�ޤ���\n"
+"\n"
+"<p>�Ŀ��������Ǥϡ��ʲ����ѿ���إå��ȥեå���������ޤ�:\n"
+"<ul><li><b>user_address</b> - ����Υ��ɥ쥹(��ʸ���ˤʤ�)��\n"
+"    <li><b>user_delivered_to</b> - �������Ͽ�����羮ʸ����ޤॢ�ɥ쥹��\n"
+"    <li><b>user_password</b> - ����Υѥ���ɡ�\n"
+"    <li><b>user_name</b> - ����Υե�͡��ࡣ\n"
+"    <li><b>user_optionsurl</b> - ������ץ����ڡ����� URL��\n"
 "</ul>\n"
 "    "
 
@@ -6215,15 +6234,15 @@ msgid ""
 "        page.\n"
 "</ul>\n"
 msgstr ""
-"<a href=\"?VARHELP=nondigest/personalize\">�Ŀ�������</a>�����ꤹ���, \n"
+"<a href=\"?VARHELP=nondigest/personalize\">�Ŀ�������</a>�����ꤹ��ȡ�\n"
 "�إå��ȥեå��˰ʲ����ѿ���Ȥ���褦�ˤʤ�ޤ�:\n"
 "\n"
-"<ul><li><b>user_address</b> - ��ʸ�����Ѵ����줿����Υ��ɥ쥹.\n"
+"<ul><li><b>user_address</b> - ��ʸ�����Ѵ����줿����Υ��ɥ쥹��\n"
 "    <li><b>user_delivered_to</b> - �������Ͽ�����Ȥ����羮ʸ����ޤॢ�ɥ�"
-"��.\n"
-"    <li><b>user_password</b> - ����Υѥ����.\n"
-"    <li><b>user_name</b> - ����Υե�͡���.\n"
-"    <li><b>user_optionsurl</b> - ����Υ��ץ��������ڡ�����URL\n"
+"����\n"
+"    <li><b>user_password</b> - ����Υѥ���ɡ�\n"
+"    <li><b>user_name</b> - ����Υե�͡��ࡣ\n"
+"    <li><b>user_optionsurl</b> - ����Υ��ץ��������ڡ�����URL��\n"
 "</ul>\n"
 
 #: Mailman/Gui/NonDigest.py:129
@@ -6234,7 +6253,7 @@ msgstr "
 msgid ""
 "Text prepended to the top of every immediately-delivery\n"
 "             message. "
-msgstr "�������������᡼�����Ƭ�ˤ���ʸ���ղä���ޤ�. "
+msgstr "�������������᡼�����Ƭ�ˤ���ʸ���ղä���ޤ���"
 
 #: Mailman/Gui/NonDigest.py:134
 msgid "Footer added to mail sent to regular list members"
@@ -6244,7 +6263,7 @@ msgstr "
 msgid ""
 "Text appended to the bottom of every immediately-delivery\n"
 "             message. "
-msgstr "�������������᡼��������ˤ���ʸ���ղä���ޤ�. "
+msgstr "�������������᡼��������ˤ���ʸ���ղä���ޤ���"
 
 #: Mailman/Gui/NonDigest.py:141
 msgid "Scrub attachments of regular delivery message?"
@@ -6258,9 +6277,9 @@ msgid ""
 "             totally disappear, you can use content filtering options."
 msgstr ""
 "ź�եե�������ݴɤ���ȡ������֥֥饦���ǥ��������Ǥ�����¸��ˤ�\n"
-"������¸���졢�᡼����ʸ�ˤϥ�󥯤���������ޤ�. ź�եե������\n"
+"������¸���졢�᡼����ʸ�ˤϥ�󥯤���������ޤ���ź�եե������\n"
 "�����˾õ�Ƥ��ޤ��������ˤϡ�ź�եե��������פΥ��ץ�����\n"
-"�ȤäƤ�������."
+"�ȤäƤ���������"
 
 #: Mailman/Gui/NonDigest.py:149
 msgid "Sibling lists"
@@ -6272,8 +6291,8 @@ msgid ""
 "             excluded from the regular (non-digest) delivery if those\n"
 "             list addresses appear in a To: or Cc: header."
 msgstr ""
-"���Υ����ȤΥꥹ�Ȥ�, ���Υꥹ�ȥ��ɥ쥹�� To: ���� Cc: �إå���\n"
-"����Ƥ�����, ���Υꥹ�Ȳ���������������������."
+"���Υ����ȤΥꥹ�Ȥǡ����Υꥹ�ȥ��ɥ쥹�� To: ���� Cc: �إå���\n"
+"����Ƥ����顢���Υꥹ�Ȳ���������������������."
 
 #: Mailman/Gui/NonDigest.py:155
 msgid ""
@@ -6286,18 +6305,18 @@ msgid ""
 "             siblings."
 msgstr ""
 "�ꥹ�ȥ��ɥ쥹�� (��: mailman@example.com) �Τ褦�˴����ʥ᡼�륢�ɥ쥹��\n"
-"�����ǽ񤤤Ƥ�������. �����˽񤤤��ꥹ�Ȥ�����ڡ�����, ���Υꥹ�Ȥ�\n"
-"���ɥ쥹����ߤ˽񤤤ƤϤ����ޤ���. �⤷, ���������ξ���Υꥹ�Ȥ����ä�\n"
-"�������ˤϥ᡼�뤬��������ʤ��ʤ�ޤ�.\n"
-"�ޤ�, �����ȴ����Ԥ��ɥᥤ���ޤ����Ǥλ���ꥹ�Ȼ����ػߤ��Ƥ���\n"
-"���⤷��ʤ����Ȥˤ����դ��Ƥ�������."
+"�����ǽ񤤤Ƥ��������������˽񤤤��ꥹ�Ȥ�����ڡ����ǡ����Υꥹ�Ȥ�\n"
+"���ɥ쥹����ߤ˽񤤤ƤϤ����ޤ��󡣤⤷�����������ξ���Υꥹ�Ȥ����ä�\n"
+"�������ˤϥ᡼�뤬��������ʤ��ʤ�ޤ���\n"
+"�ޤ��������ȴ����Ԥ��ɥᥤ���ޤ����Ǥλ���ꥹ�Ȼ����ػߤ��Ƥ���\n"
+"���⤷��ʤ����Ȥˤ����դ��Ƥ���������"
 
 #: Mailman/Gui/NonDigest.py:163
 msgid ""
 "Ignore regular_exclude_lists of which the poster is not a\n"
 "             member."
 msgstr ""
-"��ƼԤ� regular_exclude_lists �β���ǤϤʤ��褦�ʤȤ��ˤϤ����̵�뤷�ޤ�."
+"��ƼԤ� regular_exclude_lists �β���ǤϤʤ��褦�ʤȤ��ˤϤ����̵�뤷�ޤ���"
 
 #: Mailman/Gui/NonDigest.py:165
 msgid ""
@@ -6316,10 +6335,10 @@ msgstr ""
 "             ��ƤϽ����ꥹ�Ȥ����������β���ˤϤ��Υꥹ�Ȥ����\n"
 "             �����ޤ��󤬡���ƼԤ����ν����ꥹ�Ȥβ���Ǥʤ����ˤ�\n"
 "             ���������ꥹ�Ȥβ���ˤ���Ƥ������ʤ��ޤޡ�������Ƥ�\n"
-"             ���ν����ꥹ�ȤǤ���뤳�Ȥ�����ޤ�.\n"
+"             ���ν����ꥹ�ȤǤ���뤳�Ȥ�����ޤ���\n"
 "             ���������֤Ϥ��פ����ꤹ��ȡ���ƼԤ����ν����ꥹ�Ȥ�\n"
 "             ����Ǥʤ��褦�ʤ�����ν����ꥹ�ȤˤĤ��Ƥ⡢\n"
-"             ���ν����ꥹ�Ȥ�̵�뤷�ޤ�\n"
+"             ���ν����ꥹ�Ȥ�̵�뤷�ޤ���\n"
 
 #: Mailman/Gui/NonDigest.py:174
 msgid ""
@@ -6327,8 +6346,8 @@ msgid ""
 "             included in the regular (non-digest) delivery if those\n"
 "             list addresses don't appear in a To: or Cc: header."
 msgstr ""
-"���Υ����ȤΥꥹ�Ȥ�, ���Υꥹ�ȥ��ɥ쥹�� To: ���� Cc: �إå���\n"
-"����Ƥ��ʤ��ä���, ���Υꥹ�Ȳ���������˴ޤ����."
+"���Υ����ȤΥꥹ�Ȥǡ����Υꥹ�ȥ��ɥ쥹�� To: ���� Cc: �إå���\n"
+"����Ƥ��ʤ��ä��顢���Υꥹ�Ȳ���������˴ޤ���Ρ�"
 
 #: Mailman/Gui/NonDigest.py:177
 msgid ""
@@ -6337,9 +6356,9 @@ msgid ""
 "             administrator may prohibit cross domain siblings."
 msgstr ""
 "�ꥹ�ȥ��ɥ쥹�� (��: mailman@example.com) �Τ褦�˴����ʥ᡼�륢�ɥ쥹��\n"
-"�����ǽ񤤤Ƥ�������. \n"
-"�ޤ�, �����ȴ����Ԥ��ɥᥤ���ޤ����Ǥλ���ꥹ�Ȼ����ػߤ��Ƥ���\n"
-"���⤷��ʤ����Ȥˤ����դ��Ƥ�������."
+"�����ǽ񤤤Ƥ���������\n"
+"�ޤ��������ȴ����Ԥ��ɥᥤ���ޤ����Ǥλ���ꥹ�Ȼ����ػߤ��Ƥ���\n"
+"���⤷��ʤ����Ȥˤ����դ��Ƥ���������"
 
 #: Mailman/Gui/Passwords.py:27
 msgid "Passwords"
@@ -6410,10 +6429,10 @@ msgstr ""
 "��ǧ - �ꥹ�ȴ����Ԥξ�ǧ��ɬ�� <br>\n"
 "��ǧ+��ǧ - ��ǧ�Ⱦ�ǧ��ξ����ɬ��\n"
 "\n"
-"<p> (*) ï������������Ф���Mailman ���������ֹ���դ����ֿ����ޤ�. \n"
-" �����ԤϤ����ֹ��Ȥä��ֿ����ʤ�������Ǥ��ޤ���.<br> \n"
+"<p> (*) ï������������Ф���Mailman ���������ֹ���դ����ֿ����ޤ���\n"
+" �����ԤϤ����ֹ��Ȥä��ֿ����ʤ�������Ǥ��ޤ���<br> \n"
 " ����ˤ��¾�ͤ�λ������������񤵤���Ȥ���ͭ����(���뤤�ϰ��դ���)\n"
-" �԰٤��ɤ����Ȥ��Ǥ��ޤ�."
+" �԰٤��ɤ����Ȥ��Ǥ��ޤ���"
 
 #: Mailman/Gui/Privacy.py:88
 msgid ""
@@ -6435,10 +6454,10 @@ msgstr ""
 "��ǧ+��ǧ - ��ǧ�Ⱦ�ǧ��ξ����ɬ��\n"
 "\n"
 "<p>(*) ï������������Ф��� Mailman ���������ֹ��\n"
-" �դ����ֿ����ޤ�. �����ԤϤ����ֹ��Ȥä��ֿ����ʤ���\n"
-" ����Ǥ��ޤ���.<br>\n"
+" �դ����ֿ����ޤ��������ԤϤ����ֹ��Ȥä��ֿ����ʤ���\n"
+" ����Ǥ��ޤ���<br>\n"
 " ����ˤ��¾�ͤ�λ������������񤵤���Ȥ���ͭ����\n"
-" (���뤤�ϰ��դ���) �԰٤��ɤ����Ȥ��Ǥ��ޤ�."
+" (���뤤�ϰ��դ���) �԰٤��ɤ����Ȥ��Ǥ��ޤ���"
 
 #: Mailman/Gui/Privacy.py:104
 msgid ""
@@ -6448,10 +6467,10 @@ msgid ""
 "            <a href=\"%(admin)s/archive\">Archival Options</a> section for\n"
 "            separate archive-related privacy settings."
 msgstr ""
-"���Υ��������Ǥ�����Ȳ������θ����˴ؤ���ݥꥷ��������Ǥ��ޤ�.\n"
-"�ޤ�, �ꥹ�Ȥ�������뤫�ɤ���������Ǥ��ޤ�.\n"
+"���Υ��������Ǥ�����Ȳ������θ����˴ؤ���ݥꥷ��������Ǥ��ޤ���\n"
+"�ޤ����ꥹ�Ȥ�������뤫�ɤ���������Ǥ��ޤ���\n"
 "��¸��ˤΥץ饤�Х����ˤĤ��Ƥ� <a href=\"%(admin)s/archive\">\n"
-"��¸��˥��ץ�������</a> �����ꤷ�Ƥ�������.)"
+"��¸��˥��ץ�������</a> �����ꤷ�Ƥ���������)"
 
 #: Mailman/Gui/Privacy.py:110
 msgid "Subscribing"
@@ -6480,21 +6499,21 @@ msgid ""
 "             to designate a (case insensitive) regular expression match."
 msgstr ""
 "����˾�ǧ��ɬ�פ�����Ǥ��äƤ⡢�����Υ��ɥ쥹�������������\n"
-"             �����Ԥξ�ǧ�ʤ��˵��Ĥ���ޤ�. 1�ԤˤĤ�1�IJ�����ɥ쥹��\n"
-"             �������ޤ�. ����ɽ����Ȥ��Ȥ��ϡ��Ԥκǽ�� ^ �ǻϤ��\n"
-"             ��������(��ʸ������ʸ���ζ��̤Ϥ��ޤ���)."
+"             �����Ԥξ�ǧ�ʤ��˵��Ĥ���ޤ���1�ԤˤĤ�1�IJ�����ɥ쥹��\n"
+"             �������ޤ�������ɽ����Ȥ��Ȥ��ϡ��Ԥκǽ�� ^ �ǻϤ��\n"
+"             ��������(��ʸ������ʸ���ζ��̤Ϥ��ޤ���)��"
 
 #: Mailman/Gui/Privacy.py:126
 msgid ""
 "You may also use the @listname notation to designate the\n"
 "             members of another list in this installation."
-msgstr "@�ꥹ��̾ ��ɽ���Ǥ��Υ����ƥ��¾�Υꥹ�Ȥβ���򼨤����Ȥ�Ǥ��ޤ�."
+msgstr "@�ꥹ��̾ ��ɽ���Ǥ��Υ����ƥ��¾�Υꥹ�Ȥβ���򼨤����Ȥ�Ǥ��ޤ���"
 
 #: Mailman/Gui/Privacy.py:130
 msgid ""
 "Is the list moderator's approval required for unsubscription\n"
 "             requests?  (<em>No</em> is recommended)"
-msgstr "������ˤ�, �ꥹ�Ȼʲ�Ԥξ�ǧ��ɬ�פǤ���? (<em>������</em>��侩)"
+msgstr "������ˤϡ��ꥹ�Ȼʲ�Ԥξ�ǧ��ɬ�פǤ���? (<em>������</em>��侩)"
 
 #: Mailman/Gui/Privacy.py:133
 msgid ""
@@ -6513,13 +6532,13 @@ msgid ""
 "employees\n"
 "             are required to be members of."
 msgstr ""
-"���ο�����, Web�ޤ��ϥ᡼��ǹԤʤ��ޤ�.\n"
-"����Ū�ˤ�, ��ñ�����Ǥ���褦������ͳ�ˤ��ޤ�.\n"
-"(���Ǥ��ʤ���, ���ʤ꺤��ޤ�)\n"
+"���ο����ϡ�Web�ޤ��ϥ᡼��ǹԤʤ��ޤ���\n"
+"����Ū�ˤϡ���ñ�����Ǥ���褦������ͳ�ˤ��ޤ���\n"
+"(���Ǥ��ʤ��ȡ����ʤ꺤��ޤ�)\n"
 "\n"
-"<p>������, �ꥹ�Ȥˤ�äƤϻʲ�Ԥ���ǧ���ʤ�������Ǥ��ʤ��褦��\n"
-"���ꤹ�뤳�Ȥ⤢��ޤ�. ���Ȥ��в�ҤΥ᡼��󥰥ꥹ�Ȥ�, ɬ�����Ұ���\n"
-"��Ͽ����Ƥ��ʤ���Фʤ�ʤ����ʤɤǤ�."
+"<p>���������ꥹ�Ȥˤ�äƤϻʲ�Ԥ���ǧ���ʤ�������Ǥ��ʤ��褦��\n"
+"���ꤹ�뤳�Ȥ⤢��ޤ������Ȥ��в�ҤΥ᡼��󥰥ꥹ�Ȥǡ�ɬ�����Ұ���\n"
+"��Ͽ����Ƥ��ʤ���Фʤ�ʤ����ʤɤǤ���"
 
 #: Mailman/Gui/Privacy.py:144
 msgid "Ban list"
@@ -6529,7 +6548,7 @@ msgstr "
 msgid ""
 "List of addresses which are banned from membership in this\n"
 "             mailing list."
-msgstr "���Υ᡼��󥰥ꥹ�Ȥؤ��������ݤ��륢�ɥ쥹�Υꥹ��."
+msgstr "���Υ᡼��󥰥ꥹ�Ȥؤ��������ݤ��륢�ɥ쥹�Υꥹ�ȡ�"
 
 #: Mailman/Gui/Privacy.py:149
 msgid ""
@@ -6569,14 +6588,14 @@ msgid ""
 "When set, the list of subscribers is protected by member or\n"
 "             admin password authentication."
 msgstr ""
-"��������ꤹ���, ���̾���α����ϲ���������ԤΥѥ���ɤ�ɬ�פˤʤ�ޤ�. "
+"��������ꤹ��ȡ����̾���α����ϲ���������ԤΥѥ���ɤ�ɬ�פˤʤ�ޤ���"
 
 #: Mailman/Gui/Privacy.py:163
 msgid ""
 "Show member addresses so they're not directly recognizable\n"
 "             as email addresses?"
 msgstr ""
-"����Υ��ɥ쥹��ɽ������Ȥ���, \n"
+"����Υ��ɥ쥹��ɽ������Ȥ��ˡ�\n"
 " �����Żҥ᡼��Υ��ɥ쥹�Ǥ��뤳�Ȥ��狼��ʤ��褦��ɽ�����ޤ���?"
 
 #: Mailman/Gui/Privacy.py:165
@@ -6590,9 +6609,9 @@ msgid ""
 msgstr ""
 "���Υ��ץ��������ꤹ��Ȳ���Υ᡼�륢�ɥ쥹\n"
 "�� (ʸ�Ǥ��󥯤Ǥ�)��ñ�ˤϥ᡼�륢�ɥ쥹�Ǥ��뤳��\n"
-"��ʬ����ʤ��褦���Ѵ�����ޤ�. �����, ���ǥ᡼�������Ԥ�\n"
+"��ʬ����ʤ��褦���Ѵ�����ޤ�������ϡ����ǥ᡼�������Ԥ�\n"
 "��ư Web ������ʤ� �Ȥäƥ᡼�륢�ɥ쥹��\n"
-"����������ʤ��褦�ˤ��뤿��Τ�ΤǤ�."
+"����������ʤ��褦�ˤ��뤿��Τ�ΤǤ���"
 
 #: Mailman/Gui/Privacy.py:176
 msgid "/Quarantine"
@@ -6628,7 +6647,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -6637,32 +6656,34 @@ msgid ""
 "\n"
 "            <p>Note that non-regexp matches are always done first."
 msgstr ""
-"�ꥹ�Ȥ˥᡼�뤬��Ƥ�����, ��Ϣ��ȯ�������³�����ƤӽФ����\n"
-"���Υ᡼��˻ʲ�Ԥξ�ǧ��ɬ�פ��ɤ�������ꤷ�ޤ�.\n"
-"���Υڡ����Ǥ�, ���������ξ����ȯ���������ˡ�����ꤷ�ޤ�.\n"
+"�ꥹ�Ȥ˥᡼�뤬��Ƥ����ȡ���Ϣ��ȯ�������³�����ƤӽФ����\n"
+"���Υ᡼��˻ʲ�Ԥξ�ǧ��ɬ�פ��ɤ�������ꤷ�ޤ���\n"
+"���Υڡ����Ǥϡ����������ξ����ȯ���������ˡ�����ꤷ�ޤ���\n"
 "\n"
-"<p><b>���¥ե饰</b>�����åȤ���Ƥ���������Ƥ�, \n"
-"�ʲ�Ԥ���ǧ����ޤ���α����ޤ�. \n"
-"�����Ԥ�, �ǥե���ȤDz���������Ƥ����¤��뤫�ɤ���������Ǥ��ޤ�.\n"
+"<p><b>���¥ե饰</b>�����åȤ���Ƥ���������Ƥϡ�\n"
+"�ʲ�Ԥ���ǧ����ޤ���α����ޤ���\n"
+"�����Ԥϡ��ǥե���ȤDz���������Ƥ����¤��뤫�ɤ���������Ǥ��ޤ���\n"
 "\n"
-"<p>�������������ꤷ��, �ޤ��Ϥ��٤Ƥ������������Ƥ�ưŪ��\n"
+"<p>�������������ꤷ�ơ��ޤ��Ϥ��٤Ƥ������������Ƥ�ưŪ��\n"
 "<a href=\"?VARHELP=privacy/sender/accept_these_nonmembers\">��ǧ����</a>��\n"
 "<a href=\"?VARHELP=privacy/sender/hold_these_nonmembers\">�����</a>��\n"
 "<a href=\"?VARHELP=privacy/sender/reject_these_nonmembers\">���ݤ���</a>\n"
 "(������������)��\n"
 "<a href=\"?VARHELP=privacy/sender/discard_these_nonmembers\">�˴�����</a>��\n"
-"�����򤹤뤳�Ȥ��Ǥ��ޤ�.\n"
-"����Ū�˾�ǧ�����ݤޤ����˴���ư��������Ƥ��ʤ���������Ƥ�, \n"
+"�����򤹤뤳�Ȥ��Ǥ��ޤ���\n"
+"����Ū�˾�ǧ�����ݤޤ����˴���ư��������Ƥ��ʤ���������Ƥϡ�\n"
 "<a href=\"?VARHELP=privacy/sender/generic_nonmember_action\">\n"
-"�������Ф��뵬§</a>�˽��äƤդ뤤�ˤ������ޤ�.\n"
-"<p>���Υƥ����ȥܥå�����, 1�Ԥ�1�ĤΥ᡼�륢�ɥ쥹����Ͽ�Ǥ��ޤ�;\n"
+"�������Ф��뵬§</a>�˽��äƤդ뤤�ˤ������ޤ���\n"
+"<p>���Υƥ����ȥܥå����ǡ�1�Ԥ�1�ĤΥ᡼�륢�ɥ쥹����Ͽ�Ǥ��ޤ�;\n"
 "�Ԥκǽ�� ^ �򵭽Ҥ����\n"
-"<a href=\"http://docs.python.org/library/re.html\">Python��\n"
-"����ɽ��</a>�ˤʤ�ޤ�. \n"
-"�Хå�����å����, Python �� raw string��ˡ�Τ�꤫����\n"
-"���Ϥ��Ƥ�������. (�Ĥޤ�, ñ��1�ĥХå�����å�������������Ǥ�)\n"
+"<a href=\"https://docs.python.org/2/library/re.html\">Python��\n"
+"����ɽ��</a>�ˤʤ�ޤ�"
+"(<a href=\"https://docs.python.org/ja/2.7/library/re.html\">"
+"���ܸ���ʸ��ؤΥ��</a>)��\n"
+"�Хå�����å���ϡ�Python �� raw string��ˡ�Τ�꤫����\n"
+"���Ϥ��Ƥ���������(�Ĥޤꡢñ��1�ĥХå�����å�������������Ǥ�)\n"
 "\n"
-"<p>����ɽ����Ȥ�ʤ��б���������˼¹Ԥ���ޤ��Τ����դ��Ƥ�������."
+"<p>����ɽ����Ȥ�ʤ��б���������˼¹Ԥ���ޤ��Τ����դ��Ƥ���������"
 
 #: Mailman/Gui/Privacy.py:213
 msgid "Member filters"
@@ -6696,25 +6717,25 @@ msgid ""
 "             <a href=\"%(adminurl)s/members\">membership management\n"
 "             screens</a>."
 msgstr ""
-"�ġ��β����, ľ�ܥꥹ�Ȥ���ƤǤ��뤫, �ʲ�Ԥξ�ǧ��ɬ�פȤ��뤫��\n"
-"���ꤹ��<em>���¥ե饰</em>����äƤ��ޤ�. \n"
-"���¥ե饰�����åȤ���Ƥ������ˤ����Ƥ�, ��ǧ��³����\n"
-"ɬ�פˤʤ�ޤ�. �ꥹ�ȴ����Ԥ�, ����β���ˤ����Ƥ�\n"
-"���¤��뤫�ɤ�������뤳�Ȥ��Ǥ��ޤ�.\n"
+"�ġ��β���ϡ�ľ�ܥꥹ�Ȥ���ƤǤ��뤫���ʲ�Ԥξ�ǧ��ɬ�פȤ��뤫��\n"
+"���ꤹ��<em>���¥ե饰</em>����äƤ��ޤ���\n"
+"���¥ե饰�����åȤ���Ƥ������ˤ����Ƥϡ���ǧ��³����\n"
+"ɬ�פˤʤ�ޤ����ꥹ�ȴ����Ԥϡ�����β���ˤ����Ƥ�\n"
+"���¤��뤫�ɤ�������뤳�Ȥ��Ǥ��ޤ���\n"
 "\n"
-"<p>����������񤷤��������¥ե饰��, ���������ꤷ���ͤ˥��åȤ���ޤ�. \n"
+"<p>����������񤷤��������¥ե饰�ϡ����������ꤷ���ͤ˥��åȤ���ޤ���\n"
 "����������Ƥ�ǧ��������ǥե���Ȥˤ������\n"
-"���Υ��ץ����򥪥� (������)�ˤ��ޤ�. �ǥե���ȤDz���ˤ����Ƥ�����\n"
-"����������, ����򥪥� (�Ϥ�) �ˤ��ޤ�. �ġ��β�������¥ե饰��,\n"
+"���Υ��ץ����򥪥� (������)�ˤ��ޤ����ǥե���ȤDz���ˤ����Ƥ�����\n"
+"���������ϡ�����򥪥� (�Ϥ�) �ˤ��ޤ����ġ��β�������¥ե饰�ϡ�\n"
 "<a href=\"%(adminurl)s/members\">�����������</a>���餤�ĤǤ�\n"
-"���ꤷľ�����Ȥ��Ǥ��ޤ�."
+"���ꤷľ�����Ȥ��Ǥ��ޤ���"
 
 #: Mailman/Gui/Privacy.py:234
 msgid ""
 "Ceiling on acceptable number of member posts, per interval,\n"
 "               before automatic moderation."
 msgstr ""
-"��ư����(��ǥ졼�����)�򤫤���ޤǤΰ��������ΰ�������ƿ��ξ��."
+"��ư����(��ǥ졼�����)�򤫤���ޤǤΰ��������ΰ�������ƿ��ξ�¡�"
 
 #: Mailman/Gui/Privacy.py:237
 msgid ""
@@ -6737,20 +6758,20 @@ msgid ""
 "               multiple lists or by a single post to an umbrella list."
 msgstr ""
 "���������˰�������ƿ������ο���ã����ȡ����β����ưŪ������\n"
-"               (��ǥ졼��)���ޤ�. ���ε�ǽ��̵���ˤ���ˤ�0����ꤷ�ޤ�.\n"
+"               (��ǥ졼��)���ޤ������ε�ǽ��̵���ˤ���ˤ�0����ꤷ�ޤ���\n"
 "               ���Ρְ�����֡פˤĤ��Ƥ�\n"
 "               <a href=\"?VARHELP=privacy/sender/member_verbosity_interval"
 "\"\n"
-"               >member_verbosity_interval</a>�򻲾Ȥ��Ƥ�������.\n"
+"               >member_verbosity_interval</a>�򻲾Ȥ��Ƥ���������\n"
 "\n"
 "               <p>���ε�ǽ��ñ��ޤ���ʣ���Υꥹ�Ȥ���Ͽ���ƥܥåȤ�\n"
 "               ���Ѥ���û���֤Τ�����¿���� spam ������Ĥ���褦�ʿͤ�\n"
-"               �޻ߤ��뤿��Τ�ΤǤ�.\n"
+"               �޻ߤ��뤿��Τ�ΤǤ���\n"
 "\n"
-"               <p>���ε�ǽ�����ꤹ��Ȥ��ˤϽ�ʬ�����դ����Ƥ�������.\n"
+"               <p>���ε�ǽ�����ꤹ��Ȥ��ˤϽ�ʬ�����դ����Ƥ���������\n"
 "               �⤷�����ͤ򾮤������ꤷ������ȡ����̤���Ƥ�ʣ���Υꥹ�Ȥ�\n"
 "               �ޤ����äƹԤä��ꡢ���̤οƥꥹ�Ȥؤ���ƤǤ������¤�\n"
-"               ���ä�����ޤ�."
+"               ���ä�����ޤ���"
 
 #: Mailman/Gui/Privacy.py:250
 msgid ""
@@ -6759,7 +6780,7 @@ msgid ""
 "               member."
 msgstr ""
 "����μ�ư����(��ǥ졼�����)�Τ���� member_verbosity_threshold �ˤ�\n"
-"               ���Υꥹ�Ȥ˲���������ƤΤ��ä����Ȥ�Ͽ���Ƥ����ÿ�."
+"               ���Υꥹ�Ȥ˲���������ƤΤ��ä����Ȥ�Ͽ���Ƥ����ÿ���"
 
 #: Mailman/Gui/Privacy.py:254
 msgid ""
@@ -6776,18 +6797,18 @@ msgstr ""
 "���� Mailman �����ƥ��� member_verbosity_threshold ��ͭ���ˤʤäƤ���\n"
 "               �ꥹ�Ȥ��٤ƤǤΰ����ˤ����ƿ��ι�פ�\n"
 "               ���Υꥹ�Ȥ� member_verbosity_threshold ���ͤ�ã����ȡ�\n"
-"               ���β���ϼ�ưŪ������(��ǥ졼�����)����ޤ�.\n"
+"               ���β���ϼ�ưŪ������(��ǥ졼�����)����ޤ���\n"
 "\n"
 "               <p>���Υꥹ�Ȥ� member_verbosity_threshold ����Ӥ����\n"
 "               ��ƿ��ϡ� member_verbosity_threshold ��ͭ���ˤʤäƤ���\n"
 "               ���줾��Υꥹ����� member_verbosity_interval �����\n"
-"               �Ϥ�����Ƥ��٤ƤǤ�."
+"               �Ϥ�����Ƥ��٤ƤǤ���"
 
 #: Mailman/Gui/Privacy.py:266
 msgid ""
 "Action to take when a moderated member posts to the\n"
 "             list."
-msgstr "�����դ����������Ƥ����ä��Ȥ���ư��."
+msgstr "�����դ����������Ƥ����ä��Ȥ���ư�"
 
 #: Mailman/Gui/Privacy.py:268
 msgid ""
@@ -6824,7 +6845,7 @@ msgid ""
 msgstr ""
 "�����դ�����������Ƥ��Ф���������\n"
 "<a href=\"?VARHELP/privacy/sender/member_moderation_action\"\n"
-">��������</a>�˴ޤ��ʸ."
+">��������</a>�˴ޤ��ʸ��"
 
 #: Mailman/Gui/Privacy.py:290
 msgid ""
@@ -6984,7 +7005,7 @@ msgid ""
 msgstr ""
 "dmarc_moderation_action ��Ŭ�Ѥ��졢���줬�֥᡼�����ź�աפǤ���Ȥ��ˡ�\n"
 "���Υƥ�����ʸ�����ꤵ��Ƥ�����ˤϡ�������ƥ�å�����������\n"
-"���Υƥ�����ʸ����Ω����MIME�ѡ��ȤȤ����������ޤ�.\n"
+"���Υƥ�����ʸ����Ω����MIME�ѡ��ȤȤ����������ޤ���\n"
 
 #: Mailman/Gui/Privacy.py:365
 msgid ""
@@ -7005,7 +7026,7 @@ msgstr ""
 "             �ѡ��ȡ�msg_footer��Ǽ�᤿ text/plain �ѡ���)���鹽�������\n"
 "             multi-part/mixed �Υ�å������������Υ�å������ʳ���\n"
 "             �ѡ��Ȥ��ɤ�⳺�����ʤ����ˤ� message/rfc822 ��å�������\n"
-"             �����줫�η����ˤʤ�ޤ�."
+"             �����줫�η����ˤʤ�ޤ���"
 
 #: Mailman/Gui/Privacy.py:374
 msgid ""
@@ -7076,7 +7097,7 @@ msgstr "
 msgid ""
 "List of non-member addresses whose postings should be\n"
 "             automatically accepted."
-msgstr "��ưŪ����Ƥ�ǧ���٤������Υ��ɥ쥹"
+msgstr "��ưŪ����Ƥ�ǧ���٤������Υ��ɥ쥹��"
 
 #: Mailman/Gui/Privacy.py:410
 msgid ""
@@ -7088,11 +7109,11 @@ msgid ""
 "             Mailman list in this installation, all of whose member\n"
 "             addresses will be accepted for this list."
 msgstr ""
-"�����������������Ƥ�, ��ưŪ�˾�ǧ����\n"
-"�ʲ�ץ�������ɬ�פȤ��ޤ���. 1�ԤˤĤ�1�ĤΥ��ɥ쥹��\n"
+"�����������������Ƥϡ���ưŪ�˾�ǧ����\n"
+"�ʲ�ץ�������ɬ�פȤ��ޤ���1�ԤˤĤ�1�ĤΥ��ɥ쥹��\n"
 "�������Ƥ�������; ����ɽ����Ȥ��ˤϹԤκǽ�� ^ �ǻϤ�Ƥ�������.\n"
-"�Ԥκǽ�� @ ʸ���ˤ���, ��ˤ��� Mailman �����ƥ�Υꥹ��̾��³�����,\n"
-"���Υꥹ�Ȳ����������ǧ����ޤ�.\n"
+"�Ԥκǽ�� @ ʸ���ˤ��ơ���ˤ��� Mailman �����ƥ�Υꥹ��̾��³����ȡ�\n"
+"���Υꥹ�Ȳ����������ǧ����ޤ���\n"
 
 #: Mailman/Gui/Privacy.py:419
 msgid ""
@@ -7111,10 +7132,10 @@ msgid ""
 "             line; start the line with a ^ character to designate a regular\n"
 "             expression match."
 msgstr ""
-"�����������������Ƥ�, �ʲ�Ԥξ�ǧ������뤿��\n"
-"��ưŪ��ľ������α����ޤ�. �᡼�����ƼԤˤ���α�������Ȥ����Τ���, \n"
-"�᡼���ʬ�Ǽ��ä����Ȥ�Ǥ��ޤ�. 1�ԤˤĤ�1�ĤΥ��ɥ쥹��\n"
-"�������Ƥ�������; ����ɽ����Ȥ��ˤϹԤκǽ�� ^ �ǻϤ�Ƥ�������."
+"�����������������Ƥϡ��ʲ�Ԥξ�ǧ������뤿��\n"
+"��ưŪ��ľ������α����ޤ����᡼�����ƼԤˤ���α�������Ȥ����Τ��졢\n"
+"�᡼���ʬ�Ǽ��ä����Ȥ�Ǥ��ޤ���1�ԤˤĤ�1�ĤΥ��ɥ쥹��\n"
+"�������Ƥ�������; ����ɽ����Ȥ��ˤϹԤκǽ�� ^ �ǻϤ�Ƥ���������"
 
 #: Mailman/Gui/Privacy.py:430
 msgid ""
@@ -7137,21 +7158,21 @@ msgid ""
 "             <p>Add member addresses one per line; start the line with a ^\n"
 "             character to designate a regular expression match."
 msgstr ""
-"�����������������Ƥ�, ��ưŪ�˵��ݤ��ޤ�.\n"
-"�Ĥޤ�, ��ư���ݤ������Ȥ����ΤȰ��˥᡼����������ޤ�.\n"
-"���Τ����ǥ᡼�������Ԥˤ��Υ��ץ�������ꤹ��٤��ǤϤ���ޤ���. \n"
+"�����������������Ƥϡ���ưŪ�˵��ݤ��ޤ���\n"
+"�Ĥޤꡢ��ư���ݤ������Ȥ����ΤȰ��˥᡼����������ޤ���\n"
+"���Τ����ǥ᡼�������Ԥˤ��Υ��ץ�������ꤹ��٤��ǤϤ���ޤ���\n"
 "���Τ褦�ʥ᡼���\n"
 "<a href=\"?VARHELP=privacy/sender/discard_these_nonmembers\"> ��ưŪ��\n"
-"�˴�</a>����٤��Ǥ�.\n"
+"�˴�</a>����٤��Ǥ���\n"
 "\n"
 "<p>1�ԤˤĤ�1�ĤΥ��ɥ쥹��\n"
-"�������Ƥ�������; ����ɽ����Ȥ��ˤϹԤκǽ�� ^ �ǻϤ�Ƥ�������."
+"�������Ƥ�������; ����ɽ����Ȥ��ˤϹԤκǽ�� ^ �ǻϤ�Ƥ���������"
 
 #: Mailman/Gui/Privacy.py:445
 msgid ""
 "List of non-member addresses whose postings will be\n"
 "             automatically discarded."
-msgstr "��ưŪ����Ƥ��˴����������Υ��ɥ쥹"
+msgstr "��ưŪ����Ƥ��˴����������Υ��ɥ쥹��"
 
 #: Mailman/Gui/Privacy.py:448
 msgid ""
@@ -7167,19 +7188,19 @@ msgid ""
 "             <p>Add member addresses one per line; start the line with a ^\n"
 "             character to designate a regular expression match."
 msgstr ""
-"�����������������Ƥ�, ��ưŪ���˴����ޤ�.\n"
-"�Ĥޤ�, �᡼��ϼΤƤ��, ���������ΤϤ���ޤ���. �����Ԥˤ����Τ�\n"
-"�����⤢��ޤ���, ���ץ���������ǥꥹ�Ȼʲ�Ԥ�\n"
+"�����������������Ƥ�, ��ưŪ���˴����ޤ���\n"
+"�Ĥޤꡢ�᡼��ϼΤƤ�졢���������ΤϤ���ޤ��������Ԥˤ����Τ�\n"
+"�����⤢��ޤ��󤬡����ץ���������ǥꥹ�Ȼʲ�Ԥ�\n"
 "<a href=\"?VARHELP=privacy/sender/forward_auto_discards\">\n"
-"�˴������᡼��Υ��ԡ���������</a>���Ȥ��Ǥ��ޤ�.\n"
+"�˴������᡼��Υ��ԡ���������</a>���Ȥ��Ǥ��ޤ���\n"
 "<p>1�ԤˤĤ�1�ĤΥ��ɥ쥹��\n"
-"�������Ƥ�������; ����ɽ����Ȥ��ˤϹԤκǽ�� ^ �ǻϤ�Ƥ�������."
+"�������Ƥ�������; ����ɽ����Ȥ��ˤϹԤκǽ�� ^ �ǻϤ�Ƥ���������"
 
 #: Mailman/Gui/Privacy.py:460
 msgid ""
 "Action to take for postings from non-members for which no\n"
 "             explicit action is defined."
-msgstr "ư��������Ƥ��ʤ������������Ƥ��Ф���ư��."
+msgstr "ư��������Ƥ��ʤ������������Ƥ��Ф���ư�"
 
 #: Mailman/Gui/Privacy.py:463
 msgid ""
@@ -7196,15 +7217,15 @@ msgid ""
 "action\n"
 "             is taken."
 msgstr ""
-"�����������Ƥ������ä��Ȥ�, �᡼��������Ԥ�\n"
+"�����������Ƥ������ä��Ȥ����᡼��������Ԥ�\n"
 "<a href=\"?VARHELP=privacy/sender/accept_these_nonmembers\">��ǧ</a>\n"
-"�ޤ���, \n"
+"�ޤ��ϡ�\n"
 "<a href=\"?VARHELP=privacy/sender/hold_these_nonmembers\">��α</a>��\n"
 "<a href=\"?VARHELP=privacy/sender/reject_these_nonmembers\">����(����)</"
 "a>��\n"
 "<a href=\"?VARHELP=privacy/sender/discard_these_nonmembers\">�˴�</a>\n"
-"�Υ��ɥ쥹�ꥹ�Ȥˤ��뤫������å����ޤ�. �⤷, ̵�����\n"
-"����ư�Ŭ�Ѥ���ޤ�."
+"�Υ��ɥ쥹�ꥹ�Ȥˤ��뤫������å����ޤ����⤷��̵�����\n"
+"����ư�Ŭ�Ѥ���ޤ���"
 
 #: Mailman/Gui/Privacy.py:475
 msgid ""
@@ -7219,9 +7240,9 @@ msgid ""
 "             the list's owner address by %%(listowner)s and replaces the\n"
 "             internally crafted default message."
 msgstr ""
-"��������Ƥ��Ф��Ƶ������Τ˴ޤ��ʸ. �������Τˤϥꥹ�ȴ����Ԥ�\n"
-"���ɥ쥹�� %%(listowner)s �Ȥ��ƴޤ�뤳�Ȥ��Ǥ�, �����Ǻ��������\n"
-"�ǥե���ȤΥ᡼��ʸ���֤������ޤ�."
+"��������Ƥ��Ф��Ƶ������Τ˴ޤ��ʸ���������Τˤϥꥹ�ȴ����Ԥ�\n"
+"���ɥ쥹�� %%(listowner)s �Ȥ��ƴޤ�뤳�Ȥ��Ǥ��������Ǻ��������\n"
+"�ǥե���ȤΥ᡼��ʸ���֤������ޤ���"
 
 #: Mailman/Gui/Privacy.py:487
 msgid ""
@@ -7229,7 +7250,7 @@ msgid ""
 "            the recipient of the message."
 msgstr ""
 "���Υ��������Ǥϥ᡼��ΰ���ˤ��Ƽ�Υե��륿��\n"
-"���ꤷ�ޤ�."
+"���ꤷ�ޤ���"
 
 #: Mailman/Gui/Privacy.py:490
 msgid "Recipient filters"
@@ -7266,18 +7287,18 @@ msgid ""
 "             </ol>"
 msgstr ""
 "¿����(�ºݤˤϤۤȤ�ɤ�) ���ǥ᡼�������ʰ����\n"
-"����Ū�˰��襢�ɥ쥹�˽�Ϣ�ͤ뤳�ȤϤ���ޤ���.\n"
-"�ºݤˤ�, �ޤ�ǤǤ����Υ��ɥ쥹�� To: �˽񤫤�Ƥ��뤳�Ȥ�\n"
-"�褯����ޤ�. ���������ꤹ�����¤� '@' ����κ�¦������Ŭ�Ѥ���ޤ���, \n"
-"��������Ǥ��μ�����ǥ᡼��򤹤٤ƿ����ߤ�뤳�Ȥ��Ǥ��ޤ�.\n"
+"����Ū�˰��襢�ɥ쥹�˽�Ϣ�ͤ뤳�ȤϤ���ޤ���\n"
+"�ºݤˤϡ��ޤ�ǤǤ����Υ��ɥ쥹�� To: �˽񤫤�Ƥ��뤳�Ȥ�\n"
+"�褯����ޤ������������ꤹ�����¤� '@' ����κ�¦������Ŭ�Ѥ���ޤ�����\n"
+"��������Ǥ��μ�����ǥ᡼��򤹤٤ƿ����ߤ�뤳�Ȥ��Ǥ��ޤ���\n"
 "\n"
-"<p>���������, ¾�Υ��ɥ쥹���餽�Τޤ����ž�����줿�᡼�뤬\n"
-"�����դ����ʤ��ʤ�ޤ�. ������,\n"
+"<p>��������ˡ�¾�Υ��ɥ쥹���餽�Τޤ����ž�����줿�᡼�뤬\n"
+"�����դ����ʤ��ʤ�ޤ�����������\n"
 "<ol>\n"
-"    <li>��Ѹ��Υ��ɥ쥹�� '@'����κ�¦��Ʊ��̾���Ǥ���, �ޤ��� \n"
+"    <li>��Ѹ��Υ��ɥ쥹�� '@'����κ�¦��Ʊ��̾���Ǥ��롢�ޤ���\n"
 "    <li>��Ѹ��Υ��ɥ쥹����Ƥ�����դ�����̾�Υꥹ�Ȥ˴ޤޤ�Ƥ���\n"
 "</ol>\n"
-"��, �����դ���褦�ˤʤ�ޤ�. "
+"�ȡ������դ���褦�ˤʤ�ޤ���"
 
 #: Mailman/Gui/Privacy.py:515
 msgid ""
@@ -7285,7 +7306,7 @@ msgid ""
 "             destination names for this list."
 msgstr ""
 "����Ū�� To: �ޤ��� Cc: �����äƤ���� ���Υꥹ\n"
-"    �Ȥؤ�������Ԥ��褦����̾(����ɽ��)."
+"    �Ȥؤ�������Ԥ��褦����̾(����ɽ��)��"
 
 #: Mailman/Gui/Privacy.py:518
 msgid ""
@@ -7312,30 +7333,30 @@ msgid ""
 "             recipient address."
 msgstr ""
 "`require_explicit_destination' �����ꤵ��Ƥ���Ȥ���\n"
-" �ꥹ�Ȥ���̾�ȸ��ʤ����ɥ쥹. �����Ǥ������, ���٤Ƥΰ��襢�ɥ쥹��\n"
-" �б���Ӥ��������ɽ���Υꥹ�ȤǤ�. 1�Ԥ�1���ɥ쥹�򵭽Ҥ��ޤ�.\n"
-" ��Ӥˤ� Python �� re.match() �ؿ����Ȥ��뤿��, \n"
-" ɬ��ʸ�������Ƭ������б���Ĵ�٤��ޤ�. \n"
+" �ꥹ�Ȥ���̾�ȸ��ʤ����ɥ쥹�������Ǥ������, ���٤Ƥΰ��襢�ɥ쥹��\n"
+" �б���Ӥ��������ɽ���Υꥹ�ȤǤ���1�Ԥ�1���ɥ쥹�򵭽Ҥ��ޤ���\n"
+" ��Ӥˤ� Python �� re.match() �ؿ����Ȥ��뤿�ᡢ\n"
+" ɬ��ʸ�������Ƭ������б���Ĵ�٤��ޤ���\n"
 "\n"
-"<p>Mailman 1.1 �Ȥθ����ߴ�����ݻ����뤿���, ����ɽ���� `@'\n"
-" ���ޤޤ�Ƥ��ʤ����, ���襢�ɥ쥹�Υ�������ѡ��ȤȤ��б���Ĵ�٤��ޤ�.\n"
-" ��Ӥη��, �б������Ĥ����ʤ��ä���, �ѥ������ `@'\n"
-" ���ޤޤ�Ƥ������, ���襢�ɥ쥹���Τȥѥ�����Ȥ���Ӥ��ޤ�. \n"
+"<p>Mailman 1.1 �Ȥθ����ߴ�����ݻ����뤿��ˡ�����ɽ���� `@'\n"
+" ���ޤޤ�Ƥ��ʤ���С����襢�ɥ쥹�Υ�������ѡ��ȤȤ��б���Ĵ�٤��ޤ���\n"
+" ��Ӥη�̡��б������Ĥ����ʤ��ä��ꡢ�ѥ������ `@'\n"
+" ���ޤޤ�Ƥ�����ϡ����襢�ɥ쥹���Τȥѥ�����Ȥ���Ӥ��ޤ���\n"
 "\n"
-"<p>����Υ�꡼���Ǥϥ�������ѡ��ȤȤ���ӤϹԤ鷺, \n"
-"���襢�ɥ쥹���ΤȤ��б�����Ӥ�����ͽ��Ǥ�. "
+"<p>����Υ�꡼���Ǥϥ�������ѡ��ȤȤ���ӤϹԤ鷺��\n"
+"���襢�ɥ쥹���ΤȤ��б�����Ӥ�����ͽ��Ǥ���"
 
 #: Mailman/Gui/Privacy.py:536
 msgid "Ceiling on acceptable number of recipients for a posting."
-msgstr "��Ƥ�ǧ���᡼��˴ޤޤ������Կ��ξ��."
+msgstr "��Ƥ�ǧ���᡼��˴ޤޤ������Կ��ξ�¡�"
 
 #: Mailman/Gui/Privacy.py:538
 msgid ""
 "If a posting has this number, or more, of recipients, it is\n"
 "             held for admin approval.  Use 0 for no ceiling."
 msgstr ""
-"�����Ͱʾ�μ����Կ������ꤵ�줿�᡼���, \n"
-"��ǧ�Τ������α���ޤ�. 0��̵���¤ΰ�̣�ˤʤ�ޤ�. "
+"�����Ͱʾ�μ����Կ������ꤵ�줿�᡼��ϡ�\n"
+"��ǧ�Τ������α���ޤ���0��̵���¤ΰ�̣�ˤʤ�ޤ���"
 
 #: Mailman/Gui/Privacy.py:543
 msgid ""
@@ -7345,8 +7366,8 @@ msgid ""
 "            your list members end up receiving.\n"
 "            "
 msgstr ""
-"���Υ��������Ǥ�, ������ۿ���������ǥ᡼��򸺤餹�����\n"
-"�Ƽ�����ǥ᡼��ե��륿�����ꤷ�ޤ�."
+"���Υ��������Ǥϡ�������ۿ���������ǥ᡼��򸺤餹�����\n"
+"�Ƽ�����ǥ᡼��ե��륿�����ꤷ�ޤ���"
 
 #: Mailman/Gui/Privacy.py:548
 msgid "Header filters"
@@ -7354,7 +7375,7 @@ msgstr "
 
 #: Mailman/Gui/Privacy.py:551
 msgid "Filter rules to match against the headers of a message."
-msgstr "�إå���Ŭ�Ѥ���ե��륿��§."
+msgstr "�إå���Ŭ�Ѥ���ե��륿��§��"
 
 #: Mailman/Gui/Privacy.py:553
 msgid ""
@@ -7399,7 +7420,7 @@ msgstr "
 
 #: Mailman/Gui/Privacy.py:573
 msgid "Hold posts with header value matching a specified regexp."
-msgstr "���ꤷ������ɽ���˥ޥå�����إå�����Ƥ���α����."
+msgstr "���ꤷ������ɽ���˥ޥå�����إå�����Ƥ���α���롣"
 
 #: Mailman/Gui/Privacy.py:574
 msgid ""
@@ -7421,16 +7442,16 @@ msgid ""
 "             bracketing it."
 msgstr ""
 "���Υ��ץ�����Ȥ��Ȼ��ꤵ�줿�إå������Ƥ�\n"
-"��Ƥ�ػߤ��뤳�Ȥ��Ǥ��ޤ�.\n"
-" �оݤˤʤ�ΤϤ��Υإå����Ф�������ɽ���Ǥ�.\n"
-" �ޥå��󥰤���ʸ������ʸ������̤����˹Ԥ��, \n"
-" '#' �ǻϤޤ�Ԥϥ����ȤȤߤʤ���ޤ�. \n"
+"��Ƥ�ػߤ��뤳�Ȥ��Ǥ��ޤ���\n"
+" �оݤˤʤ�ΤϤ��Υإå����Ф�������ɽ���Ǥ���\n"
+" �ޥå��󥰤���ʸ������ʸ������̤����˹Ԥ�졢\n"
+" '#' �ǻϤޤ�Ԥϥ����ȤȤߤʤ���ޤ���\n"
 " <p>�㡧<pre>to: .*@public.com </pre>\n"
 " �� <em>to</em>(����) �Υ᡼��إå��Υ��ɥ쥹��\n"
-" ��� '@public.com' ���ɤ��������äƤ���Ȥ�����̣�Ǥ�.\n"
-" <p>��Ԥ��ƶ��򤬤�����ˤ�, ����������ɽ������Ϥ�����ޤ�. \n"
-" ���������Ȥ��Х��������פ�֥饱�åȤ��Ѥ���, ¿����\n"
-" ��ˡ�Dz���Ǥ��ޤ�."
+" ��� '@public.com' ���ɤ��������äƤ���Ȥ�����̣�Ǥ���\n"
+" <p>��Ԥ��ƶ��򤬤�����ˤϡ�����������ɽ������Ϥ�����ޤ���\n"
+" ���������Ȥ��Х��������פ�֥饱�åȤ��Ѥ��ơ�¿����\n"
+" ��ˡ�Dz���Ǥ��ޤ���"
 
 #: Mailman/Gui/Privacy.py:609
 msgid ""
@@ -7445,8 +7466,8 @@ msgid ""
 "Header filter rules require a pattern.\n"
 "                Incomplete filter rules will be ignored."
 msgstr ""
-"�إå��ե��륿��§�ˤ�ɬ���ѥ��������ꤷ�Ƥ�������.\n"
-"�Դ����ʥե��륿��̵�뤵��ޤ�."
+"�إå��ե��륿��§�ˤ�ɬ���ѥ��������ꤷ�Ƥ���������\n"
+"�Դ����ʥե��륿��̵�뤵��ޤ���"
 
 #: Mailman/Gui/Privacy.py:678
 msgid ""
@@ -7455,8 +7476,8 @@ msgid ""
 "                rule will be ignored."
 msgstr ""
 "�إå��ե��륿��§�ǻ��ꤵ�줿�ѥ����� `%(safepattern)s' ��\n"
-"����ɽ���Ȥ�������������ޤ���.\n"
-"���ε�§��̵�뤷�ޤ�."
+"����ɽ���Ȥ�������������ޤ���\n"
+"���ε�§��̵�뤷�ޤ���"
 
 #: Mailman/Gui/Topics.py:38
 msgid "Topics"
@@ -7482,7 +7503,7 @@ msgstr "
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -7504,24 +7525,26 @@ msgid ""
 "\">topics_bodylines_limit</a>\n"
 "             configuration variable."
 msgstr ""
-"����ե��륿��, �ʲ����������\n"
-"<a href=\"http://docs.python.org/library/re.html\">����ɽ��\n"
-"�ե��륿</a> ����Ƥ��줿�᡼���ʬ�ष�ޤ�.\n"
+"����ե��륿�ϡ��ʲ����������\n"
+"<a href=\"https://docs.python.org/2/library/re.html\">����ɽ��\n"
+"�ե��륿</a> ����Ƥ��줿�᡼���ʬ�ष�ޤ�"
+"(<a href=\"https://docs.python.org/ja/2.7/library/re.html\">"
+"���ܸ���ʸ��ؤΥ��</a>)��\n"
 "�᡼��� <code>Subject:</code> �� <code>Keywords:</code> �إå���\n"
-"����ե��륿��Ŭ�礷���᡼���, ���ꤴ�Ȥ˺��줿<em>�Х����å�</em>\n"
-"��������ޤ�. ���줾��β����, ��ʬ��������ꤿ������Х����åȤ�����"
-"��, \n"
-"���ΥХ����åȤΥ᡼������������뤳�Ȥ��Ǥ��ޤ�.\n"
-"�ɤΥХ����åȤˤ�������ʤ��ä��᡼�����������ޤ���.\n"
+"����ե��륿��Ŭ�礷���᡼��ϡ����ꤴ�Ȥ˺��줿<em>�Х����å�</em>\n"
+"��������ޤ������줾��β���ϡ���ʬ��������ꤿ������Х����åȤ�����"
+"�ǡ�\n"
+"���ΥХ����åȤΥ᡼������������뤳�Ȥ��Ǥ��ޤ���\n"
+"�ɤΥХ����åȤˤ�������ʤ��ä��᡼�����������ޤ���\n"
 "<p>\n"
-"�����, ���������Ǥ����Ȥ��ޤ���. �ޤȤ��ɤߤǤϻȤ��ޤ���Τ����դ��Ƥ�����"
-"��.\n"
+"����ϡ����������Ǥ����Ȥ��ޤ��󡣤ޤȤ��ɤߤǤϻȤ��ޤ���Τ����դ��Ƥ�����"
+"����\n"
 "<p>\n"
 "�᡼�����ʸ��ʬ��<code>Subject:</code> �� <code>Keyword:</code>��\n"
-"���ꤹ�뤳�Ȥ�Ǥ��ޤ�. ���ξ��, \n"
+"���ꤹ�뤳�Ȥ�Ǥ��ޤ������ξ�硢\n"
 "<a href=\"?VARHELP=topics/topics_bodylines_limit\">topics_bodylines_limit</"
 "a>\n"
-"���ѿ���, ��������Կ�������Ǥ��ޤ�."
+"���ѿ��ǡ���������Կ�������Ǥ��ޤ���"
 
 #: Mailman/Gui/Topics.py:72
 msgid "How many body lines should the topic matcher scan?"
@@ -7545,16 +7568,16 @@ msgid ""
 "             until a non-header-like line is encountered.\n"
 "             "
 msgstr ""
-"����Υ������Ǥ�, ���ιԿ�������ʸ���椫������Υ�����ɤ�\n"
-"õ���ޤ�. ��ʸ�Υ������Ϥ��ιԿ��������뤤��, �إå��Ǥʤ������ʹԤ�\n"
-"�ФƤ����饹�ȥåפ��ޤ�. �����ͤ򥼥��ˤ��Ƥ�����, ��ʸ�Υ�������\n"
-"�����ʤ��ޤ���. (�Ĥޤ� <code>Keywords:</code> �� <code>Subject:</code>\n"
-"�إå������򸫤ޤ�) �����ͤ���ˤ��Ƥ�����, �إå��Ǥʤ������ʹԤ�\n"
-"�ФƤ���ޤ���ʸ�򥹥���󤷤ޤ�."
+"����Υ������Ǥϡ����ιԿ�������ʸ���椫������Υ�����ɤ�\n"
+"õ���ޤ�����ʸ�Υ������Ϥ��ιԿ��������뤤�ϡ��إå��Ǥʤ������ʹԤ�\n"
+"�ФƤ����饹�ȥåפ��ޤ��������ͤ򥼥��ˤ��Ƥ����ȡ���ʸ�Υ�������\n"
+"�����ʤ��ޤ���(�Ĥޤ� <code>Keywords:</code> �� <code>Subject:</code>\n"
+"�إå������򸫤ޤ�) �����ͤ���ˤ��Ƥ����ȡ��إå��Ǥʤ������ʹԤ�\n"
+"�ФƤ���ޤ���ʸ�򥹥���󤷤ޤ���"
 
 #: Mailman/Gui/Topics.py:85
 msgid "Topic keywords, one per line, to match against each message."
-msgstr "�᡼��˥ޥå����������ꥭ�����, 1�ԤˤĤ�1��"
+msgstr "�᡼��˥ޥå����������ꥭ����ɡ�1�ԤˤĤ�1��"
 
 #: Mailman/Gui/Topics.py:87
 msgid ""
@@ -7568,27 +7591,27 @@ msgid ""
 "             contain a <code>Keywords:</code> and <code>Subject:</code>\n"
 "             \"header\" on which matching is also performed."
 msgstr ""
-"���ꥭ����ɤ�����ɽ����, �᡼����������ʬ,\n"
+"���ꥭ����ɤ�����ɽ���ǡ��᡼����������ʬ��\n"
 "����Ū�ˤ� <code>Keywords:</code> �� <code>Subject:</code>\n"
-"�إå������ƤȰ��פ��뤫�ɤ����θ����˻Ȥ��ޤ�. �᡼����ʸ����Ƭ��\n"
+"�إå������ƤȰ��פ��뤫�ɤ����θ����˻Ȥ��ޤ����᡼����ʸ����Ƭ��\n"
 "�񤫤줿 <code>Keywords:</code> �� <code>Subject:</code> \"�إå�\"\n"
-"���Ф��Ƥ⸡�����Ԥʤ��ޤ�."
+"���Ф��Ƥ⸡�����Ԥʤ��ޤ���"
 
 #: Mailman/Gui/Topics.py:125
 msgid ""
 "Topic specifications require both a name and\n"
 "                a pattern.  Incomplete topics will be ignored."
 msgstr ""
-"�������ꤹ��ˤ�, ̾���ȥѥ�����λ��꤬ɬ�פǤ�.\n"
-"�Դ����������̵�뤵��ޤ�."
+"�������ꤹ��ˤϡ�̾���ȥѥ�����λ��꤬ɬ�פǤ���\n"
+"�Դ����������̵�뤵��ޤ���"
 
 #: Mailman/Gui/Topics.py:135
 msgid ""
 "The topic pattern '%(safepattern)s' is not a\n"
 "                legal regular expression.  It will be discarded."
 msgstr ""
-"��������ѥ����� `%(safepattern)s' ������������ɽ���ǤϤ���ޤ���.\n"
-"���λ�����˴����ޤ�."
+"��������ѥ����� `%(safepattern)s' ������������ɽ���ǤϤ���ޤ���\n"
+"���λ�����˴����ޤ���"
 
 #: Mailman/Gui/Usenet.py:25
 msgid "Mail&lt;-&gt;News&nbsp;gateways"
@@ -7596,7 +7619,7 @@ msgstr "
 
 #: Mailman/Gui/Usenet.py:35
 msgid "Mail-to-News and News-to-Mail gateway services."
-msgstr "�᡼�롦�˥塼��������������ӥ�������."
+msgstr "�᡼�롦�˥塼��������������ӥ������ꡣ"
 
 #: Mailman/Gui/Usenet.py:37
 msgid "News server settings"
@@ -7604,7 +7627,7 @@ msgstr "
 
 #: Mailman/Gui/Usenet.py:40
 msgid "The hostname of the machine your news server is running on."
-msgstr "�˥塼�������Ф���ư���Ƥ���ޥ���Υۥ���̾."
+msgstr "�˥塼�������Ф���ư���Ƥ���ޥ���Υۥ���̾��"
 
 #: Mailman/Gui/Usenet.py:41
 msgid ""
@@ -7618,13 +7641,13 @@ msgid ""
 "             recognize the machine this mailing list runs on as a machine\n"
 "             capable of reading and posting news."
 msgstr ""
-"�˥塼�������Ф�̾������ꤷ�ޤ�. name:port �η����ǥݡ����ֹ��\n"
-"���ꤹ�뤳�Ȥ�Ǥ��ޤ�.\n"
+"�˥塼�������Ф�̾������ꤷ�ޤ��� name:port �η����ǥݡ����ֹ��\n"
+"���ꤹ�뤳�Ȥ�Ǥ��ޤ���\n"
 "\n"
-"�˥塼�������Ф� Mailman ���Ȥ����ĵ�ǽ�ǤϤ���ޤ���. \n"
-"���ʤ��ϴ��� NNTP �����Ф˥������������ʤ���Фʤ餺, ����\n"
+"�˥塼�������Ф� Mailman ���Ȥ����ĵ�ǽ�ǤϤ���ޤ���\n"
+"���ʤ��ϴ��� NNTP �����Ф˥������������ʤ���Фʤ餺������\n"
 " NNTP�����Фϥ᡼��󥰥ꥹ�Ȥ���ư���Ƥ���ޥ����\n"
-"�֥˥塼�����ɤ߽񤭤Ǥ���ۥ��ȡפ�ǧ�����ʤ���Фʤ�ޤ���. "
+"�֥˥塼�����ɤ߽񤭤Ǥ���ۥ��ȡפ�ǧ�����ʤ���Фʤ�ޤ���"
 
 #: Mailman/Gui/Usenet.py:50
 msgid "The name of the Usenet group to gateway to and/or from."
@@ -7652,7 +7675,7 @@ msgstr "
 
 #: Mailman/Gui/Usenet.py:63
 msgid "Open list, moderated group"
-msgstr "�ꥹ�Ȥϸ���, ���롼�פ������դ�"
+msgstr "�ꥹ�Ȥϸ��������롼�פ������դ�"
 
 #: Mailman/Gui/Usenet.py:66
 msgid "The moderation policy of the newsgroup."
@@ -7694,29 +7717,29 @@ msgid ""
 "             Mailman moderation facilities, but to add an <tt>Approved</tt>\n"
 "             header to all messages that are gatewayed to Usenet."
 msgstr ""
-"�����Ǥ�, �˥塼�����롼�פ�����(��ǥ졼�����)�ݥꥷ����\n"
-"�᡼��󥰥ꥹ�Ȥ����¥ݥꥷ���Ȥκ��ѤˤĤ������ꤷ�ޤ�.\n"
-"�����, �˥塼�����롼��<em>��</em>ž������������ƤϤޤ�ޤ��Τ�, \n"
+"�����Ǥϡ��˥塼�����롼�פ�����(��ǥ졼�����)�ݥꥷ����\n"
+"�᡼��󥰥ꥹ�Ȥ����¥ݥꥷ���Ȥκ��ѤˤĤ������ꤷ�ޤ���\n"
+"����ϡ��˥塼�����롼��<em>��</em>ž������������ƤϤޤ�ޤ��Τǡ�\n"
 "�˥塼�����롼�פ���ž���������ž����Υ˥塼�����롼��\n"
-"����ǥ졼�ƥå�(�����դ�)�Ǥʤ����, \n"
-"���ץ�����<em>̵��</em>�����ꤷ�Ƥ�������.\n"
+"����ǥ졼�ƥå�(�����դ�)�Ǥʤ���С�\n"
+"���ץ�����<em>̵��</em>�����ꤷ�Ƥ���������\n"
 "\n"
 "<p>�˥塼�����롼�פ���ǥ졼�ƥåɤʤ�, ���Υ᡼��󥰥ꥹ�ȥ��ɥ쥹\n"
-"��˥塼�����롼�פλʲ�ԥ��ɥ쥹�����ꤷ�Ƥ⤫�ޤ��ޤ���. \n"
-"<em>�����դ�</em>�����֤�, ��Ƥϻʲ�Ԥˤ�뾵ǧ�Ԥ��ˤʤ�ޤ�. \n"
-"�᡼��󥰥ꥹ�Ȥ���Ƥ��줿�᡼���,\n"
-"�˥塼�����롼�פ�ž���������, �Ĥޤ�᡼��󥰥ꥹ�Ȥ�\n"
-"�������������, ��ǧ������ʤ���Фʤ�ޤ���.\n"
+"��˥塼�����롼�פλʲ�ԥ��ɥ쥹�����ꤷ�Ƥ⤫�ޤ��ޤ���\n"
+"<em>�����դ�</em>�����֤ȡ���Ƥϻʲ�Ԥˤ�뾵ǧ�Ԥ��ˤʤ�ޤ���\n"
+"�᡼��󥰥ꥹ�Ȥ���Ƥ��줿�᡼��ϡ�\n"
+"�˥塼�����롼�פ�ž������������Ĥޤ�᡼��󥰥ꥹ�Ȥ�\n"
+"������������ˡ���ǧ������ʤ���Фʤ�ޤ���\n"
 "\n"
 "<p><em><tt>Approved</tt>�إå��ȴ����ԤΥѥ���ɤ��դ���줿�᡼���\n"
-"��ǧ��³�����̤�ޤ���. �Ĥޤ�, ��Ƥθ��¤���Ŀͤ�ľ�ܥꥹ�Ȥ�\n"
-"�˥塼������ƤǤ��뤳�Ȥˤʤ�ޤ�.</em>\n"
+"��ǧ��³�����̤�ޤ��󡣤Ĥޤꡢ��Ƥθ��¤���Ŀͤ�ľ�ܥꥹ�Ȥ�\n"
+"�˥塼������ƤǤ��뤳�Ȥˤʤ�ޤ���</em>\n"
 "\n"
-"<p>�Ǹ��, �˥塼�����롼�פ���ǥ졼�ƥåɤ����ꤵ��Ƥ��Ƥ�, \n"
-"��ͳ����ƤǤ���褦�����ꤷ�������, \n"
-"<em>�ꥹ�Ȥϸ���, ���롼�פ������դ�</em>������Ǥ�������.\n"
-"��������֤�, �̾��Mailman�λʲ�λ��Ȥߤǥ᡼�뤬�ۿ�����, �˥塼��\n"
-"��ž������뵭���ˤϤ��٤�<tt>Approved</tt>�إå����դ����ޤ�."
+"<p>�Ǹ�ˡ��˥塼�����롼�פ���ǥ졼�ƥåɤ����ꤵ��Ƥ��Ƥ⡢\n"
+"��ͳ����ƤǤ���褦�����ꤷ������С�\n"
+"<em>�ꥹ�Ȥϸ��������롼�פ������դ�</em>������Ǥ���������\n"
+"��������֤ȡ��̾��Mailman�λʲ�λ��Ȥߤǥ᡼�뤬�ۿ����졢�˥塼��\n"
+"��ž������뵭���ˤϤ��٤�<tt>Approved</tt>�إå����դ����ޤ���"
 
 #: Mailman/Gui/Usenet.py:94
 msgid "Prefix <tt>Subject:</tt> headers on postings gated to news?"
@@ -7734,12 +7757,12 @@ msgid ""
 "             normal <tt>Subject:</tt> prefixes, they won't be prefixed for\n"
 "             gated messages either."
 msgstr ""
-"Mailman ��,  <tt>Subject:</tt>�إå�(��̾)��<a \n"
+"Mailman �ϡ�<tt>Subject:</tt>�إå�(��̾)��<a \n"
 "href=\"?VARHELP=general/subject_prefix\">�����Ԥ�����Ǥ������֤�</a>\n"
-"���դ��ޤ�. �����, �̾�, Usenet �˥塼����ž�����뵭���ˤ⸽��ޤ�.\n"
+"���դ��ޤ�������ϡ��̾Usenet �˥塼����ž�����뵭���ˤ⸽��ޤ���\n"
 "���Υ��ץ�����<em>������</em>�ˤ����ž�������ˤ����֤���Ĥ��ʤ�\n"
-"�褦�ˤʤ�ޤ�. �������, ���̤Υ᡼��˷�̾�����֤����դ��ʤ����, \n"
-"�˥塼���ˤ��դ��ޤ���."
+"�褦�ˤʤ�ޤ�������������̤Υ᡼��˷�̾�����֤����դ��ʤ���С�\n"
+"�˥塼���ˤ��դ��ޤ���"
 
 #: Mailman/Gui/Usenet.py:103
 msgid "Mass catch up"
@@ -7760,12 +7783,12 @@ msgid ""
 "             <em>read</em>.  By catching up, your mailing list members will\n"
 "             not see any of the earlier messages."
 msgstr ""
-"����å����åפ���(�ɤ��դ�)�Ȥ������Ȥ�, ���ο�������Ƥ����ä���������\n"
-" ž���򳫻Ϥ���Ȥ������ȤǤ�.  ��������Υ˥塼�����롼�פ�\n"
-" ������̵�뤵��ޤ�.  �����, ���ʤ����Ȥ��˥塼�����ɤ�Ǥ���, \n"
-" ���ߤ� �����������ִ��ɡפˤ���Τ�Ʊ�����ȤǤ�. \n"
+"����å����åפ���(�ɤ��դ�)�Ȥ������Ȥϡ����ο�������Ƥ����ä���������\n"
+" ž���򳫻Ϥ���Ȥ������ȤǤ�����������Υ˥塼�����롼�פ�\n"
+" ������̵�뤵��ޤ�������ϡ����ʤ����Ȥ��˥塼�����ɤ�Ǥ��ơ�\n"
+" ���ߤ� �����������ִ��ɡפˤ���Τ�Ʊ�����ȤǤ���\n"
 " ����å����åפ���ȥ᡼��󥰥ꥹ�Ȥβ���ϰ����ε�����\n"
-" ���뤳�ȤϤ���ޤ���."
+" ���뤳�ȤϤ���ޤ���"
 
 #: Mailman/Gui/Usenet.py:121
 msgid "Mass catchup completed"
@@ -7781,7 +7804,7 @@ msgid ""
 msgstr ""
 "<a href=\"?VARHELP=gateway/nntp_host\">�˥塼��������</a>��\n"
 "<a href=\"?VARHELP=gateway/linked_newsgroup\">�˥塼�����롼��</a>��\n"
-"���ꤷ�ʤ��ȥ˥塼���������ȥ�������ͭ���ˤʤ�ޤ���."
+"���ꤷ�ʤ��ȥ˥塼���������ȥ�������ͭ���ˤʤ�ޤ���"
 
 #: Mailman/HTMLFormatter.py:49
 msgid "%(listinfo_link)s list run by %(owner_link)s"
@@ -7820,16 +7843,16 @@ msgid ""
 "; it was disabled due to excessive bounces.  The\n"
 "            last bounce was received on %(date)s"
 msgstr ""
-"; ���顼�᡼��¿ȯ�ˤ����������ߤ��ޤ���.\n"
+"; ���顼�᡼��¿ȯ�ˤ����������ߤ��ޤ�����\n"
 "            �Ǹ�Υ��顼�� %(date)s �˼���"
 
 #: Mailman/HTMLFormatter.py:149
 msgid "; it was disabled for unknown reasons"
-msgstr "; ��������ߤ���Ƥ��ޤ�. ��ͳ�������Ǥ�."
+msgstr "; ��������ߤ���Ƥ��ޤ�����ͳ�������Ǥ���"
 
 #: Mailman/HTMLFormatter.py:151
 msgid "Note: your list delivery is currently disabled%(reason)s."
-msgstr "����: �᡼��������ϰ��Ū����ߤ���Ƥ��ޤ� %(reason)s."
+msgstr "����: �᡼��������ϰ��Ū����ߤ���Ƥ��ޤ� %(reason)s��"
 
 #: Mailman/HTMLFormatter.py:154
 msgid "Mail delivery"
@@ -7851,11 +7874,11 @@ msgid ""
 msgstr ""
 "<p>%(note)s\n"
 "\n"
-"<p>��ʬ���Ȥ���������ߤ�����, �ޤ��ϲ���Υ᡼�륢�ɥ쥹�ؤ�\n"
-"�����˥��顼��ȯ������������ߤ�����ǽ���⤢��ޤ�. \n"
-"�ɤ���ˤ��Ƥ�, ������Ƴ�����ˤ�, ���� %(link)s ���ץ�����\n"
-"�ѹ����Ƥ�������. ���η�˴ؤ������ޤ��Ͻ��Ϥ�ɬ�פʤȤ���, \n"
-"%(mailto)s ��Ϣ�����Ƥ�������. "
+"<p>��ʬ���Ȥ���������ߤ��������ޤ��ϲ���Υ᡼�륢�ɥ쥹�ؤ�\n"
+"�����˥��顼��ȯ������������ߤ�����ǽ���⤢��ޤ���\n"
+"�ɤ���ˤ��Ƥ⡢������Ƴ�����ˤϡ����� %(link)s ���ץ�����\n"
+"�ѹ����Ƥ������������η�˴ؤ������ޤ��Ͻ��Ϥ�ɬ�פʤȤ��ϡ�\n"
+"%(mailto)s ��Ϣ�����Ƥ���������"
 
 #: Mailman/HTMLFormatter.py:169
 msgid ""
@@ -7868,27 +7891,27 @@ msgid ""
 "            this address.  Your bounce score will be automatically reset if\n"
 "            the problems are corrected soon."
 msgstr ""
-"<p>���ʤ��Υ᡼�륢�ɥ쥹����, �Ƕ��������顼���Τ�����Ƥ��ޤ�.\n"
-" ���ʤ��θ��ߤ� <em>���顼��</em>�Ϻ��� %(total)s ���Ф���,\n"
-" %(score)s �ˤʤäƤ��ޤ�. ��Ͽ���ɥ쥹������������ʬ�����å�����\n"
-" ���Υ��ɥ쥹�ؤ����������̵꤬���褦�����դ��Ƥ�������. \n"
-" ���꤬��褹��Ф������顼���ϥꥻ�åȤ���ޤ�."
+"<p>���ʤ��Υ᡼�륢�ɥ쥹���顢�Ƕ��������顼���Τ�����Ƥ��ޤ���\n"
+" ���ʤ��θ��ߤ� <em>���顼��</em>�Ϻ��� %(total)s ���Ф��ơ�\n"
+" %(score)s �ˤʤäƤ��ޤ�����Ͽ���ɥ쥹������������ʬ�����å�����\n"
+" ���Υ��ɥ쥹�ؤ����������̵꤬���褦�����դ��Ƥ���������\n"
+" ���꤬��褹��Ф������顼���ϥꥻ�åȤ���ޤ���"
 
 #: Mailman/HTMLFormatter.py:181
 msgid ""
 "(Note - you are subscribing to a list of mailing lists, so the %(type)s "
 "notice will be sent to the admin address for your membership, %(addr)s.)<p>"
 msgstr ""
-"(���� - ���ʤ��ϥ᡼��󥰥ꥹ�ȤΥꥹ�Ȥ�������Ͽ���褦�Ȥ��Ƥ��ޤ�. ���Τ�"
-"�� %(type)s �Τ��Τ餻�ϴ������ѥ᡼�륢�ɥ쥹 %(addr)s ����������ޤ�.)"
+"(���� - ���ʤ��ϥ᡼��󥰥ꥹ�ȤΥꥹ�Ȥ�������Ͽ���褦�Ȥ��Ƥ��ޤ������Τ�"
+"�� %(type)s �Τ��Τ餻�ϴ������ѥ᡼�륢�ɥ쥹 %(addr)s ����������ޤ���)"
 
 #: Mailman/HTMLFormatter.py:191
 msgid ""
 "You will be sent email requesting confirmation, to\n"
 "            prevent others from gratuitously subscribing you."
 msgstr ""
-"¾�ͤ������ä����������³���򤹤뤳�Ȥ��ɤ������, \n"
-"��ǧ�׵�Υ᡼������Υ��ɥ쥹��������ޤ�. "
+"¾�ͤ������ä����������³���򤹤뤳�Ȥ��ɤ�����ˡ�\n"
+"��ǧ�׵�Υ᡼������Υ��ɥ쥹��������ޤ���"
 
 #: Mailman/HTMLFormatter.py:194
 msgid ""
@@ -7896,8 +7919,8 @@ msgid ""
 "            will be held for approval.  You will be notified of the list\n"
 "            moderator's decision by email."
 msgstr ""
-"������ĺ��ꥹ�ȤǤ�. ���񤬾�ǧ�����ޤǿ�������α����ޤ�. \n"
-"�ʲ�Ԥη���ϥ᡼��Ǥ��Τ餻���ޤ�."
+"������ĺ��ꥹ�ȤǤ������񤬾�ǧ�����ޤǿ�������α����ޤ���\n"
+"�ʲ�Ԥη���ϥ᡼��Ǥ��Τ餻���ޤ���"
 
 #: Mailman/HTMLFormatter.py:197 Mailman/HTMLFormatter.py:204
 msgid "also "
@@ -7912,33 +7935,33 @@ msgid ""
 "            by the list moderator.  You will be notified of the moderator's\n"
 "            decision by email."
 msgstr ""
-"¾�ͤ������ä����������³���򤹤뤳�Ȥ��ɤ������, \n"
-"��ǧ�׵�Υ᡼������Υ��ɥ쥹��������ޤ�. \n"
-"����ˤ���ǧ��, �����ϥꥹ�Ȼʲ�Ԥξ�ǧ�Τ�����α����ޤ�. \n"
-"�ʲ�Ԥη���ϥ᡼��Ǥ��Τ餻���ޤ�."
+"¾�ͤ������ä����������³���򤹤뤳�Ȥ��ɤ�����ˡ�\n"
+"��ǧ�׵�Υ᡼������Υ��ɥ쥹��������ޤ���\n"
+"����ˤ���ǧ�塢�����ϥꥹ�Ȼʲ�Ԥξ�ǧ�Τ�����α����ޤ���\n"
+"�ʲ�Ԥη���ϥ᡼��Ǥ��Τ餻���ޤ���"
 
 #: Mailman/HTMLFormatter.py:208
 msgid ""
 "This is %(also)sa private list, which means that the\n"
 "            list of members is not available to non-members."
 msgstr ""
-"���Υ᡼��󥰥ꥹ�Ȥ� %(also)s ��������ꥹ�ȤǤ�. \n"
-"�������Ф��Ƥϲ��̾����������Ƥ��ޤ���."
+"���Υ᡼��󥰥ꥹ�Ȥ� %(also)s ��������ꥹ�ȤǤ���\n"
+"�������Ф��Ƥϲ��̾����������Ƥ��ޤ���"
 
 #: Mailman/HTMLFormatter.py:211
 msgid ""
 "This is %(also)sa hidden list, which means that the\n"
 "            list of members is available only to the list administrator."
 msgstr ""
-"���Υ᡼��󥰥ꥹ�Ȥ� %(also)s ������Ǥ�. \n"
-"�ꥹ�ȴ����԰ʳ��ϲ��̾��������Ǥ��ޤ���. "
+"���Υ᡼��󥰥ꥹ�Ȥ� %(also)s ������Ǥ���\n"
+"�ꥹ�ȴ����԰ʳ��ϲ��̾��������Ǥ��ޤ���"
 
 #: Mailman/HTMLFormatter.py:214
 msgid ""
 "This is %(also)sa public list, which means that the\n"
 "            list of members list is available to everyone."
 msgstr ""
-"���Υ᡼��󥰥ꥹ�Ȥ� %(also)s �����ꥹ�ȤǤ�. \n"
+"���Υ᡼��󥰥ꥹ�Ȥ� %(also)s �����ꥹ�ȤǤ���\n"
 "ï�Ǥ���̾���򸫤뤳�Ȥ��Ǥ��ޤ�"
 
 #: Mailman/HTMLFormatter.py:217
@@ -7946,7 +7969,7 @@ msgid ""
 " (but we obscure the addresses so they are not\n"
 "                easily recognizable by spammers)."
 msgstr ""
-" (�����������ǥ᡼�������Ԥ�ʬ����ˤ����褦�˥��ɥ쥹��񤭴����ޤ�)."
+" (�����������ǥ᡼�������Ԥ�ʬ����ˤ����褦�˥��ɥ쥹��񤭴����ޤ�)��"
 
 #: Mailman/HTMLFormatter.py:222
 msgid ""
@@ -7956,8 +7979,8 @@ msgid ""
 "            `%(sfx)s' account for your address.)"
 msgstr ""
 "<p>(�����¾�Υ᡼��󥰥ꥹ�Ȥ����Ȥ���ƥꥹ�ȤǤ��뤳�Ȥ�����\n"
-"���Ƥ�������. �ƥꥹ�ȤǤ�, ��ǧ�׵�Υ᡼��� '%(sfx)s' ���դ���\n"
-"���ɥ쥹���������ޤ�.)"
+"���Ƥ����������ƥꥹ�ȤǤϡ���ǧ�׵�Υ᡼��� '%(sfx)s' ���դ���\n"
+"���ɥ쥹���������ޤ���)"
 
 #: Mailman/HTMLFormatter.py:251
 msgid "<b><i>either</i></b> "
@@ -7971,8 +7994,8 @@ msgid ""
 "        email address:\n"
 "        <p><center> "
 msgstr ""
-"%(realname)s ��������, �ѥ������˺���Τ�����, \n"
-"������ץ������ѹ��ˤ�, ��Ͽ�����᡼�륢�ɥ쥹������%(either)s:\n"
+"%(realname)s �������񡢥ѥ������˺���Τ����ꡢ\n"
+"������ץ������ѹ��ˤϡ���Ͽ�����᡼�륢�ɥ쥹������%(either)s:\n"
 "<p><center> "
 
 #: Mailman/HTMLFormatter.py:263
@@ -7985,25 +8008,25 @@ msgid ""
 "                      the subscribers list (see above)."
 msgstr ""
 "<p>... <b><i>���뤤��</i></b> ���̾�����餢�ʤ��ι��ܤ�����Ǥ������� (���"
-"����)."
+"����)��"
 
 #: Mailman/HTMLFormatter.py:269
 msgid ""
 " If you leave the field blank, you will be prompted for\n"
 "        your email address"
-msgstr "̤�����ξ��, ���β��̤ǥ᡼�륢�ɥ쥹�����Ϥ��ޤ�."
+msgstr "̤�����ξ�硢���β��̤ǥ᡼�륢�ɥ쥹�����Ϥ��ޤ���"
 
 #: Mailman/HTMLFormatter.py:277
 msgid ""
 "(<i>%(which)s is only available to the list\n"
 "                members.</i>)"
-msgstr "(<i>%(which)s �ϥ᡼��󥰥ꥹ�Ȳ�����������ѤǤ��ޤ�.</i>)"
+msgstr "(<i>%(which)s �ϥ᡼��󥰥ꥹ�Ȳ�����������ѤǤ��ޤ���</i>)"
 
 #: Mailman/HTMLFormatter.py:281
 msgid ""
 "(<i>%(which)s is only available to the list\n"
 "            administrator.</i>)"
-msgstr "(<i>%(which)s �ϥꥹ�ȴ����Ԥ��������뤳�Ȥ��Ǥ��ޤ�.</i>"
+msgstr "(<i>%(which)s �ϥꥹ�ȴ����Ԥ��������뤳�Ȥ��Ǥ��ޤ���</i>"
 
 #: Mailman/HTMLFormatter.py:291
 msgid "Click here for the list of "
@@ -8051,9 +8074,9 @@ msgstr "
 
 #: Mailman/HTMLFormatter.py:357
 msgid "Once a month, your password will be emailed to you as a reminder."
-msgstr "����᡼��ǥѥ���ɤ���˺���Τ�����ޤ�."
+msgstr "���1��᡼��ǥѥ���ɤ���˺���Τ�����ޤ���"
 
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 msgid "The current archive"
 msgstr "���ߤ���¸���"
 
@@ -8078,8 +8101,8 @@ 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"
 msgstr ""
-"%(realname)s �᡼��󥰥ꥹ�Ȥ���Ƥ��줿�۵ޥ᡼���, ������\n"
-"ǧ�ڤ˼��Ԥ��ޤ���. ź�դΥ᡼���, Mailman��������ä����Υ᡼��Ǥ�. \n"
+"%(realname)s �᡼��󥰥ꥹ�Ȥ���Ƥ��줿�۵ޥ᡼��ϡ�������\n"
+"ǧ�ڤ˼��Ԥ��ޤ�����ź�դΥ᡼���, Mailman��������ä����Υ᡼��Ǥ���\n"
 
 #: Mailman/Handlers/CookHeaders.py:180
 msgid "%(realname)s via %(lrn)s"
@@ -8091,7 +8114,7 @@ msgstr "
 
 #: Mailman/Handlers/Emergency.py:30 Mailman/Handlers/Hold.py:58
 msgid "Your message was deemed inappropriate by the moderator."
-msgstr "���ʤ�����ƥ᡼���, ��Ŭ�ڤȻפ��ޤ�."
+msgstr "���ʤ�����ƥ᡼���, ��Ŭ�ڤȻפ��ޤ���"
 
 #: Mailman/Handlers/Hold.py:53
 msgid "Sender is explicitly forbidden"
@@ -8099,7 +8122,7 @@ msgstr "
 
 #: Mailman/Handlers/Hold.py:54
 msgid "You are forbidden from posting messages to this list."
-msgstr "���ʤ��Ϥ��Υꥹ�Ȥؤ���Ƥ�ػߤ���Ƥ��ޤ�."
+msgstr "���ʤ��Ϥ��Υꥹ�Ȥؤ���Ƥ�ػߤ���Ƥ��ޤ���"
 
 #: Mailman/Handlers/Hold.py:57
 msgid "Post to moderated list"
@@ -8120,8 +8143,8 @@ msgstr "
 #: Mailman/Handlers/Hold.py:66
 msgid "This list is restricted; your message was not approved."
 msgstr ""
-"���Υ᡼��󥰥ꥹ�Ȥ���Ƥ����¤���Ƥ��ޤ�.\n"
-"��Ƥ��줿�᡼�����������ǧ����ޤ���Ǥ���."
+"���Υ᡼��󥰥ꥹ�Ȥ���Ƥ����¤���Ƥ��ޤ���\n"
+"��Ƥ��줿�᡼�����������ǧ����ޤ���Ǥ�����"
 
 #: Mailman/Handlers/Hold.py:69
 msgid "Too many recipients to the message"
@@ -8129,7 +8152,7 @@ msgstr "
 
 #: Mailman/Handlers/Hold.py:70
 msgid "Please trim the recipient list; it is too long."
-msgstr "���襢�ɥ쥹����Ĺ�����ޤ�. û�����Ƥ�������."
+msgstr "���襢�ɥ쥹����Ĺ�����ޤ���û�����Ƥ���������"
 
 #: Mailman/Handlers/Hold.py:73
 msgid "Message has implicit destination"
@@ -8141,9 +8164,9 @@ msgid ""
 "not allowed.  Try reposting your message by explicitly including the list\n"
 "address in the To: or Cc: fields."
 msgstr ""
-"Bcc:(����Ʊ��)�䰸����������ʤ��᡼��������ϼ����դ��Ƥ��ޤ���.\n"
+"Bcc:(����Ʊ��)�䰸����������ʤ��᡼��������ϼ����դ��Ƥ��ޤ���\n"
 "To:(����)����Cc:(Ʊ��)�ˤ��Υ᡼��󥰥ꥹ�ȤΥ��ɥ쥹����������\n"
-"����Ƥ��Ƥ�������."
+"����Ƥ��Ƥ���������"
 
 #: Mailman/Handlers/Hold.py:79
 msgid "Message may contain administrivia"
@@ -8157,32 +8180,32 @@ msgid ""
 "word `help' in it to the request address, %(request)s, for further\n"
 "instructions."
 msgstr ""
-"���������᡼���᡼��󥰥ꥹ�Ȱ�������ʤ��Ǥ�������.\n"
-"����� %(listurl)s �Υڡ����Ǽ�³���򤹤뤫,\n"
+"���������᡼���᡼��󥰥ꥹ�Ȱ�������ʤ��Ǥ���������\n"
+"����� %(listurl)s �Υڡ����Ǽ�³���򤹤뤫��\n"
 "�������ɥ쥹 %(request)s ���� `help' �Ƚ񤤤�\n"
-"�᡼������äƥ��ޥ�ɤλȤ�������󤻤Ƥ�������."
+"�᡼������äƥ��ޥ�ɤλȤ�������󤻤Ƥ���������"
 
 #: Mailman/Handlers/Hold.py:90
 msgid "Message has a suspicious header"
-msgstr "�᡼����Կ��ʥإå�������ޤ�."
+msgstr "�᡼����Կ��ʥإå�������ޤ���"
 
 #: Mailman/Handlers/Hold.py:91
 msgid "Your message had a suspicious header."
-msgstr "��Ƥ��줿�᡼����Կ��ʥإå�������ޤ�."
+msgstr "��Ƥ��줿�᡼����Կ��ʥإå�������ޤ���"
 
 #: Mailman/Handlers/Hold.py:101
 msgid ""
 "Message body is too big: %(size)d bytes with a limit of\n"
 "%(limit)d KB"
 msgstr ""
-"�᡼�����ʸ��Ĺ�����ޤ�: %(size)d �Х��Ȥ���ޤ���,\n"
+"�᡼�����ʸ��Ĺ�����ޤ�: %(size)d �Х��Ȥ���ޤ�����\n"
 "���¤� %(limit)d KB �Ǥ�"
 
 #: Mailman/Handlers/Hold.py:106
 msgid ""
 "Your message was too big; please trim it to less than\n"
 "%(kb)d KB in size."
-msgstr "�᡼�뤬Ĺ�����ޤ�; %(kb)d KB �ʲ���û�����Ƥ�������."
+msgstr "�᡼�뤬Ĺ�����ޤ�; %(kb)d KB �ʲ���û�����Ƥ���������"
 
 #: Mailman/Handlers/Hold.py:110
 msgid "Posting to a moderated newsgroup"
@@ -8190,7 +8213,7 @@ msgstr "
 
 #: Mailman/Handlers/Hold.py:252
 msgid "Your message to %(listname)s awaits moderator approval"
-msgstr "%(listname)s ����Ƥ��줿�᡼���, �ʲ�Ԥξ�ǧ�Ԥ��Ǥ�"
+msgstr "%(listname)s ����Ƥ��줿�᡼��ϡ��ʲ�Ԥξ�ǧ�Ԥ��Ǥ�"
 
 #: Mailman/Handlers/Hold.py:271
 msgid "%(listname)s post from %(sender)s requires approval"
@@ -8206,11 +8229,11 @@ msgid ""
 "message will be approved for posting to the list.  The Approved: header can\n"
 "also appear in the first line of the body of the reply."
 msgstr ""
-"��α����Ƥ���᡼����˴�����ˤ�, Subject: (��̾) �إå��˼��ä�\n"
-"�����ֿ����Ƥ�������. ���ǥ᡼��ʤ�, �˴����Ƥ�������. �ꥹ�Ȥؤ�����\n"
-"��ǧ�������, Approved:�إå��ˤ��Υ᡼��󥰥ꥹ�ȤΥѥ����\n"
-"���դ����ֿ����Ƥ�������. Approved: �إå����ֿ��᡼����ʸ����Ƭ��\n"
-"������뤳�Ȥ�Ǥ��ޤ�."
+"��α����Ƥ���᡼����˴�����ˤϡ�Subject: (��̾) �إå��˼��ä�\n"
+"�����ֿ����Ƥ������������ǥ᡼��ʤ顢�˴����Ƥ����������ꥹ�Ȥؤ�����\n"
+"��ǧ������ϡ�Approved:�إå��ˤ��Υ᡼��󥰥ꥹ�ȤΥѥ����\n"
+"���դ����ֿ����Ƥ���������Approved: �إå����ֿ��᡼����ʸ����Ƭ��\n"
+"������뤳�Ȥ�Ǥ��ޤ���"
 
 #: Mailman/Handlers/MimeDel.py:59
 msgid "The message's content type was explicitly disallowed"
@@ -8230,7 +8253,7 @@ msgstr "
 
 #: Mailman/Handlers/MimeDel.py:87
 msgid "After content filtering, the message was empty"
-msgstr "ź�եե�������������, �᡼�뤬���ˤʤ�ޤ���"
+msgstr "ź�եե������������̡��᡼�뤬���ˤʤ�ޤ���"
 
 #: Mailman/Handlers/MimeDel.py:269
 msgid ""
@@ -8241,9 +8264,9 @@ msgid ""
 "are receiving the only remaining copy of the discarded message.\n"
 "\n"
 msgstr ""
-"%(listname)s �᡼��󥰥ꥹ�Ȥ�ź�եե�������§�ˤ��, \n"
-"ź�ե�å��������˴�����ޤ���.\n"
-"�˴�����ʤ��ä���ʬ�������ۿ����ޤ�.\n"
+"%(listname)s �᡼��󥰥ꥹ�Ȥ�ź�եե�������§�ˤ�ꡢ\n"
+"ź�ե�å��������˴�����ޤ�����\n"
+"�˴�����ʤ��ä���ʬ�������ۿ����ޤ���\n"
 
 #: Mailman/Handlers/MimeDel.py:275
 msgid "Content filtered message notification"
@@ -8270,7 +8293,7 @@ msgstr "
 
 #: Mailman/Handlers/Moderate.py:165
 msgid "The attached message has been automatically discarded."
-msgstr "ź�ե�å������ϼ�ưŪ���˴�����ޤ���."
+msgstr "ź�ե�å������ϼ�ưŪ���˴�����ޤ�����"
 
 #: Mailman/Handlers/Replybot.py:75
 msgid "Auto-response for your message to the \"%(realname)s\" mailing list"
@@ -8415,7 +8438,7 @@ msgstr "
 msgid "Posting of your message titled \"%(subject)s\""
 msgstr "��̾ %(subject)s ����Ƥ��줿�᡼��"
 
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "[��ͳ�ϼ�����Ƥ��ޤ���]"
 
@@ -8427,27 +8450,27 @@ msgstr "
 msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr "%(realname)s �ꥹ�Ȥ� %(addr)s ���鿷�����񿽤�����"
 
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "������"
 
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 msgid "via admin approval"
 msgstr "�����Ԥξ�ǧ�ˤ��"
 
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr "%(realname)s �ꥹ�Ȥ� %(addr)s ���鿷����񿽤�����"
 
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr "�����"
 
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr "���Υ᡼��"
 
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr "%(realname)s �᡼��󥰥ꥹ�Ȥؤο����ϵѲ�����ޤ���"
 
@@ -8460,10 +8483,10 @@ msgid ""
 "\n"
 "Here are the entries for the /etc/aliases file:\n"
 msgstr ""
-"�᡼��󥰥ꥹ�� `%(listname)s' ��, Web ���󥿥ե�������Ȥä�\n"
-"��������ޤ���. ���Υ᡼��󥰥ꥹ�Ȥκ�����λ������ˤ�, \n"
-"/etc/aliases (�ޤ���Ʊ��)�򹹿�����ɬ�פ�����ޤ�. �ޤ�, `newaliases'\n"
-"�ץ������μ¹Ԥ�ɬ�פǤ��礦. \n"
+"�᡼��󥰥ꥹ�� `%(listname)s' ����Web ���󥿥ե�������Ȥä�\n"
+"��������ޤ��������Υ᡼��󥰥ꥹ�Ȥκ�����λ������ˤϡ�\n"
+"/etc/aliases (�ޤ���Ʊ��)�򹹿�����ɬ�פ�����ޤ����ޤ���`newaliases'\n"
+"�ץ������μ¹Ԥ�ɬ�פǤ��礦��\n"
 "\n"
 "�ʲ���, /etc/aliases �������٤����ܤǤ�:\n"
 
@@ -8474,8 +8497,8 @@ msgid ""
 "`newaliases' program:\n"
 msgstr ""
 "�᡼��󥰥ꥹ�Ȥκ�����λ����ˤ�, /etc/aliases (�ޤ���Ʊ����\n"
-"�ե�����) ��, �ʲ��ιԤ��ɲä��Ƥ�������. \n"
-"�ޤ�, `newaliases' ���ޥ�ɤμ¹Ԥ�ɬ�פǤ��礦. \n"
+"�ե�����) �ˡ��ʲ��ιԤ��ɲä��Ƥ���������\n"
+"�ޤ���`newaliases' ���ޥ�ɤμ¹Ԥ�ɬ�פǤ��礦��\n"
 
 #: Mailman/MTA/Manual.py:82
 msgid "## %(listname)s mailing list"
@@ -8496,9 +8519,9 @@ msgid ""
 "Here are the entries in the /etc/aliases file that should be removed:\n"
 msgstr ""
 "Web ���󥿥ե������ǥ᡼��󥰥ꥹ�� `%(listname)s' ��\n"
-"�������ޤ���. �ǽ�Ū�˺�����뤿���, \n"
-"/etc/aliases (�ޤ���Ʊ���Υե�����)�򹹿�����ɬ�פ�����ޤ�.\n"
-"�ޤ�, `newaliases'�ץ������μ¹Ԥ�ɬ�פǤ��礦. \n"
+"�������ޤ������ǽ�Ū�˺�����뤿��ˡ�\n"
+"/etc/aliases (�ޤ���Ʊ���Υե�����)�򹹿�����ɬ�פ�����ޤ���\n"
+"�ޤ�, `newaliases'�ץ������μ¹Ԥ�ɬ�פǤ��礦��\n"
 "\n"
 "�ʲ���, /etc/aliases ����������ԤǤ�:\n"
 
@@ -8512,9 +8535,9 @@ msgid ""
 "## %(listname)s mailing list"
 msgstr ""
 "\n"
-"�᡼��󥰥ꥹ�Ⱥ����λ����ˤ�, /etc/aliases (�ޤ���Ʊ����\n"
-"�ե�����) ����, ���ιԤ�������ɬ�פ�����ޤ�.\n"
-"�ޤ�, ¿ʬ, `newaliases' �ץ�������¹Ԥ��ʤ���Фʤ�ʤ��Ǥ��礦. \n"
+"�᡼��󥰥ꥹ�Ⱥ����λ����ˤϡ�/etc/aliases (�ޤ���Ʊ����\n"
+"�ե�����) ���顢���ιԤ�������ɬ�פ�����ޤ���\n"
+"�ޤ��������餯�ϡ�`newaliases' �ץ�������¹Ԥ��ʤ���Фʤ�ʤ��Ǥ��礦��\n"
 "\n"
 "## %(listname)s mailing list"
 
@@ -8547,7 +8570,7 @@ msgstr "%(dbfile)s 
 
 #: Mailman/MTA/Postfix.py:456
 msgid "%(dbfile)s owned by %(owner)s (must be owned by %(user)s"
-msgstr "%(dbfile)s �ν�ͭ�Ԥ� %(owner)s �Ǥ�. (%(user)s �Ǥʤ���Ф����ޤ���)"
+msgstr "%(dbfile)s �ν�ͭ�Ԥ� %(owner)s �Ǥ���(%(user)s �Ǥʤ���Ф����ޤ���)"
 
 #: Mailman/MTA/Postfix.py:469
 msgid "%(dbfile)s permissions must be 0664 (got %(octmode)s)"
@@ -8557,57 +8580,57 @@ msgstr ""
 
 #: Mailman/MailList.py:219
 msgid "Your confirmation is required to join the %(listname)s mailing list"
-msgstr "%(listname)s �᡼��󥰥ꥹ�Ȥ����񤹤�ˤ�, ���ʤ��γ�ǧ��ɬ�פǤ�"
+msgstr "%(listname)s �᡼��󥰥ꥹ�Ȥ����񤹤�ˤϡ����ʤ��γ�ǧ��ɬ�פǤ�"
 
 #: Mailman/MailList.py:230
 msgid "Your confirmation is required to leave the %(listname)s mailing list"
-msgstr "%(listname)s �᡼��󥰥ꥹ�Ȥ�����񤹤�ˤ�, ���ʤ��γ�ǧ��ɬ�פǤ�"
+msgstr "%(listname)s �᡼��󥰥ꥹ�Ȥ�����񤹤�ˤϡ����ʤ��γ�ǧ��ɬ�פǤ�"
 
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr " %(remote)s ����"
 
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr "%(realname)s �ؤ�����ˤϻʲ�Ԥξ�ǧ��ɬ�פǤ�"
 
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "%(realname)s ��������"
 
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr "���ˤϻʲ�Ԥξ�ǧ��ɬ�פǤ�"
 
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr "%(realname)s �������"
 
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 msgid "%(realname)s address change notification"
 msgstr "%(realname)s ���ɥ쥹�ѹ�����"
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 msgid "via email confirmation"
 msgstr "�᡼��Ǥγ�ǧ�ˤ��"
 
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 msgid "via web confirmation"
 msgstr "Web�Ǥγ�ǧ�ˤ��"
 
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr "%(name)s �ؤ�����ˤϴ����Ԥξ�ǧ��ɬ�פǤ�"
 
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 msgid "email confirmation"
 msgstr "�᡼��Ǥγ�ǧ�ˤ��"
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 msgid "web confirmation"
 msgstr "Web�Ǥγ�ǧ�ˤ��"
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr "�����Ǹ������줿��ư����������"
 
@@ -8624,14 +8647,14 @@ msgid ""
 "%(adminurl)s\n"
 "\n"
 msgstr ""
-"ź�դΥ᡼����������顼�Ȥ��Ƽ������ޤ�����, \n"
-"���顼������ǧ���Ǥ��ʤ���, ������ɥ쥹����Ф��Ǥ��ޤ���Ǥ���.\n"
-"���Υ᡼��󥰥ꥹ�ȤǤ�, ǧ���Ǥ��ʤ��������顼��ꥹ�ȴ����Ԥ�\n"
-"ž����������ˤʤäƤ��ޤ�.\n"
+"ź�դΥ᡼����������顼�Ȥ��Ƽ������ޤ�������\n"
+"���顼������ǧ���Ǥ��ʤ�����������ɥ쥹����Ф��Ǥ��ޤ���Ǥ�����\n"
+"���Υ᡼��󥰥ꥹ�ȤǤϡ�ǧ���Ǥ��ʤ��������顼��ꥹ�ȴ����Ԥ�\n"
+"ž����������ˤʤäƤ��ޤ���\n"
 "\n"
 "�ܤ�����:\n"
 "%(adminurl)s\n"
-"������������.\n"
+"��������������\n"
 "\n"
 
 #: Mailman/Queue/BounceRunner.py:370
@@ -8647,8 +8670,8 @@ msgid ""
 "The results of your email command are provided below.\n"
 "Attached is your original message.\n"
 msgstr ""
-"�᡼�륳�ޥ�ɤη�̤ϰʲ��ΤȤ���Ǥ�.\n"
-"�ޤ�, �������줿���ޥ�ɥ᡼���ź�դ��ޤ�.\n"
+"�᡼�륳�ޥ�ɤη�̤ϰʲ��ΤȤ���Ǥ���\n"
+"�ޤ����������줿���ޥ�ɥ᡼���ź�դ��ޤ���\n"
 
 #: Mailman/Queue/CommandRunner.py:182
 msgid "- Results:"
@@ -8667,8 +8690,8 @@ msgid ""
 "No commands were found in this message.\n"
 "To obtain instructions, send a message containing just the word \"help\".\n"
 msgstr ""
-"�᡼��˥��ޥ�ɤ��ޤޤ�Ƥ��ޤ���.\n"
-"������ˡ����󤻤�ˤ�, \"help\" �Ȥ����񤤤��᡼������äƤ�������.\n"
+"�᡼��˥��ޥ�ɤ��ޤޤ�Ƥ��ޤ���\n"
+"������ˡ����󤻤�ˤ�, \"help\" �Ȥ����񤤤��᡼������äƤ���������\n"
 
 #: Mailman/Queue/CommandRunner.py:197
 msgid ""
@@ -8685,7 +8708,7 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"- ��λ.\n"
+"- ���\n"
 "\n"
 
 #: Mailman/Queue/CommandRunner.py:223
@@ -8700,15 +8723,15 @@ msgstr "
 msgid "Original message suppressed by Mailman site configuration\n"
 msgstr "���Υ᡼��� Mailman �����Ȥ�����ˤ��������ޤ���\n"
 
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr "Mailman %(version)s �ˤ������"
 
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr "Python Powered"
 
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr "Gnu's Not Unix"
 
@@ -8857,7 +8880,7 @@ msgid ""
 "You must supply at least one of -r and -d options.  At most one of the\n"
 "files can be `-'.\n"
 msgstr ""
-"���ޥ�ɥ饤��Dz������Ͽ����.\n"
+"���ޥ�ɥ饤��Dz������Ͽ���롣\n"
 "\n"
 "����ˡ:\n"
 "    add_members [���ץ����] �ꥹ��̾\n"
@@ -8866,54 +8889,54 @@ msgstr ""
 "\n"
 "    --regular-members-file=�ե�����\n"
 "    -r �ե�����\n"
-"        ��Ͽ�������Υ��ɥ쥹�����ä��ե�����. 1 �Ԥ� 1 ���ɥ쥹.\n"
-"        ���β�����̾���������ˤʤ�ޤ�. �ե������ `-' �����ꤵ����,\n"
-"        ɸ�����Ϥ���᡼�륢�ɥ쥹���ɤ߹��ߤޤ�.\n"
+"        ��Ͽ�������Υ��ɥ쥹�����ä��ե����롣 1 �Ԥ� 1 ���ɥ쥹��\n"
+"        ���β�����̾���������ˤʤ�ޤ����ե������ `-' �����ꤵ���ȡ�\n"
+"        ɸ�����Ϥ���᡼�륢�ɥ쥹���ɤ߹��ߤޤ���\n"
 "\n"
 "    --digest-members-file=�ե�����\n"
 "    -d=�ե�����\n"
-"        ���Ʊ��. ������, ���β���ϤޤȤ��ɤ߲���ˤʤ�ޤ�.\n"
+"        ���Ʊ�͡������������β���ϤޤȤ��ɤ߲���ˤʤ�ޤ���\n"
 "\n"
 "    --invite\n"
 "    -i\n"
-"        �������Ͽ����ΤǤϤʤ�, ���ԤΤ߹Ԥ��������ˤ��Υ��ץ�����\n"
-"        ���ꤷ�ޤ�.\n"
+"        �������Ͽ����ΤǤϤʤ������ԤΤ߹Ԥ��������ˤ��Υ��ץ�����\n"
+"        ���ꤷ�ޤ���\n"
 "\n"
 "    --invite-msg-file=file\n"
 "    -m file\n"
 "        --invite ����ꤷ���ݤ��������뾷�ԥ᡼�����Ƭ�ˤ��Υ��ץ�����\n"
-"        ���ꤷ���ե��������ƤΥ�å��������������ޤ���\n"
+"        ���ꤷ���ե��������ƤΥ�å��������������ޤ���\n"
 "\n"
 "    --welcome-msg=<y|n>\n"
 "    -w <y|n>\n"
-"        �ꥹ�Ȳ����, ���ޥ᡼���Ф����ɤ���. ����ϥꥹ�������\n"
-"        `send_welcome_msg' ����ͥ�褷�ޤ�. \n"
-"        ���Υ��ץ����� --invite ����ꤷ�����ˤ�̵���ˤʤ�, �������\n"
-"        �����ǤΥꥹ�Ȥ�����˽����ޤ�.\n"
+"        �ꥹ�Ȳ���ˡ����ޥ᡼���Ф����ɤ���������ϥꥹ�������\n"
+"        `send_welcome_msg' ����ͥ�褷�ޤ���\n"
+"        ���Υ��ץ����� --invite ����ꤷ�����ˤ�̵���ˤʤꡢ�������\n"
+"        �����ǤΥꥹ�Ȥ�����˽����ޤ���\n"
 "\n"
 "    --admin-notify=<y|n>\n"
 "    -a <y|n>\n"
-"        �ꥹ�ȴ����Ԥ���Ͽ������/���Ԥ����Τ��뤫�ɤ���. ����ϥꥹ�������\n"
-"        `admin_notify_mchanges' ����ͥ�褷�ޤ�. \n"
-"        ���Υ��ץ����� --invite ����ꤷ�����ˤ�̵���ˤʤ�, �������\n"
-"        �����ǤΥꥹ�Ȥ�����˽����ޤ�.\n"
+"        �ꥹ�ȴ����Ԥ���Ͽ������/���Ԥ����Τ��뤫�ɤ���������ϥꥹ�������\n"
+"        `admin_notify_mchanges' ����ͥ�褷�ޤ���\n"
+"        ���Υ��ץ����� --invite ����ꤷ�����ˤ�̵���ˤʤꡢ�������\n"
+"        �����ǤΥꥹ�Ȥ�����˽����ޤ���\n"
 "\n"
 "    --nomail\n"
 "    -n\n"
-"        ��Ͽ��������Υ᡼���������ץ�����̵�������ꤷ�ޤ�.\n"
-"        ���Υ��ץ����� --invite ����ꤷ�����ˤ�̵���ˤʤ�, �������\n"
-"        �����ǤΥꥹ�Ȥ�����˽����ޤ�.\n"
+"        ��Ͽ��������Υ᡼���������ץ�����̵�������ꤷ�ޤ���\n"
+"        ���Υ��ץ����� --invite ����ꤷ�����ˤ�̵���ˤʤꡢ�������\n"
+"        �����ǤΥꥹ�Ȥ�����˽����ޤ���\n"
 "\n"
 "    --help\n"
 "    -h\n"
-"        ���Υإ�ץ�å���������Ϥ��ƽ�λ���ޤ�.\n"
+"        ���Υإ�ץ�å���������Ϥ��ƽ�λ���ޤ���\n"
 "\n"
 "    listname\n"
-"        �����Ͽ���褦�Ȥ��� Mailman�ꥹ��̾. ���˺�������Ƥ��ʤ����\n"
-"        �ʤ�ޤ���.\n"
+"        �����Ͽ���褦�Ȥ��� Mailman�ꥹ��̾�����˺�������Ƥ��ʤ����\n"
+"        �ʤ�ޤ���\n"
 "\n"
-"���ʤ��Ȥ� -r �� -d �Τɤ��餫1�Ĥλ��꤬ɬ�פǤ�.\n"
-"ξ�����ꤹ����, `-' ���Ȥ���ΤϤɤ��餫1�ĤǤ�.\n"
+"���ʤ��Ȥ� -r �� -d �Τɤ��餫1�Ĥλ��꤬ɬ�פǤ���\n"
+"ξ�����ꤹ���硢`-' ���Ȥ���ΤϤɤ��餫1�ĤǤ���\n"
 
 #: bin/add_members:162 bin/add_members:172
 msgid "Already a member: %(member)s"
@@ -8949,11 +8972,11 @@ msgstr "-a/--admin-notify 
 
 #: bin/add_members:252
 msgid "Cannot read both digest and normal members from standard input."
-msgstr "�ޤȤ��ɤߤ����̤�ξ���β����ɸ�����Ϥ����ɤ߹��ळ�ȤϤǤ��ޤ���."
+msgstr "�ޤȤ��ɤߤ����̤�ξ���β����ɸ�����Ϥ����ɤ߹��ळ�ȤϤǤ��ޤ���"
 
 #: bin/add_members:256
 msgid "Setting invite-msg-file requires --invite."
-msgstr "invite-msg-file�λ���ˤ� --invite ���ץ������꤬ɬ�פǤ�."
+msgstr "invite-msg-file�λ���ˤ� --invite ���ץ������꤬ɬ�פǤ���"
 
 #: bin/add_members:261 bin/config_list:110 bin/export.py:271 bin/find_member:97
 #: bin/inject:91 bin/list_admins:90 bin/list_members:252 bin/sync_members:222
@@ -8965,7 +8988,7 @@ msgstr "%(listname)s 
 #: bin/sync_members:244 bin/update:302 bin/update:323 bin/update:577
 #: cron/bumpdigests:78
 msgid "Nothing to do."
-msgstr "�ʤˤ⤹�뤳�ȤϤ���ޤ���."
+msgstr "�ʤˤ⤹�뤳�ȤϤ���ޤ���"
 
 #: bin/arch:19
 msgid ""
@@ -9017,45 +9040,45 @@ msgid ""
 msgstr ""
 "�ꥹ�Ȥ���¸��ˤ�ƹ��ۤ���.\n"
 "\n"
-"���Υ��ޥ�ɤǥ᡼��󥰥ꥹ�Ȥ���¸��ˤ�ƹ��ۤ��ޤ�. ��¸������\n"
-"�᡼����Խ��������������Ȥ���, ���Υ��ޥ�ɤ�¹Ԥ���Ȥ褤�Ǥ��礦.\n"
+"���Υ��ޥ�ɤǥ᡼��󥰥ꥹ�Ȥ���¸��ˤ�ƹ��ۤ��ޤ�����¸������\n"
+"�᡼����Խ��������������Ȥ��ˡ����Υ��ޥ�ɤ�¹Ԥ���Ȥ褤�Ǥ��礦��\n"
 "\n"
 "����ˡ: %(PROGRAM)s [���ץ����] <�ꥹ��̾> [<mbox �ե�����>]\n"
 "\n"
 "�����ǥ��ץ�����:\n"
 "    -h / --help\n"
-"        ���Υإ�ץ�å���������Ϥ��ƽ�λ����.\n"
+"        ���Υإ�ץ�å���������Ϥ��ƽ�λ���롣\n"
 "\n"
 "    -q / -quiet\n"
-"        ��¸��˺������Υ�å���������������.\n"
+"        ��¸��˺������Υ�å��������������롣\n"
 "\n"
 "    --wipe\n"
-"        �ƹ������˸�����¸��ˤ�ä����. ��¸��ˤ�ʬ�䤷�ƺƹ��ۤ���\n"
-"        ���ʳ��Ǥ�, ���Υ��ץ�������ꤷ���ۤ����褤�Ǥ��礦.\n"
+"        �ƹ������˸�����¸��ˤ�ä���롣��¸��ˤ�ʬ�䤷�ƺƹ��ۤ���\n"
+"        ���ʳ��Ǥϡ����Υ��ץ�������ꤷ���ۤ����褤�Ǥ��礦��\n"
 "\n"
 "    -s N\n"
 "    --start=N\n"
-"        N���ܤε�������������������. ������, 0���ܤ� mbox �κǽ�ε���\n"
-"        �Ǥ���, ������ά����� 0 �ˤʤ�ޤ�.\n"
+"        N���ܤε������������������롣��������0���ܤ� mbox �κǽ�ε���\n"
+"        �Ǥ��ꡢ������ά����� 0 �ˤʤ�ޤ���\n"
 "\n"
 "    -e M\n"
 "    --end=M\n"
-"        M���ܤε����Ǻ��������򽪤�. ���Υ�����ץȤϥ��������\n"
-"        ��Ψ�������Τ�, �礭����¸��ˤ�������褦�Ȥ����, mbox �ե�����\n"
-"        ���Τ�����٤˺����Ϻ��ʤ����⤷��ޤ���. ������ͳ��\n"
-"        �ǽ�ȺǸ�ε����ֹ�����Ǥ���褦�ˤʤäƤ��ޤ�.\n"
+"        M���ܤε����Ǻ��������򽪤�롣���Υ�����ץȤϥ��������\n"
+"        ��Ψ�������Τǡ��礭����¸��ˤ�������褦�Ȥ���ȡ�mbox �ե�����\n"
+"        ���Τ�����٤˺����Ϻ��ʤ����⤷��ޤ��󡣤�����ͳ��\n"
+"        �ǽ�ȺǸ�ε����ֹ�����Ǥ���褦�ˤʤäƤ��ޤ���\n"
 "\n"
-"������, <mbox �ե�����̾> �� mbox �����ˤʤä��ꥹ�Ȥβ����ؤΥѥ���,\n"
-"�����, �����Ƥ� archives/private �ǥ��쥯�ȥ�β��ˤ���ޤ�. ���Ȥ���: \n"
+"��������<mbox �ե�����̾> �� mbox �����ˤʤä��ꥹ�Ȥβ����ؤΥѥ��ǡ�\n"
+"����ϡ������Ƥ� archives/private �ǥ��쥯�ȥ�β��ˤ���ޤ������Ȥ���: \n"
 "\n"
 "%% bin/arch mylist archives/private/mylist.mbox/mylist.mbox\n"
 "\n"
-"<mbox �ե�����̾> �ϥ��ץ�����, �⤷̵�����, �嵭����Τ褦��ɸ���\n"
-"mbox �ե�����ؤΥѥ����Ȥ��ޤ�.\n"
+"<mbox �ե�����̾> �ϥ��ץ����ǡ��⤷̵����С��嵭����Τ褦��ɸ���\n"
+"mbox �ե�����ؤΥѥ����Ȥ��ޤ���\n"
 
 #: bin/arch:125
 msgid "listname is required"
-msgstr "�ꥹ��̾��ɬ�פǤ�."
+msgstr "�ꥹ��̾��ɬ�פǤ���"
 
 #: bin/arch:143 bin/change_pw:107 bin/config_list:257
 msgid ""
@@ -9087,22 +9110,22 @@ msgid ""
 "\n"
 "You will need to run `bin/check_perms -f' after running this script.\n"
 msgstr ""
-"MM2.1b4 ��������¸��ˤ�������.\n"
+"MM2.1b4 ��������¸��ˤ������롣\n"
 "\n"
 "����ˡ: %(PROGRAM)s [���ץ����] �ե����� ...\n"
 "\n"
 "������, ���ץ�����:\n"
 "    -h / --help\n"
-"        ���Υإ�ץ�å���������Ϥ��ƽ�λ����.\n"
+"        ���Υإ�ץ�å���������Ϥ��ƽ�λ���롣\n"
 "\n"
 "Mailman 2.1b4 �Ǻ�������;�פʥǡ������񤭹��ޤ줿��¸��ˤ�������\n"
-"����ˤ����Ȥ��ޤ�. $PREFIX �ǥ��쥯�ȥ꤫��, ���Τ褦�˻ȤäƤ�������.\n"
+"����ˤ����Ȥ��ޤ���$PREFIX �ǥ��쥯�ȥ꤫�顢���Τ褦�˻ȤäƤ���������\n"
 "\n"
 "%% %(PROGRAM)s `grep -l _mlist archives/private/*/database/*-article`\n"
 "\n"
 "(�Хå��������Ȥ�ɬ�פǤ��뤳�Ȥ����դ��Ƥ�������)\n"
 "\n"
-"���Υ�����ץȤ�¹Ԥ������, bin/check_perms -f ��¹Ԥ���ɬ�פ�����ޤ�.\n"
+"���Υ�����ץȤ�¹Ԥ�����ǡ�bin/check_perms -f ��¹Ԥ���ɬ�פ�����ޤ���\n"
 
 #: bin/change_pw:20
 msgid ""
@@ -9159,51 +9182,51 @@ msgid ""
 "    --help / -h\n"
 "        Print this help message and exit.\n"
 msgstr ""
-"�ꥹ�ȤΥѥ���ɤ��ѹ�����.\n"
+"�ꥹ�ȤΥѥ���ɤ��ѹ����롣\n"
 "\n"
-"Mailman 2.1 �ˤʤ�ޤ�, �ꥹ�ȤΥѥ���ɤϰŹ沽����Ƥ��ޤ���(���̤�).\n"
-"Python �μ����ˤ�äƤ� crypt �⥸�塼�뤬̵����, MD5 �ǰŹ沽���Ƥ���\n"
-"����. �Ȥ�����, Python ��С�����󥢥åפ���� crypt �⥸�塼�뤬����\n"
-"���ȡ��뤵���褦�ˤʤ�, ���Τ��������ѥ���ɤ�����Ƥ��ޤ����Ȥ���\n"
-"��ޤ�.\n"
+"Mailman 2.1 �ˤʤ�ޤǡ��ꥹ�ȤΥѥ���ɤϰŹ沽����Ƥ��ޤ���(���̤�)��\n"
+"Python �μ����ˤ�äƤ� crypt �⥸�塼�뤬̵���ơ�MD5 �ǰŹ沽���Ƥ���\n"
+"�������Ȥ�����, Python ��С�����󥢥åפ���� crypt �⥸�塼�뤬����\n"
+"���ȡ��뤵���褦�ˤʤꡢ���Τ��������ѥ���ɤ�����Ƥ��ޤ����Ȥ���\n"
+"��ޤ���\n"
 "\n"
-"Mailman 2.1 �Ǥ�, ���٤ƤΥ����ȥѥ���ɤ� SHA1 16�ʿ��η�������¸����\n"
-"��褦�ˤʤ�ޤ���. ���Τ���, Mailman 2.1 �����Τ��٤ƤΥѥ���ɤϲ���\n"
-"�Ƥ��ޤ�, �����Υѥ���ɤ�ʿʸ�ǤϤɤ��ˤ���¸����Ƥ��ʤ�����, ��\n"
-"���᤹���Ȥ��Ǥ��ޤ���.\n"
+"Mailman 2.1 �Ǥϡ����٤ƤΥ����ȥѥ���ɤ� SHA1 16�ʿ��η�������¸����\n"
+"��褦�ˤʤ�ޤ��������Τ��ᡢMailman 2.1 �����Τ��٤ƤΥѥ���ɤϲ���\n"
+"�Ƥ��ޤ��������Υѥ���ɤ�ʿʸ�ǤϤɤ��ˤ���¸����Ƥ��ʤ����ᡢ��\n"
+"���᤹���Ȥ��Ǥ��ޤ���\n"
 "\n"
-"���Τ���, ���Υ�����ץȤϿ������ꥹ�ȥѥ���ɤ�������, ���ץ�����\n"
-"���٤ƤΥꥹ�ȴ����Ԥ��������뤳�Ȥ��Ǥ��ޤ�.\n"
+"���Τ��ᡢ���Υ�����ץȤϿ������ꥹ�ȥѥ���ɤ������������ץ�����\n"
+"���٤ƤΥꥹ�ȴ����Ԥ��������뤳�Ȥ��Ǥ��ޤ���\n"
 "\n"
 "����ˡ: change_pw [���ץ����]\n"
 "\n"
 "���ץ����:\n"
 "\n"
 "    --all / -a\n"
-"        �����Υꥹ�ȤˤĤ��ƥѥ���ɤ��ѹ�����.\n"
+"        �����Υꥹ�ȤˤĤ��ƥѥ���ɤ��ѹ����롣\n"
 "\n"
 "    --domain=�ɥᥤ��̾\n"
 "    -d �ɥᥤ��̾\n"
 "        �֥ɥᥤ��̾�פβ��ۥɥᥤ��Υꥹ�������ˤĤ��ƥѥ���ɤ���\n"
-"        ������. ʣ���� -d ���ץ������դ��뤳�Ȥ��ǽ.\n"
+"        �����롣ʣ���� -d ���ץ������դ��뤳�Ȥ��ǽ��\n"
 "\n"
 "    --listname=�ꥹ��̾\n"
 "    -l �ꥹ��̾\n"
-"        ����Υꥹ�ȤˤĤ��Ƥ����ѥ���ɤ��ѹ�����. ʣ���� -l ���ץ���\n"
-"        ����դ��뤳�Ȥ��ǽ.\n"
+"        ����Υꥹ�ȤˤĤ��Ƥ����ѥ���ɤ��ѹ����롣ʣ���� -l ���ץ���\n"
+"        ����դ��뤳�Ȥ��ǽ��\n"
 "\n"
 "    --password=���ѥ����\n"
 "    -p ���ѥ����\n"
 "        ����ʿʸ�ǽ񤤤��ֿ��ѥ���ɡפ��ѹ�����ꥹ�Ȥο������ѥ��\n"
-"        �ɤˤ���. (-a, -d, -l �Υ��ץ����ǻ��ꤵ��Ƥ���) �⤷̵����\n"
-"        ��ˤ�, �������ѥ���ɤ�����������������.\n"
+"        �ɤˤ��롣(-a, -d, -l �Υ��ץ����ǻ��ꤵ��Ƥ���) �⤷̵����\n"
+"        ��ˤϡ��������ѥ���ɤ����������������롣\n"
 "\n"
 "    --quiet / -q\n"
-"        �ꥹ�ȴ����Ԥ˿������ѥ���ɤ����Τ��ʤ�. �ѥ���ɤ�������\n"
-"        �ʤä����ȤˤĤ��Ƥ�, �̤���ˡ�������ʤ���Фʤ�ޤ���.\n"
+"        �ꥹ�ȴ����Ԥ˿������ѥ���ɤ����Τ��ʤ����ѥ���ɤ�������\n"
+"        �ʤä����ȤˤĤ��Ƥϡ��̤���ˡ�������ʤ���Фʤ�ޤ���\n"
 "\n"
 "    --help / h\n"
-"        ���Υإ�ץ�å���������Ϥ��ƽ�λ����.\n"
+"        ���Υإ�ץ�å���������Ϥ��ƽ�λ���롣\n"
 
 #: bin/change_pw:145
 msgid "Bad arguments: %(strargs)s"
@@ -9236,14 +9259,14 @@ msgid ""
 "\n"
 "    %(adminurl)s\n"
 msgstr ""
-"%(hostname)s �Υ����ȴ����Ԥ�, ���ʤ��Υ᡼��󥰥ꥹ�� %(listname)s\n"
-"�δ����ѥ���ɤ��ѹ����ޤ���. ���ߤϰʲ��Τ褦�ˤʤäƤ��ޤ�.\n"
+"%(hostname)s �Υ����ȴ����Ԥ������ʤ��Υ᡼��󥰥ꥹ�� %(listname)s\n"
+"�δ����ѥ���ɤ��ѹ����ޤ��������ߤϰʲ��Τ褦�ˤʤäƤ��ޤ���\n"
 "\n"
 "    %(notifypassword)s\n"
 "\n"
-"�ʸ�Υꥹ�ȴ����ˤϤ��Υѥ���ɤ���Ѥ��Ƥ�������. \n"
-"���������̤Υѥ���ɤ��ѹ��������Ȼפ������,\n"
-"�ʲ��δ����ڡ��������ѹ����Ƥ�������.\n"
+"�ʸ�Υꥹ�ȴ����ˤϤ��Υѥ���ɤ���Ѥ��Ƥ���������\n"
+"���������̤Υѥ���ɤ��ѹ��������Ȼפ�����ϡ�\n"
+"�ʲ��δ����ڡ��������ѹ����Ƥ���������\n"
 "\n"
 "    %(adminurl)s\n"
 
@@ -9282,7 +9305,7 @@ msgid ""
 "    --help / -h\n"
 "        Print this text and exit.\n"
 msgstr ""
-"�ꥹ�Ȥ�����ǡ����١���������å�����.\n"
+"�ꥹ�Ȥ�����ǡ����١���������å����롣\n"
 "\n"
 "�ʲ��Υե����������å�����:\n"
 "\n"
@@ -9292,26 +9315,26 @@ msgstr ""
 "    config.db.last\n"
 "    config.safety\n"
 "\n"
-"¸�ߤ��ʤ��ե����뤬���äƤ����ꤢ��ޤ���. config.pck �� config.pck.last\n"
-"��, 2.1a3 �ʹߤ�Ƴ�����줿pickle����������ǡ����١����Ǥ�.\n"
+"¸�ߤ��ʤ��ե����뤬���äƤ����ꤢ��ޤ��� config.pck �� config.pck.last\n"
+"�ϡ�2.1a3 �ʹߤ�Ƴ�����줿pickle����������ǡ����١����Ǥ���\n"
 "config.db �� config.db.last �Ϥ�������ΥС������ǻȤ��Ƥ������\n"
-"��, Python ��marshal�ե�����Ǥ�. config.safety ��, 2.13a�ʹߤ� config.pck\n"
-"���ɤ�ʤ��Ȥ��˺��������pickle�ե�����Ǥ�.\n"
+"�ǡ�Python ��marshal�ե�����Ǥ���config.safety �ϡ�2.13a�ʹߤ� config.pck\n"
+"���ɤ�ʤ��Ȥ��˺��������pickle�ե�����Ǥ���\n"
 "\n"
 "����ˡ: %(PROGRAM)s [���ץ����] [�ꥹ��̾ [�ꥹ��̾ ...]]\n"
 "\n"
 "���ץ����:\n"
 "\n"
 "    --all / -a\n"
-"        �����Υꥹ�ȤˤĤ��ƥ����å�����. �Ǥʤ���Хꥹ��̾�λ���\n"
+"        �����Υꥹ�ȤˤĤ��ƥ����å����롣�Ǥʤ���Хꥹ��̾�λ���\n"
 "        ���줿��ΤˤĤ��ƤΤߥ����å�����\n"
 "\n"
 "    --verbose / -v\n"
-"        ���Ͼ����¿���Ф�. �����å�����ե�����Τ��٤ƤˤĤ���, ����\n"
-"        ��������Ϥ���. �Ǥʤ����, ���줿�ե����������ɽ������.\n"
+"        ���Ͼ����¿���Ф��������å�����ե�����Τ��٤ƤˤĤ��ơ�����\n"
+"        ��������Ϥ��롣�Ǥʤ���С����줿�ե����������ɽ�����롣\n"
 "\n"
 "    --help / -h\n"
-"        ���Υإ�ץ�å�������ɽ�����ƽ�λ����.\n"
+"        ���Υإ�ץ�å�������ɽ�����ƽ�λ���롣\n"
 
 #: bin/check_db:119
 msgid "No list named:"
@@ -9335,14 +9358,14 @@ msgid ""
 "permissions or group ownership.  With -f (and run as root), fix all the\n"
 "permission problems found.  With -v be verbose.\n"
 msgstr ""
-"Mailman ���󥹥ȡ���Τ���Υѡ��ߥå���������å�����.\n"
+"Mailman ���󥹥ȡ���Τ���Υѡ��ߥå���������å����롣\n"
 "\n"
 "����ˡ: %(PROGRAM)s [-f] [-v] [-h]\n"
 "\n"
-"������̵�����ˤ�, �����å����ƥѡ��ߥå����䥰�롼�׽�ͭ����\n"
-"��äƤ���ե��������𤷤ޤ�. -f ���ץ������դ���(root���¤�\n"
-"�¹Ԥ���)������ˤ�, �����Υѡ��ߥå���������������ޤ�.\n"
-"-v ���ץ����Ǥ��¿���ξ������Ϥ��ޤ�.\n"
+"������̵�����ˤϡ������å����ƥѡ��ߥå����䥰�롼�׽�ͭ����\n"
+"��äƤ���ե��������𤷤ޤ���-f ���ץ������դ���(root���¤�\n"
+"�¹Ԥ���)������ˤϡ������Υѡ��ߥå���������������ޤ���\n"
+"-v ���ץ����Ǥ��¿���ξ������Ϥ��ޤ���\n"
 
 #: bin/check_perms:110
 msgid "    checking gid and mode for %(path)s"
@@ -9398,9 +9421,9 @@ msgid ""
 "         installation manual on how to fix this."
 msgstr ""
 "�ٹ�: ���������¸��˥ǥ��쥯�ȥ꤬ other-executable (o+x) ��\n"
-"      �ʤäƤ��ޤ�. ���ʤ��Υ����ƥ�Υ�����桼����������¸���\n"
-"      ���ɤळ�Ȥ��Ǥ��ޤ�. ���󥹥ȡ���ޥ˥奢��ˤ�, �����\n"
-"      �ɤ������齤���Ǥ��뤫�񤤤Ƥ���ޤ��Τ�, ���ͤˤ��Ƥ�������.\n"
+"      �ʤäƤ��ޤ������ʤ��Υ����ƥ�Υ�����桼����������¸���\n"
+"      ���ɤळ�Ȥ��Ǥ��ޤ������󥹥ȡ���ޥ˥奢��ˤϡ������\n"
+"      �ɤ������齤���Ǥ��뤫�񤤤Ƥ���ޤ��Τǡ����ͤˤ��Ƥ���������\n"
 
 #: bin/check_perms:240
 msgid "mbox file must be at least 0660:"
@@ -9437,7 +9460,7 @@ msgstr "%(pwfile)s 
 #: bin/check_perms:315
 msgid "%(pwfile)s permissions must be exactly 0640 (got %(octmode)s)"
 msgstr ""
-"%(pwfile)s �Υѡ��ߥå���� %(octmode)s �ˤʤäƤ��ޤ���, 0640 �Ǥʤ��Ȥ���"
+"%(pwfile)s �Υѡ��ߥå���� %(octmode)s �ˤʤäƤ��ޤ�����0640 �Ǥʤ��Ȥ���"
 "�ޤ���"
 
 #: bin/check_perms:340
@@ -9499,33 +9522,33 @@ msgid ""
 "    -h / --help\n"
 "        Print this message and exit\n"
 msgstr ""
-".mbox �β��᡼��ե�����򤭤줤�ˤ���.\n"
+".mbox �β��᡼��ե�����򤭤줤�ˤ��롣\n"
 "\n"
-"��¸��ˤκ����ˤ�, mbox �����β��᡼��ե����뤫�� Unix-From �Ԥ�\n"
-"õ���Ф��ޤ�. �ߴ����Τ���, �ä� \"From \" �ǻϤޤ�� -- �Ĥޤ�, \n"
-"��ʸ���� F �ǻϤޤä�, ��ʸ���� r, o, m �ȶ����õ��, ���ιԤλĤ�\n"
-"̵�뤷�ޤ�.\n"
+"��¸��ˤκ����ˤϡ�mbox �����β��᡼��ե����뤫�� Unix-From �Ԥ�\n"
+"õ���Ф��ޤ����ߴ����Τ���, �ä� \"From \" �ǻϤޤ�� -- �Ĥޤꡢ\n"
+"��ʸ���� F �ǻϤޤäơ���ʸ���� r, o, m �ȶ����õ�������ιԤλĤ�\n"
+"̵�뤷�ޤ���\n"
 "\n"
-"�̾�, �᡼����ʸ��� \"From \" �ǻϤޤ�Ԥ� > ��ʸ���ǥ���������\n"
-"����Ƥ���Ϥ��Ǥ�. ������, ���ˤ�äƤ���ʸ�ιԤ����������פ����\n"
-"���ʤ����⤷��ޤ���. ���Υ�����ץȤ�, Unix-From �Ԥ�̩�˸�������\n"
-"���Ȥˤ��, ����ν������ߤ��ΤǤ�. \"From \" �ǻϤޤäƤ��뤬,\n"
-"���θ�̩�ʸ������̤�ʤ��Ԥ�, > ��ʸ����Ȥäƥ��������פ��ޤ�.\n"
+"�̾�᡼����ʸ��� \"From \" �ǻϤޤ�Ԥ� > ��ʸ���ǥ���������\n"
+"����Ƥ���Ϥ��Ǥ��������������ˤ�äƤ���ʸ�ιԤ����������פ����\n"
+"���ʤ����⤷��ޤ��󡣤��Υ�����ץȤϡ�Unix-From �Ԥ�̩�˸�������\n"
+"���Ȥˤ�ꡢ����ν������ߤ��ΤǤ���\"From \" �ǻϤޤäƤ��뤬��\n"
+"���θ�̩�ʸ������̤�ʤ��Ԥϡ�> ��ʸ����Ȥäƥ��������פ��ޤ���\n"
 "\n"
 "����ˡ: cleanarch [���ץ����] < ���ϥե����� > ���ϥե�����\n"
 "���ץ����:\n"
 "    -s n\n"
 "    -status=n\n"
-"        n �Խ������뤴�Ȥ� # ��1�Ĥ��Ľ��Ϥ���.\n"
+"        n �Խ������뤴�Ȥ� # ��1�Ĥ��Ľ��Ϥ��롣\n"
 "\n"
 "    -q / --quiet\n"
-"        �ѹ����줿�Ԥξ����ɸ�२�顼�˽��Ϥ��ʤ�.\n"
+"        �ѹ����줿�Ԥξ����ɸ�२�顼�˽��Ϥ��ʤ���\n"
 "\n"
 "    -n / --dry-run\n"
-"        �ºݤˤϤʤˤ���Ϥ��ʤ�.\n"
+"        �ºݤˤϤʤˤ���Ϥ��ʤ���\n"
 "\n"
 "    -h / --help\n"
-"        ���Υإ�פ�ɽ�����ƽ�λ����.\n"
+"        ���Υإ�פ�ɽ�����ƽ�λ���롣\n"
 
 #: bin/cleanarch:83
 msgid "Unix-From line changed: %(lineno)d"
@@ -9596,16 +9619,16 @@ msgid ""
 " (`to new address') is the new address of the user.\n"
 "\n"
 msgstr ""
-"������ɥ쥹�Υ����������.\n"
+"������ɥ쥹�Υ������������\n"
 "\n"
 "������ɥ쥹�Υ�����������Ȥ�, ���β�����ɥ쥹������Ʊ�����ץ�����\n"
-"�ѥ���ɤǿ������������Ͽ���뤳�Ȥ��̣���ޤ�. �������Ȥ��Ƥ�, ����\n"
-"���ϼ¹ԼԤ��Ѥ��Ƥ��뤳�ȤǤ�. �Ĥޤ�, ���������ɥ쥹�γ�ǧ��, \n"
-"�褦�����᡼���ȯ���ʤɤ�Ԥ�ʤ��Ȥ������ȤǤ�.\n"
+"�ѥ���ɤǿ������������Ͽ���뤳�Ȥ��̣���ޤ����������Ȥ��Ƥϡ�����\n"
+"���ϼ¹ԼԤ��Ѥ��Ƥ��뤳�ȤǤ����Ĥޤꡢ���������ɥ쥹�γ�ǧ�䡢\n"
+"�褦�����᡼���ȯ���ʤɤ�Ԥ�ʤ��Ȥ������ȤǤ���\n"
 "\n"
-"��¸�������Ͽ�����ˤ��ѹ��Ϥ���ޤ���. �⤷, �Ť����ɥ쥹����������\n"
-"�ΤǤ����, -r �ե饰��ȤäƤ�������. �ޤ�, �ꥹ�ȴ������ɥ쥹���ѹ�\n"
-"�������ΤǤ����, -a �ե饰��ȤäƤ�������.\n"
+"��¸�������Ͽ�����ˤ��ѹ��Ϥ���ޤ��󡣤⤷���Ť����ɥ쥹����������\n"
+"�ΤǤ���С�-r �ե饰��ȤäƤ����������ޤ����ꥹ�ȴ������ɥ쥹���ѹ�\n"
+"�������ΤǤ���С�-a �ե饰��ȤäƤ���������\n"
 "\n"
 "����ˡ:\n"
 "    clone_member [���ץ����] �쥢�ɥ쥹 �����ɥ쥹\n"
@@ -9614,33 +9637,33 @@ msgstr ""
 "\n"
 "    --listname=�ꥹ��̾\n"
 "    -l �ꥹ��̾\n"
-"        �ꥹ��̾�Υ᡼��󥰥ꥹ�ȤˤĤ��Ƥ����ѹ�����. �⤷, -l ��\n"
-"        ̵�����, ���٤ƤΥ᡼��󥰥ꥹ�Ȥ���������. -l ���ץ�����\n"
-"        ʣ�����ꤹ�뤳�Ȥ��ǽ.\n"
+"        �ꥹ��̾�Υ᡼��󥰥ꥹ�ȤˤĤ��Ƥ����ѹ����롣�⤷��-l ��\n"
+"        ̵����С����٤ƤΥ᡼��󥰥ꥹ�Ȥ��������롣-l ���ץ�����\n"
+"        ʣ�����ꤹ�뤳�Ȥ��ǽ��\n"
 "\n"
 "    --remove\n"
 "    -r\n"
-"        �������������, �쥢�ɥ쥹��ꥹ�Ȥ���������.\n"
+"        ������������塢�쥢�ɥ쥹��ꥹ�Ȥ��������롣\n"
 "\n"
 "    --admin\n"
 "    -a\n"
-"        �ꥹ�Ȥδ����ԥ��ɥ쥹����쥢�ɥ쥹��õ��, ����⥯������\n"
-"        �����ޤ����ѹ�����.\n"
+"        �ꥹ�Ȥδ����ԥ��ɥ쥹����쥢�ɥ쥹��õ��������⥯������\n"
+"        �����ޤ����ѹ����롣\n"
 "\n"
 "    --quiet\n"
 "    -q\n"
-"        �ѹ����Ť��˹Ԥ�.\n"
+"        �ѹ����Ť��˹Ԥ���\n"
 "\n"
 "    --nomodify\n"
 "    -n\n"
-"        �ɤ����ѹ����뤫ɽ�����뤬, �ºݤˤ��ѹ����ʤ�. --quiet�ե饰\n"
-"        �Ȥ϶��ѤǤ��ʤ�.\n"
+"        �ɤ����ѹ����뤫ɽ�����뤬���ºݤˤ��ѹ����ʤ���--quiet�ե饰\n"
+"        �Ȥ϶��ѤǤ��ʤ���\n"
 "\n"
 "    --help\n"
 "    -h\n"
-"        ���Υإ�ץ�å�������ɽ�����ƽ�λ����.\n"
+"        ���Υإ�ץ�å�������ɽ�����ƽ�λ���롣\n"
 "\n"
-"�쥢�ɥ쥹�ϲ�����ѹ����Υ��ɥ쥹��, �����ɥ쥹���ѹ���Υ��ɥ쥹.\n"
+"�쥢�ɥ쥹�ϲ�����ѹ����Υ��ɥ쥹�ǡ������ɥ쥹���ѹ���Υ��ɥ쥹��\n"
 
 #: bin/clone_member:94
 msgid "processing mailing list:"
@@ -9682,7 +9705,7 @@ msgstr "̵
 msgid ""
 "Error opening list \"%(listname)s\", skipping.\n"
 "%(e)s"
-msgstr "%(listname)s �ꥹ�Ȥ����顼�dz����ޤ���, ���Ф��ޤ�: %(e)s"
+msgstr "%(listname)s �ꥹ�Ȥ����顼�dz����ޤ������Ф��ޤ�: %(e)s"
 
 #: bin/config_list:20
 msgid ""
@@ -9737,7 +9760,7 @@ msgid ""
 "The options -o and -i are mutually exclusive.\n"
 "\n"
 msgstr ""
-"�ƥ����ȥե�����ε��Ҥ���ꥹ�Ȥ������Ԥ�.\n"
+"�ƥ����ȥե�����ε��Ҥ���ꥹ�Ȥ������Ԥ���\n"
 "\n"
 "����ˡ: config_list [���ץ����] �ꥹ��̾\n"
 "\n"
@@ -9745,41 +9768,41 @@ msgstr ""
 "    --inputfile �ե�����̾\n"
 "    -i �ե�����̾\n"
 "        �ꥹ�ȥ��֥������Ȥ�°���˥⥸�塼�������ѿ��������Ƥ�\n"
-"        ���Ȥǥꥹ�Ȥ������Ԥ�, �ꥹ�Ȥ���¸����. �ե�����̾��\n"
-"        ���ꤵ�줿�ե������ execfile() ��Ȥä��ɤ߹���Τ�, ������\n"
-"        Python �Υ����ɤǤʤ���Фʤ�ʤ�. ���˥ꥹ�Ȥ�°���Ȥ���\n"
-"        �������Ƥ��ʤ��ѿ���̵�뤵���. (�ٹ��å��������Ф�)\n"
-"        -c ���ץ����⻲�ȤΤ���.\n"
-"\n"
-"        ���̤��ѿ�̾ mlist ������ѿ����դ�����Τ�, �ºݤ� MailList\n"
-"        ���֥������Ȥ�°���Ȥʤ�. ���Τ��Ȥϥꥹ�ȥ��֥������Ȥ�\n"
-"        �ؤ��Ʋ��Ǥ�Ǥ��뤳�Ȥˤʤ뤬, ���դ��ʤ���! �����\n"
-"        �Ȥ��ȥ᡼��󥰥ꥹ�Ȥ˽����»����Ϳ��(�����Բ�ǽ��)���ǽ��\n"
-"        ������.\n"
+"        ���Ȥǥꥹ�Ȥ������Ԥ����ꥹ�Ȥ���¸���롣�ե�����̾��\n"
+"        ���ꤵ�줿�ե������ execfile() ��Ȥä��ɤ߹���Τǡ�������\n"
+"        Python �Υ����ɤǤʤ���Фʤ�ʤ������˥ꥹ�Ȥ�°���Ȥ���\n"
+"        �������Ƥ��ʤ��ѿ���̵�뤵��롣(�ٹ��å��������Ф�)\n"
+"        -c ���ץ����⻲�ȤΤ��ȡ�\n"
+"\n"
+"        ���̤��ѿ�̾ mlist ������ѿ����դ�����Τǡ��ºݤ� MailList\n"
+"        ���֥������Ȥ�°���Ȥʤ롣���Τ��Ȥϥꥹ�ȥ��֥������Ȥ�\n"
+"        �ؤ��Ʋ��Ǥ�Ǥ��뤳�Ȥˤʤ뤬�����դ��ʤ���! �����\n"
+"        �Ȥ��ȥ᡼��󥰥ꥹ�Ȥ˿����»����Ϳ����(�����Բ�ǽ�ˤʤ�)��ǽ��\n"
+"        �����롣\n"
 "\n"
 "    --outputfile �ե�����̾\n"
 "    -o filename\n"
-"        �ꥹ�Ȥ������Ԥ��ΤǤʤ�, ���Υ�����ץȤ����Ϥ˹礦�ͤ�,\n"
-"        ���ߤ������ѿ�����Ϥ���. ����ˤ�ä�, ��������Υꥹ�Ȥ�\n"
-"        �������Ф���, �̤Υꥹ�Ȥ�����˰ܤ��Ѥ��뤳�Ȥ��Ǥ���.\n"
-"        �ե�����̾�Ϥ���������Ϥ��񤭹��ޤ��ե������̾���Ǥ���. \n"
-"        ����� - �ˤ��Ƥ�����, ɸ����Ϥ˽񤭽Ф�.\n"
+"        �ꥹ�Ȥ������Ԥ��ΤǤʤ������Υ�����ץȤ����Ϥ˹礦�ͤˡ�\n"
+"        ���ߤ������ѿ�����Ϥ��롣����ˤ�äơ���������Υꥹ�Ȥ�\n"
+"        �������Ф��ơ��̤Υꥹ�Ȥ�����˰ܤ��Ѥ��뤳�Ȥ��Ǥ��롣\n"
+"        �ե�����̾�Ϥ���������Ϥ��񤭹��ޤ��ե������̾���Ǥ��롣\n"
+"        ����� - �ˤ��Ƥ����ȡ�ɸ����Ϥ˽񤭽Ф���\n"
 "\n"
 "    --checkonly\n"
 "    -c\n"
-"        ���Υ��ץ����Ǥ�, �ºݤ��ѹ��ϹԤ��ʤ�. -i ���ץ�����\n"
-"        �Ȥä��Ȥ�����ͭ��.\n"
+"        ���Υ��ץ����Ǥϡ��ºݤ��ѹ��ϹԤ��ʤ���-i ���ץ�����\n"
+"        �Ȥä��Ȥ�����ͭ����\n"
 "\n"
 "    --verbose\n"
 "    -v\n"
-"        °�����ѹ������ä��Ȥ�����̾����ɽ�������. -i ���ץ�����\n"
-"        �Ȥä��Ȥ�����ͭ��.\n"
+"        °�����ѹ������ä��Ȥ�����̾����ɽ������롣-i ���ץ�����\n"
+"        �Ȥä��Ȥ�����ͭ����\n"
 "\n"
 "    --help\n"
 "    -h\n"
-"        ���Υإ�ץ�å�������ɽ�����ƽ�λ����.\n"
+"        ���Υإ�ץ�å�������ɽ�����ƽ�λ���롣\n"
 "\n"
-"-o ���ץ����� -i ���ץ�����Ʊ���˻Ȥ����Ȥ��Ǥ��ʤ�.\n"
+"-o ���ץ����� -i ���ץ�����Ʊ���˻Ȥ����Ȥ��Ǥ��ʤ���\n"
 "\n"
 
 #: bin/config_list:118
@@ -9832,7 +9855,7 @@ msgstr "-i 
 
 #: bin/config_list:354
 msgid "List name is required"
-msgstr "�ꥹ��̾��ɬ�פǤ�."
+msgstr "�ꥹ��̾��ɬ�פǤ�"
 
 #: bin/convert.py:19
 msgid ""
@@ -9842,9 +9865,9 @@ msgid ""
 "\n"
 "% bin/withlist -l -r convert <mylist>\n"
 msgstr ""
-"�ꥹ�Ȥ�����ʸ����� %ʸ���� ���� $ʸ������ѹ�����.\n"
+"�ꥹ�Ȥ�����ʸ����� %ʸ���� ���� $ʸ������ѹ����롣\n"
 "\n"
-"���Υ�����ץȤ� bin/withlist �Υ�����ץȤȤ��Ƽ��Τ褦�˼¹Ԥ���.\n"
+"���Υ�����ץȤ� bin/withlist �Υ�����ץȤȤ��Ƽ��Τ褦�˼¹Ԥ��롣\n"
 "\n"
 "% bin/withlist -l -r convert <�ꥹ��̾>\n"
 
@@ -9870,7 +9893,7 @@ msgid ""
 "    --quiet / -q\n"
 "        Don't print status messages.\n"
 msgstr ""
-"��α�᡼����˴�����.\n"
+"��α�᡼����˴����롣\n"
 "\n"
 "����ˡ:\n"
 "    discard [���ץ����] �ե����� ...\n"
@@ -9878,10 +9901,10 @@ msgstr ""
 "���ץ����:\n"
 "\n"
 "    --help / -h\n"
-"        ���Υإ�ץ�å�������ɽ�����ƽ�λ����.\n"
+"        ���Υإ�ץ�å�������ɽ�����ƽ�λ���롣\n"
 "\n"
 "    --quiet / -q\n"
-"        ��Ⱦ�������Ϥ��ʤ�.\n"
+"        ��Ⱦ�������Ϥ��ʤ���\n"
 
 #: bin/discard:94
 msgid "Ignoring non-held message: %(f)s"
@@ -9931,37 +9954,37 @@ msgid ""
 "assumption\n"
 "-- or if the file ends in neither suffix -- use the -p or -m flags.\n"
 msgstr ""
-"Mailman �Υǡ����١����ե���������Ƥ�ɽ������.\n"
+"Mailman �Υǡ����١����ե���������Ƥ�ɽ�����롣\n"
 "\n"
 "����ˡ: %(PROGRAM)s [���ץ����] �ե�����̾\n"
 "\n"
 "���ץ����:\n"
 "\n"
 "    --marshal/-m\n"
-"        �ե������ Python �� marshal �����Ȳ��ꤹ��. ��ư�����̵����\n"
-"        �ʤ�.\n"
+"        �ե������ Python �� marshal �����Ȳ��ꤹ�롣��ư�����̵����\n"
+"        �ʤ롣\n"
 "\n"
 "    --pickle/-p\n"
-"        �ե������ Python �� pickle �����Ȳ��ꤹ��. ��ư�����̵����\n"
-"        �ʤ�.\n"
+"        �ե������ Python �� pickle �����Ȳ��ꤹ�롣��ư�����̵����\n"
+"        �ʤ롣\n"
 "\n"
 "    --noprint/-n\n"
-"        ���֥������Ȥ�����ɽ����Ԥ�ʤ�. ����ϥ��֥������Ȥˤʤ�餫��\n"
-"        ���꤬���ä�, pickle �����β���ɽ��������Ԥ���������ͭ���Ǥ���.\n"
-"        `python -i bin/dumpdb �ե�����̾' �η��ǻȤ��Ȥ褤. ���ξ��,\n"
-"        �������Х��ѿ� \"msg\" ���ĥ꡼��¤�Υ롼�ȤȤʤ�.\n"
+"        ���֥������Ȥ�����ɽ����Ԥ�ʤ�������ϥ��֥������Ȥˤʤ�餫��\n"
+"        ���꤬���äơ�pickle �����β���ɽ��������Ԥ���������ͭ���Ǥ��롣\n"
+"        `python -i bin/dumpdb �ե�����̾' �η��ǻȤ��Ȥ褤�����ξ�硢\n"
+"        �������Х��ѿ� \"msg\" ���ĥ꡼��¤�Υ롼�ȤȤʤ롣\n"
 "\n"
 "    --help/-h\n"
-"        ���Υإ�ץ�å�������ɽ�����ƽ�λ����.\n"
+"        ���Υإ�ץ�å�������ɽ�����ƽ�λ���롣\n"
 "\n"
-"�ե�����̾�� `.db' �ǽ���Ȥ�, Python �� marshal �������ꤷ, `.pck' ��\n"
-"����Ȥ��ˤ� Python �� pickle �������ꤹ��. �ɤ���ξ��⤳�β����\n"
-"̵���ˤ���������, �ɤ���γ�ĥ�ҤǤ⽪�äƤ��ʤ��Ȥ��ˤ�, -p �ޤ��� -m\n"
-"�ե饰��Ȥ�����.\n"
+"�ե�����̾�� `.db' �ǽ���Ȥ�, Python �� marshal �������ꤷ��`.pck' ��\n"
+"����Ȥ��ˤ� Python �� pickle �������ꤹ�롣�ɤ���ξ��⤳�β����\n"
+"̵���ˤ��������䡢�ɤ���γ�ĥ�ҤǤ⽪�äƤ��ʤ��Ȥ��ˤϡ�-p �ޤ��� -m\n"
+"�ե饰��Ȥ����ȡ�\n"
 
 #: bin/dumpdb:105
 msgid "No filename given."
-msgstr "�ե�����̾�����ꤵ��Ƥ��ޤ���."
+msgstr "�ե�����̾�����ꤵ��Ƥ��ޤ���"
 
 #: bin/dumpdb:108
 msgid "Bad arguments: %(pargs)s"
@@ -9985,7 +10008,7 @@ msgstr "<----- %(cnt)s 
 
 #: bin/export.py:20
 msgid "Export an XML representation of a mailing list."
-msgstr "�᡼��󥰥ꥹ�Ȥ������ XML ����¸����."
+msgstr "�᡼��󥰥ꥹ�Ȥ������ XML ����¸���롣"
 
 #: bin/export.py:319
 msgid ""
@@ -9995,7 +10018,7 @@ msgid ""
 msgstr ""
 "%%prog [options]\n"
 "\n"
-"XML �����ǥ᡼��󥰥ꥹ�Ȥ�����Ȳ������¸����."
+"XML �����ǥ᡼��󥰥ꥹ�Ȥ�����Ȳ������¸���롣"
 
 #: bin/export.py:325
 msgid ""
@@ -10003,8 +10026,8 @@ msgid ""
 "is\n"
 "used."
 msgstr ""
-"XML �� FILENAME �˽���. ���Υ��ץ����̵���Ȥ�, FILENAME �� '-' ��\n"
-"�Ȥ���, ɸ����Ϥ����Ѥ����."
+"XML �� FILENAME �˽��ϡ����Υ��ץ����̵���Ȥ���FILENAME �� '-' ��\n"
+"�Ȥ��ϡ�ɸ����Ϥ����Ѥ���롣"
 
 #: bin/export.py:329
 msgid ""
@@ -10012,8 +10035,8 @@ msgid ""
 "output.  Use -P to get a list of supported schemes, which are\n"
 "case-insensitive."
 msgstr ""
-"RFC 2307 ��������Υѥ���ɡ��ϥå�����������.\n"
-"-P ���ץ����ǥ��ݡ��Ȥ��Ƥ����������Ϥ���. â��, �羮ʸ���ζ���̵��."
+"RFC 2307 ��������Υѥ���ɡ��ϥå����������ꡣ\n"
+"-P ���ץ����ǥ��ݡ��Ȥ��Ƥ����������Ϥ��롣â�����羮ʸ���ζ���̵����"
 
 #: bin/export.py:334
 msgid ""
@@ -10021,8 +10044,8 @@ msgid ""
 "are\n"
 "case-insensitive."
 msgstr ""
-"���ݡ��Ȥ���ѥ���ɡ��ϥå��������ꥹ�Ȥ��ƽ�λ����.\n"
-"â��, �ϥå�������λ�����羮ʸ���ζ��̤Ϥ��ʤ�."
+"���ݡ��Ȥ���ѥ���ɡ��ϥå��������ꥹ�Ȥ��ƽ�λ���롣\n"
+"â�����ϥå�������λ�����羮ʸ���ζ��̤Ϥ��ʤ���"
 
 #: bin/export.py:339
 msgid ""
@@ -10030,8 +10053,8 @@ msgid ""
 "are\n"
 "included in the XML output.  Multiple -l flags may be given."
 msgstr ""
-"���Ϥ˴ޤ��ꥹ��. ���Υ��ץ����̵�����ˤ�, ���ƤΥ᡼���\n"
-"�ꥹ�Ȥ� XML ���Ϥ�����ޤ�. -l �ե饰��ʣ���դ��뤳�Ȥ�Ǥ��ޤ�."
+"���Ϥ˴ޤ��ꥹ�ȡ����Υ��ץ����̵�����ˤϡ����ƤΥ᡼���\n"
+"�ꥹ�Ȥ� XML ���Ϥ�����ޤ���-l �ե饰��ʣ���դ��뤳�Ȥ�Ǥ��ޤ���"
 
 #: bin/export.py:345
 msgid "Unexpected arguments"
@@ -10078,13 +10101,13 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
 "\n"
 msgstr ""
-"�����°����ꥹ�Ȥ򸡺�����.\n"
+"�����°����ꥹ�Ȥ򸡺����롣\n"
 "\n"
 "����ˡ:\n"
 "    find_member [���ץ����] ����ɽ�� [����ɽ�� [...]]\n"
@@ -10109,18 +10132,19 @@ msgstr ""
 "    ����ɽ��\n"
 "        Ŭ��򸡺����� Python ������ɽ��\n"
 "\n"
-"-l �� -x ���ץ����δط��ϰʲ��Τ褦�ˤʤ�. �⤷ -l ���ץ����\n"
-"���ꤵ��Ƥ�����, ���Υꥹ�Ȥ����򸡺��˴ޤ��. �⤷ -x ���ץ����\n"
-"�����ä� -l ���ץ����̵������, ���ꤵ��Ƥ��ʤ����٤ƤΥꥹ�Ȥ�\n"
-"�����оݤȤʤ�.\n"
+"-l �� -x ���ץ����δط��ϰʲ��Τ褦�ˤʤ롣�⤷ -l ���ץ����\n"
+"���ꤵ��Ƥ����顢���Υꥹ�Ȥ����򸡺��˴ޤ�롣�⤷ -x ���ץ����\n"
+"�����ä� -l ���ץ����̵�����ϡ����ꤵ��Ƥ��ʤ����٤ƤΥꥹ�Ȥ�\n"
+"�����оݤȤʤ롣\n"
 "\n"
-"����ɽ���� Perl5 �˻��Ƥ��뤬, Python �� re �⥸�塼���Ȥ�. re\n"
+"����ɽ���� Perl5 �˻��Ƥ��뤬, Python �� re �⥸�塼���Ȥ��� re\n"
 "�⥸�塼��λ��ͤϰʲ��Υڡ����ˤ���:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
+"(���ܸ��Ǥ� https://docs.python.org/ja/2.7/library/re.html)\n"
 "\n"
-"�᡼�륢�ɥ쥹����ʸ����ʸ���ζ��̤򤻤��˸������뤬, ��̤�ɽ����\n"
-"��ʸ����ޤ�����ǹԤ���.\n"
+"�᡼�륢�ɥ쥹����ʸ����ʸ���ζ��̤򤻤��˸������뤬����̤�ɽ����\n"
+"��ʸ����ޤ�����ǹԤ��롣\n"
 "\n"
 
 #: bin/find_member:159
@@ -10166,24 +10190,24 @@ msgid ""
 msgstr ""
 "web_page_url °����ǥե���Ȥ����ꤹ��\n"
 "\n"
-"���Υ�����ץȤ� bin/withlist �ȤȤ�˻��Ѥ��ޤ�. �Ĥޤ�\n"
+"���Υ�����ץȤ� bin/withlist �ȤȤ�˻��Ѥ��ޤ����Ĥޤ�\n"
 "\n"
 "% bin/withlist -l -r fix_url �ꥹ��̾ [���ץ����]\n"
 "\n"
 "���ץ����:\n"
 "    -u �ۥ���̾\n"
 "    -urlhost=�ۥ���̾\n"
-"        ���ۥۥ���ɽ�򻲾Ȥ�, �ꥹ�Ȥ� web_page_url �� host_name °����\n"
-"        ɽ�˽��äƥۥ���̾�ǻ��ꤷ���ͤ����ꤹ��. �����, �ܼ�Ū�ˤ�\n"
-"        �ꥹ�Ȥ򤢤벾�ۥɥᥤ�󤫤��̤Υɥᥤ��˰ܹԤ��뤳�ȤǤ���.\n"
+"        ���ۥۥ���ɽ�򻲾Ȥ����ꥹ�Ȥ� web_page_url �� host_name °����\n"
+"        ɽ�˽��äƥۥ���̾�ǻ��ꤷ���ͤ����ꤹ�롣����ϡ��ܼ�Ū�ˤ�\n"
+"        �ꥹ�Ȥ򤢤벾�ۥɥᥤ�󤫤��̤Υɥᥤ��˰ܹԤ��뤳�ȤǤ��롣\n"
 "\n"
 "        ���Υ��ץ����̵����, �ǥե���Ȥ� web_page_url �� host_name\n"
-"        ���Ȥ���.\n"
+"        ���Ȥ��롣\n"
 "\n"
 "    -v / --verbose\n"
-"        ������ץȤ����򤷤Ƥ��뤫��ɽ������.\n"
+"        ������ץȤ����򤷤Ƥ��뤫��ɽ�����롣\n"
 "\n"
-"�⤷ñ�ȤǼ¹Ԥ���ȥإ�ץ�å�������ɽ�����ƽ�λ����.\n"
+"�⤷ñ�ȤǼ¹Ԥ���ȥإ�ץ�å�������ɽ�����ƽ�λ���롣\n"
 
 #: bin/fix_url.py:75
 msgid "Locking list"
@@ -10216,19 +10240,19 @@ msgid ""
 "    -h/--help\n"
 "        Print this message and exit.\n"
 msgstr ""
-"Mailman �� aliases �����������.\n"
+"Mailman �� aliases ����������롣\n"
 "\n"
-"�ºݤν��Ϥ�, mm_cfg.py �ե������ `MTA' �ѿ����ͤˤ�ä��Ѥ��ޤ�.\n"
+"�ºݤν��Ϥϡ�mm_cfg.py �ե������ `MTA' �ѿ����ͤˤ�ä��Ѥ��ޤ���\n"
 "\n"
 "����ˡ: genaliases [���ץ����]\n"
 "���ץ����:\n"
 "\n"
 "    -q/--quiet\n"
-"        MTA�ˤ�äƽ��ϤϾ�Ĺ�ʥإ��ʸ���դ��ޤ�. ���Υ��ץ�����\n"
-"        ��Ĺ�٤򲼤��뤳�Ȥ��Ǥ��ޤ�.\n"
+"        MTA�ˤ�äƽ��ϤϾ�Ĺ�ʥإ��ʸ���դ��ޤ������Υ��ץ�����\n"
+"        ��Ĺ�٤򲼤��뤳�Ȥ��Ǥ��ޤ���\n"
 "\n"
 "    -h/--help\n"
-"        ���Υ�å���������Ϥ��ƽ�λ����.\n"
+"        ���Υ�å���������Ϥ��ƽ�λ���롣\n"
 
 #: bin/genaliases:84
 msgid "genaliases can't do anything useful with mm_cfg.MTA = %(mta)s."
@@ -10260,27 +10284,27 @@ msgid ""
 "filename is the name of the plaintext message file to inject.  If omitted,\n"
 "standard input is used.\n"
 msgstr ""
-"Mailman �� incoming ���塼�˥ե����뤫��᡼��������.\n"
+"Mailman �� incoming ���塼�˥ե����뤫��᡼�������롣\n"
 "\n"
 "����ˡ: inject [���ץ����] [�ե�����̾]\n"
 "\n"
 "���ץ����:\n"
 "\n"
 "    -h / --help\n"
-"        ���Υƥ����Ȥ�ɽ�����ƽ�λ����.\n"
+"        ���Υƥ����Ȥ�ɽ�����ƽ�λ���롣\n"
 "\n"
 "    -l �ꥹ��̾\n"
 "    --listname=�ꥹ��̾\n"
-"        �᡼��������ꥹ�Ȥ�̾��. ɬ��.\n"
+"        �᡼��������ꥹ�Ȥ�̾����ɬ�ܡ�\n"
 "\n"
 "    -q ���塼̾\n"
 "    -queue=���塼̾\n"
-"        �᡼�������륭�塼��̾��. ���塼̾�� qfiles �ǥ��쥯�ȥ��\n"
-"        ���֥ǥ��쥯�ȥ��̾���Ǥ���. ��ά�ξ���, incoming ���塼\n"
-"        ���Ȥ���. (���塼���Ԥ��������������뤳�Ȥ�����)\n"
+"        �᡼�������륭�塼��̾�������塼̾�� qfiles �ǥ��쥯�ȥ��\n"
+"        ���֥ǥ��쥯�ȥ��̾���Ǥ��롣��ά�ξ��ϡ�incoming ���塼\n"
+"        ���Ȥ��롣(���塼���Ԥ��������������뤳�Ȥ�����)\n"
 "\n"
-"�ե�����̾�ϥ��塼�������ʿʸ�Υ᡼��ե������̾���Ǥ���. ��ά�����\n"
-"ɸ�����Ϥ��Ȥ���.\n"
+"�ե�����̾�ϥ��塼�������ʿʸ�Υ᡼��ե������̾���Ǥ��롣��ά�����\n"
+"ɸ�����Ϥ��Ȥ��롣\n"
 
 #: bin/inject:84
 msgid "Bad queue directory: %(qdir)s"
@@ -10288,7 +10312,7 @@ msgstr "
 
 #: bin/inject:89
 msgid "A list name is required"
-msgstr "�ꥹ��̾����ꤷ�Ƥ�������."
+msgstr "�ꥹ��̾����ꤷ�Ƥ���������"
 
 #: bin/list_admins:20
 msgid ""
@@ -10314,7 +10338,7 @@ msgid ""
 "`listname' is the name of the mailing list to print the owners of.  You can\n"
 "have more than one named list on the command line.\n"
 msgstr ""
-"�᡼��󥰥ꥹ�Ȥδ����Ԥ�ɽ������\n"
+"�᡼��󥰥ꥹ�Ȥδ����Ԥ�ɽ�����롣\n"
 "\n"
 "����ˡ: %(program)s [���ץ����] �ꥹ��̾ ...\n"
 "\n"
@@ -10322,18 +10346,18 @@ msgstr ""
 "\n"
 "    --all-vhost=���ۥۥ���\n"
 "    -v=���ۥۥ���\n"
-"        ���ۥۥ��Ȥ�°���뤹�٤ƤΥ᡼��󥰥ꥹ�Ȥδ����Ԥ�ɽ������.\n"
+"        ���ۥۥ��Ȥ�°���뤹�٤ƤΥ᡼��󥰥ꥹ�Ȥδ����Ԥ�ɽ�����롣\n"
 "\n"
 "    --all\n"
 "    -a\n"
-"        ���Υ����ƥ��Τ��٤ƤΥ᡼��󥰥ꥹ�Ȥδ����Ԥ�ɽ������.\n"
+"        ���Υ����ƥ��Τ��٤ƤΥ᡼��󥰥ꥹ�Ȥδ����Ԥ�ɽ�����롣\n"
 "\n"
 "    --help\n"
 "    -h\n"
-"        ���Υإ�ץ�å�������ɽ�����ƽ�λ����.\n"
+"        ���Υإ�ץ�å�������ɽ�����ƽ�λ���롣\n"
 "\n"
-"�ꥹ��̾�ϴ����Ԥ�ɽ�����褦�Ȥ���᡼��󥰥ꥹ�Ȥ�̾���Ǥ���. ����\n"
-"�ʾ�Υꥹ��̾�򥳥ޥ�ɹԤǻ��ꤹ�뤳�Ȥ�Ǥ���.\n"
+"�ꥹ��̾�ϴ����Ԥ�ɽ�����褦�Ȥ���᡼��󥰥ꥹ�Ȥ�̾���Ǥ��롣2��\n"
+"�ʾ�Υꥹ��̾�򥳥ޥ�ɹԤǻ��ꤹ�뤳�Ȥ�Ǥ��롣\n"
 
 #: bin/list_admins:97
 msgid "List: %(listname)s, \tOwners: %(owners)s"
@@ -10366,29 +10390,29 @@ msgid ""
 "        Print this text and exit.\n"
 "\n"
 msgstr ""
-"���٤ƤΥ᡼��󥰥ꥹ�Ȥ�ɽ������.\n"
+"���٤ƤΥ᡼��󥰥ꥹ�Ȥ�ɽ�����롣\n"
 "\n"
 "����ˡ: %(program)s [���ץ����]\n"
 "\n"
 "������:\n"
 "\n"
 "    -a / --advertised\n"
-"        �������줿�ꥹ�Ȥ�����ɽ������.\n"
+"        �������줿�ꥹ�Ȥ�����ɽ�����롣\n"
 "\n"
 "    -p / --public-archive\n"
-"        ������¸��ˤΥꥹ�Ȥ�����ɽ������.\n"
+"        ������¸��ˤΥꥹ�Ȥ�����ɽ�����롣\n"
 "\n"
 "    --virtual-host-overview=�ɥᥤ��\n"
 "    -V �ɥᥤ��\n"
 "        �ɥᥤ��ǻ��ꤷ�����ۥɥᥤ���°����᡼��󥰥ꥹ�ȤΤߤ�\n"
-"        ɽ������. ������, VIRTUAL_HOST_OVERVIEW �ѿ������ꤵ��Ƥ���ɬ��\n"
-"        ������.\n"
+"        ɽ�����롣��������VIRTUAL_HOST_OVERVIEW �ѿ������ꤵ��Ƥ���ɬ��\n"
+"        �����롣\n"
 "\n"
 "    -b / --bare\n"
-"        �ꥹ�Ȥ�û��������̵���ꥹ�ȤΤߤ�ɽ������.\n"
+"        �ꥹ�Ȥ�û��������̵���ꥹ�ȤΤߤ�ɽ�����롣\n"
 "\n"
 "    -h / --help\n"
-"        ���Υƥ����Ȥ�ɽ�����ƽ�λ����.\n"
+"        ���Υƥ����Ȥ�ɽ�����ƽ�λ���롣\n"
 "\n"
 
 #: bin/list_lists:119
@@ -10464,7 +10488,7 @@ msgid ""
 "followed by digest members, but no indication is given as to address "
 "status.\n"
 msgstr ""
-"�᡼��󥰥ꥹ�Ȥβ��������ɽ������.\n"
+"�᡼��󥰥ꥹ�Ȥβ��������ɽ�����롣\n"
 "\n"
 "����ˡ: %(PROGRAM)s [���ץ����] �ꥹ��̾\n"
 "\n"
@@ -10472,52 +10496,52 @@ msgstr ""
 "\n"
 "    --output �ե�����\n"
 "    -o �ե�����\n"
-"        ���Ϥ�ɸ����ϤǤʤ�, ���ꤷ���ե�����˽񤭹���.\n"
+"        ���Ϥ�ɸ����ϤǤʤ������ꤷ���ե�����˽񤭹��ࡣ\n"
 "\n"
 "    --regular / -r\n"
-"        �̾���(�ޤȤ��ɤߤǤʤ�)�Τߤ�ɽ������.\n"
+"        �̾���(�ޤȤ��ɤߤǤʤ�)�Τߤ�ɽ�����롣\n"
 "\n"
 "    --digest[=����] / -d [����]\n"
-"        �ޤȤ��ɤ߲���Τߤ���Ϥ���. ���ץ����ǻ��ꤹ��[����]��\n"
+"        �ޤȤ��ɤ߲���Τߤ���Ϥ��롣���ץ����ǻ��ꤹ��[����]��\n"
 "        \"mime\" �ޤ��� \"plain\" �Τɤ��餫�ǡ����η����ǤΤޤȤ�\n"
-"        �ɤߤ���ꤷ�Ƥ�������ɽ������.\n"
+"        �ɤߤ���ꤷ�Ƥ�������ɽ�����롣\n"
 "\n"
 "    --nomail[=��ͳ] / -n [��ͳ]\n"
-"        �᡼����������ߤ��Ƥ�������ɽ������. ���ץ����ǻ��ꤹ��\n"
-"        [��ͳ] �� \"byadmin\", \"byuser\", \"bybounce\", \"unknown\" ��\n"
-"        �ɤ줫��, ������ͳ����������ߤ��Ƥ�������ɽ������. �ޤ�\n"
-"        \"enabaled\" ����ꤹ���, ������ͭ���ˤʤäƤ�������ɽ��\n"
-"        ����.\n"
+"        �᡼����������ߤ��Ƥ�������ɽ�����롣���ץ����ǻ��ꤹ��\n"
+"        [��ͳ] �� \"byadmin\"��\"byuser\"��\"bybounce\"��\"unknown\" ��\n"
+"        �ɤ줫�ǡ�������ͳ����������ߤ��Ƥ�������ɽ�����롣�ޤ�\n"
+"        \"enabaled\" ����ꤹ��ȡ�������ͭ���ˤʤäƤ�������ɽ��\n"
+"        ���롣\n"
 "\n"
 "    --fullnames / -f\n"
-"        ��̾��ɽ������.\n"
+"        ��̾��ɽ�����롣\n"
 "\n"
 "    --preserve / -p\n"
-"        �᡼�륢�ɥ쥹��ɽ������Ȥ���, ��������Ϥ����Ȥ�����ʸ��/��ʸ��\n"
-"        �򤽤Τޤ޻Ȥ�. ���ꤷ�ʤ��Ⱦ�ʸ���������Ѵ������.\n"
+"        �᡼�륢�ɥ쥹��ɽ������Ȥ��ˡ���������Ϥ����Ȥ�����ʸ��/��ʸ��\n"
+"        �򤽤Τޤ޻Ȥ������ꤷ�ʤ��Ⱦ�ʸ���������Ѵ�����롣\n"
 "\n"
 "    --moderated / -m\n"
-"        ����(��ǥ졼��)���줿����Τߤ�ɽ������. -r, -d, -n ��̵�뤹��.\n"
+"        ����(��ǥ졼��)���줿����Τߤ�ɽ�����롣 -r, -d, -n ��̵�뤹�롣\n"
 "\n"
 "    --non-moderated / -M\n"
-"        ����(��ǥ졼��)����Ƥ��ʤ�����Τߤ�ɽ������. \n"
-"        -r, -d, -n ��̵�뤹��.\n"
+"        ����(��ǥ졼��)����Ƥ��ʤ�����Τߤ�ɽ�����롣\n"
+"        -r, -d, -n ��̵�뤹�롣\n"
 "\n"
 "    --invalid / -i\n"
-"        ̵���ʥ᡼�륢�ɥ쥹����Ͽ����Ƥ�������������Ϥ���.\n"
-"        -r, -d, -n ��̵�뤹��.\n"
+"        ̵���ʥ᡼�륢�ɥ쥹����Ͽ����Ƥ�������������Ϥ��롣\n"
+"        -r, -d, -n ��̵�뤹�롣\n"
 "\n"
 "    --unicode / -u\n"
 "        ʸ����Ǥʤ���˥����ɥ��֥������ȤȤ�����¸����Ƥ��륢�ɥ쥹\n"
-"        ����Ϥ���. -r, -d, -n ��̵�뤹��.\n"
+"        ����Ϥ��롣-r, -d, -n ��̵�뤹�롣\n"
 "\n"
 "    --help / -h\n"
-"        ���Υإ�ץ�å�������ɽ�����ƽ�λ����.\n"
+"        ���Υإ�ץ�å�������ɽ�����ƽ�λ���롣\n"
 "\n"
-"    �ꥹ��̾�ϻ��Ѥ���᡼��󥰥ꥹ�Ȥ�̾��.\n"
+"    �ꥹ��̾�ϻ��Ѥ���᡼��󥰥ꥹ�Ȥ�̾����\n"
 "\n"
-"����: -r �� -d ����ꤷ�ʤ���, �ǽ���̾�����, ���ˤޤȤ��ɤ߲����ɽ��\n"
-"����뤬, �����ξ��֤ˤĤ��Ƥ�ɽ������ʤ�.\n"
+"����: -r �� -d ����ꤷ�ʤ��ȡ��ǽ���̾����������ˤޤȤ��ɤ߲����ɽ��\n"
+"����뤬�������ξ��֤ˤĤ��Ƥ�ɽ������ʤ���\n"
 
 #: bin/list_members:198
 msgid "Bad --nomail option: %(why)s"
@@ -10530,7 +10554,7 @@ msgstr "--digest 
 #: bin/list_members:213 bin/list_members:217 bin/list_members:221
 #: bin/list_members:225
 msgid "Only one of -m, -M, -i or -u may be specified."
-msgstr "-m, -M, -i, �ޤ��� -u �Τ�����1�Ĥ���������Ǥ��ޤ�."
+msgstr "-m, -M, -i, �ޤ��� -u �Τ�����1�Ĥ���������Ǥ��ޤ���"
 
 #: bin/list_members:243
 msgid "Could not open file for writing:"
@@ -10561,25 +10585,25 @@ msgid ""
 "of\n"
 "        all the lists will be displayed.\n"
 msgstr ""
-"�����ޤ��ϰ����Υ᡼��󥰥ꥹ�Ȥδ����Ԥ�ɽ������.\n"
+"�����ޤ��ϰ����Υ᡼��󥰥ꥹ�Ȥδ����Ԥ�ɽ�����롣\n"
 "\n"
 "����ˡ: %(PROGRAM)s [���ץ����] [�ꥹ��̾ ...]\n"
 "\n"
 "    -w /--with-listnames\n"
-"        �����Ԥ�ꥹ��̾�ǥ��롼�ײ���, �ꥹ��̾����Ϥ˴ޤ��.\n"
+"        �����Ԥ�ꥹ��̾�ǥ��롼�ײ������ꥹ��̾����Ϥ˴ޤ�롣\n"
 "        ���ꤷ�ʤ��ȴ����Ԥϥ᡼�륢�ɥ쥹�򸵤��¤��ؤ���ñ�첽��\n"
-"        �Ԥ���.\n"
+"        �Ԥ��롣\n"
 "\n"
 "    -m / --moderators\n"
-"        �ꥹ�Ȥλʲ�Ԥ���Ϥ˴ޤ��.\n"
+"        �ꥹ�Ȥλʲ�Ԥ���Ϥ˴ޤ�롣\n"
 "\n"
 "    -h / --help\n"
-"        ���Υإ�ץ�å���������Ϥ��ƽ�λ����.\n"
+"        ���Υإ�ץ�å���������Ϥ��ƽ�λ���롣\n"
 "\n"
 "    �ꥹ��̾\n"
-"        ���ꤷ���ꥹ�Ȥδ����Ԥ���Ϥ���. ���İʾ�Υꥹ��̾��񤯤��Ȥ�\n"
-"        �Ǥ���. �ꥹ��̾����Ĥ�̵�����ˤ�, �����Υꥹ�Ȥδ����Ԥ�ɽ��\n"
-"        ����.\n"
+"        ���ꤷ���ꥹ�Ȥδ����Ԥ���Ϥ��롣2�İʾ�Υꥹ��̾��񤯤��Ȥ�\n"
+"        �Ǥ��롣�ꥹ��̾����Ĥ�̵�����ˤϡ������Υꥹ�Ȥδ����Ԥ�ɽ��\n"
+"        ���롣\n"
 
 #: bin/mailman-config:22
 msgid ""
@@ -10587,7 +10611,7 @@ msgid ""
 "installation of Mailman. Requires python 2."
 msgstr ""
 "�ܥ��󥹥ȡ���Ķ��� Mailman �ˤĤ��Ƥδ��ܾ��󤪤��\n"
-"�ӥ�ɥ��ץ�����ɽ������. �� Python 2."
+"�ӥ�ɥ��ץ�����ɽ�����롣�� Python 2��"
 
 #: bin/mailmanctl:20
 msgid ""
@@ -10686,77 +10710,77 @@ msgstr ""
 "Mailman �� qrunner �ǡ����򥹥�����/��ߤ��륹����ץ�.\n"
 "\n"
 "���Υ�����ץȤ� Mailman �Υ��塼�����ʡ� (�Ԥ��������) �ץ�������\n"
-"��ư����ߡ��Ƶ�ư�����Τ�, ���Ĺ���ˤ錄�äƼ¹Ԥ���� qrunner ��\n"
-"ư���Ƥ��뤳�Ȥ��ǧ��, ɬ�פ˱����ƺƵ�ư����. ����� qrunner ��\n"
-"fork �� exec ������ pid �ˤĤ����Ե����뤳�ȤǹԤ���. ���֥ץ�������\n"
-"��λ�������Ȥ��Τ����, �Ƶ�ư���ߤ�.\n"
-"\n"
-"qrunner �� SIGINT, SIGTERM, SIGHUP �˱�������. SIGINT �� SIGTERM ��\n"
-"qrunner �����줤�˽�λ����褦�ˤ��뤬, �ޥ������� SIGINT �ǽ�λ����\n"
-"�Ȥ������Ƶ�ư��Ԥ�. SIGHUP �ϥޥ������� qrunner �������ե�������Ĥ�\n"
-"���Υ�å�����ȯ���ΤȤ��˺Ƥӳ����褦�ˤ���.\n"
-"\n"
-"�ޥ�������ޤ� SIGINT, SIGTERM, SIGHUP �˱�������. ���Υ����ʥ���۲���\n"
-"qrunner ��������������Ǥ���. (�ޥ������� SIGHUP ���������ȼ�ʬ�Ѥ�\n"
-"�����ե�������Ĥ��ƺ��ٳ������Ȥ�����) �ޥ������Ϥޤ�, ��ʬ�Υץ�����\n"
-"ID �� data/master-qrunner.pid �ե�����˻Ĥ���, �̾盧���ľ�ܻȤ�ɬ��\n"
-"��̵��. `start', `stop', `restart', `reopen' �Υ��ޥ�ɤǽ�ʬ�Ѥ�­���\n"
-"�Ϥ��Ǥ���.\n"
+"��ư����ߡ��Ƶ�ư�����Τǡ����Ĺ���ˤ錄�äƼ¹Ԥ���� qrunner ��\n"
+"ư���Ƥ��뤳�Ȥ��ǧ����ɬ�פ˱����ƺƵ�ư���롣����� qrunner ��\n"
+"fork �� exec ������ pid �ˤĤ����Ե����뤳�ȤǹԤ��롣���֥ץ�������\n"
+"��λ�������Ȥ��Τ���ȡ��Ƶ�ư���ߤ롣\n"
+"\n"
+"qrunner �� SIGINT, SIGTERM, SIGHUP �˱������롣SIGINT �� SIGTERM ��\n"
+"qrunner �����줤�˽�λ����褦�ˤ��뤬���ޥ������� SIGINT �ǽ�λ����\n"
+"�Ȥ������Ƶ�ư��Ԥ���SIGHUP �ϥޥ������� qrunner �������ե�������Ĥ�\n"
+"���Υ�å�����ȯ���ΤȤ��˺Ƥӳ����褦�ˤ��롣\n"
+"\n"
+"�ޥ�������ޤ� SIGINT, SIGTERM, SIGHUP �˱������롣���Υ����ʥ���۲���\n"
+"qrunner ��������������Ǥ��롣(�ޥ������� SIGHUP ���������ȼ�ʬ�Ѥ�\n"
+"�����ե�������Ĥ��ƺ��ٳ������Ȥ�����) �ޥ������Ϥޤ�����ʬ�Υץ�����\n"
+"ID �� data/master-qrunner.pid �ե�����˻Ĥ������̾盧���ľ�ܻȤ�ɬ��\n"
+"��̵����`start', `stop', `restart', `reopen' �Υ��ޥ�ɤǽ�ʬ�Ѥ�­���\n"
+"�Ϥ��Ǥ��롣\n"
 "\n"
 "����ˡ: %(PROGRAM)s [���ץ����] [ start | stop | restart | reopen ]\n"
 "\n"
 "���ץ����:\n"
 "\n"
 "    -n/--no-restart\n"
-"        ���顼�� SIGINT �ǽ�λ�����Ȥ��� qrunner ��Ƶ�ư���ʤ�.\n"
-"        SIGTERM �ǽ�λ�����Ȥ��ϺƵ�ư�Ϥ���ʤ�. ���Υ��ץ�����\n"
-"        �ǥХå���ͭ��. `start' ���ޥ�ɤ��Ȥ�줿�Ȥ��Τ�ͭ��.\n"
+"        ���顼�� SIGINT �ǽ�λ�����Ȥ��� qrunner ��Ƶ�ư���ʤ���\n"
+"        SIGTERM �ǽ�λ�����Ȥ��ϺƵ�ư�Ϥ���ʤ������Υ��ץ�����\n"
+"        �ǥХå���ͭ����`start' ���ޥ�ɤ��Ȥ�줿�Ȥ��Τ�ͭ����\n"
 "\n"
 "    -u/--run-as-user\n"
-"        �̾�, ���Υ�����ץȤϥ桼��ID�ȥ��롼��ID�� mailman ��\n"
+"        �̾���Υ�����ץȤϥ桼��ID�ȥ��롼��ID�� mailman ��\n"
 "        �ʤäƤ��ʤ��ȵ�ư�Ǥ��ʤ�(Mailman�� configure �λ������\n"
-"        �����). root �ǵ�ư������, ���Υ�����ץȤϥ����å���������\n"
-"        ���Υ桼���ȥ��롼�פ��ѹ�����.\n"
+"        �����)��root �ǵ�ư�����ȡ����Υ�����ץȤϥ����å���������\n"
+"        ���Υ桼���ȥ��롼�פ��ѹ����롣\n"
 "\n"
-"        ���Τ��Ȥ�, �ƥ��Ȥ�ǥХå��κݤ����ؤˤʤ뤳�Ȥ�����.\n"
+"        ���Τ��Ȥϡ��ƥ��Ȥ�ǥХå��κݤ����ؤˤʤ뤳�Ȥ����롣\n"
 "        -u �ե饰�� uid/gid �Υ����å������Ф��ƥץ������򸽺ߤ�\n"
-"        �桼��/���롼�פǼ¹Ԥ���. ���Υե饰���̾�μ¹ԴĶ��ˤ�\n"
-"        ������ʤ�.\n"
+"        �桼��/���롼�פǼ¹Ԥ��롣���Υե饰���̾�μ¹ԴĶ��ˤ�\n"
+"        ������ʤ���\n"
 "\n"
-"        ������, -u �ե饰��Ȥä� mailman�ʳ��Υ��롼�פǼ¹Ԥ����, \n"
-"        �ѡ��ߥå��������꤬ȯ�������ǽ��������Τ�����. \n"
-"        ���Ȥ��Хꥹ�Ȥ���¸��ˤ�Web�������Ǥ��ʤ��ʤ뤫�⤷��ʤ�.\n"
+"        ��������-u �ե饰��Ȥä� mailman�ʳ��Υ��롼�פǼ¹Ԥ���ȡ�\n"
+"        �ѡ��ߥå��������꤬ȯ�������ǽ��������Τ����ա�\n"
+"        ���Ȥ��Хꥹ�Ȥ���¸��ˤ�Web�������Ǥ��ʤ��ʤ뤫�⤷��ʤ���\n"
 "        �����ޥ���!\n"
 "\n"
 "    -s/--stale-lock-cleanup\n"
-"        �⤷, mailmanctl ���ޥ������Υ��å��ե�����򸫤Ĥ�����, �̾�\n"
-"        ���顼��å�������Ф��ƽ�λ����. ���Υ��ץ������դ����, \n"
-"        ������̤Υ����å���Ԥ�. �⤷, ���å��ե�����˽񤫤줿\n"
-"        host/pid �˥ޥå�����ץ�����������ʤ�, mailmanctl �Ͻ�λ����\n"
-"        ��, ��������ץ�������̵�����ˤ�, �Ť��ʤä����å��ե�����\n"
-"        ��������, �������ޥ��������å���������褦�Ȼ�ߤ�.\n"
+"        �⤷��mailmanctl ���ޥ������Υ��å��ե�����򸫤Ĥ����顢�̾�\n"
+"        ���顼��å�������Ф��ƽ�λ���롣���Υ��ץ������դ���ȡ�\n"
+"        ������̤Υ����å���Ԥ����⤷�����å��ե�����˽񤫤줿\n"
+"        host/pid �˥ޥå�����ץ�����������ʤ顢mailmanctl �Ͻ�λ����\n"
+"        ������������ץ�������̵�����ˤϡ��Ť��ʤä����å��ե�����\n"
+"        �������ơ��������ޥ��������å���������褦�Ȼ�ߤ롣\n"
 "\n"
 "    -q/--quiet\n"
-"        ���֥�å���������Ϥ��ʤ�. ���顼��å�������ɸ�२�顼�˽���\n"
-"        �����.\n"
+"        ���֥�å���������Ϥ��ʤ������顼��å�������ɸ�२�顼�˽���\n"
+"        ����롣\n"
 "\n"
 "    -h/--help\n"
 "        ���Υ�å���������Ϥ��ƽ�λ����\n"
 "\n"
 "���ޥ��:\n"
 "\n"
-"    start   - �ޥ������Υǡ����������� qrunner ��ư����. �⤷, ����\n"
-"              �ޥ���������ư����Ƥ����, ���Τ��Ȥ���𤷽�λ����.\n"
+"    start   - �ޥ������Υǡ����������� qrunner ��ư���롣�⤷������\n"
+"              �ޥ���������ư����Ƥ���С����Τ��Ȥ���𤷽�λ���롣\n"
 "\n"
-"    stop    - �ޥ������ǡ����������� qrunner ����ߤ���. ��߸�ϥ᡼��\n"
-"              �ν����ϹԤ��ʤ�.\n"
+"    stop    - �ޥ������ǡ����������� qrunner ����ߤ��롣��߸�ϥ᡼��\n"
+"              �ν����ϹԤ��ʤ���\n"
 "\n"
-"    restart - qrunner ��Ƶ�ư���뤬, �ޥ������Ϥ��Τޤޤˤ���. ����\n"
+"    restart - qrunner ��Ƶ�ư���뤬���ޥ������Ϥ��Τޤޤˤ��롣����\n"
 "              ���ޥ�ɤ� Mailman �򹹿�������С�����󥢥åפ�����˼¹�\n"
-"              ����. qrunner �Ͽ����������ɤ�Ȥ��褦�ˤʤ�.\n"
+"              ���롣qrunner �Ͽ����������ɤ�Ȥ��褦�ˤʤ롣\n"
 "\n"
-"    reopen  - �����Υ����ե�������Ĥ���, ���Υ�����å�������ȯ������\n"
-"              �Ȥ���, ���٥����ץ󤵤���.\n"
+"    reopen  - �����Υ����ե�������Ĥ��ơ����Υ�����å�������ȯ������\n"
+"              �Ȥ��ˡ����٥����ץ󤵤��롣\n"
 
 #: bin/mailmanctl:152
 msgid "PID unreadable in: %(pidfile)s"
@@ -10772,7 +10796,7 @@ msgstr "PID
 
 #: bin/mailmanctl:162
 msgid "Stale pid file removed."
-msgstr "�Ť� PID �ե�����������ޤ���."
+msgstr "�Ť� PID �ե�����������ޤ�����"
 
 #: bin/mailmanctl:221
 msgid ""
@@ -10780,8 +10804,8 @@ msgid ""
 "another\n"
 "master qrunner is already running.\n"
 msgstr ""
-"�ޥ����� qrunner �Υ��å��������Ǥ��ޤ���.\n"
-"�̤Υޥ����� qrunner �����äƤ���褦�Ǥ�.\n"
+"�ޥ����� qrunner �Υ��å��������Ǥ��ޤ���\n"
+"�̤Υޥ����� qrunner �����äƤ���褦�Ǥ���\n"
 
 #: bin/mailmanctl:227
 msgid ""
@@ -10789,9 +10813,9 @@ msgid ""
 "is\n"
 "a stale master qrunner lock.  Try re-running mailmanctl with the -s flag.\n"
 msgstr ""
-"�ޥ������� qrunner ���å��������Ǥ��ޤ���.\n"
-"�Ȥ��Ƥ��ʤ����å��ե����뤬�ĤäƤ���Τ��⤷��ޤ���.\n"
-"-s�ե饰��Ĥ��� mailmanctl ��⤦���ٵ�ư���Ƥ�������.\n"
+"�ޥ������� qrunner ���å��������Ǥ��ޤ���\n"
+"�Ȥ��Ƥ��ʤ����å��ե����뤬�ĤäƤ���Τ��⤷��ޤ���\n"
+"-s�ե饰��Ĥ��� mailmanctl ��⤦���ٵ�ư���Ƥ���������\n"
 
 #: bin/mailmanctl:233
 msgid ""
@@ -10807,16 +10831,16 @@ msgid ""
 "\n"
 "Exiting."
 msgstr ""
-"�ޥ������� qrunner ���å��������Ǥ��ޤ���Ǥ���. ¿ʬ, ¾�Υۥ��Ȥ�\n"
-"�ץ����������äƤ���ΤǤϤʤ����Ȼפ��ޤ�. �ۥ��Ȥζ�����ۤ���\n"
-"���å����Ȥ��Ƥ��ʤ����ɤ�����Ĵ�٤뤳�ȤϤǤ��ޤ���Τ�, ��ư��\n"
-"�����å����Ƥ�������. ���뤤��, ���ʤ������å��ե����뤬�Ť��ʤäƤ���\n"
-"���Ȥ��ΤäƤ���ʤ�, -s �ե饰���դ��� mailmanctl ��Ƶ�ư���Ƥ�������.\n"
+"�ޥ������� qrunner ���å��������Ǥ��ޤ���Ǥ�����¿ʬ��¾�Υۥ��Ȥ�\n"
+"�ץ����������äƤ���ΤǤϤʤ����Ȼפ��ޤ����ۥ��Ȥζ�����ۤ���\n"
+"���å����Ȥ��Ƥ��ʤ����ɤ�����Ĵ�٤뤳�ȤϤǤ��ޤ���Τǡ���ư��\n"
+"�����å����Ƥ������������뤤�ϡ����ʤ������å��ե����뤬�Ť��ʤäƤ���\n"
+"���Ȥ��ΤäƤ���ʤ顢-s �ե饰���դ��� mailmanctl ��Ƶ�ư���Ƥ���������\n"
 "\n"
 "���å��ե�����: %(LOCKFILE)s\n"
 "���å��ۥ���:   %(status)s\n"
 "\n"
-"��λ���ޤ�."
+"��λ���ޤ���"
 
 #: bin/mailmanctl:280 cron/mailpasswds:119
 msgid "Site list is missing: %(sitelistname)s"
@@ -10825,12 +10849,12 @@ msgstr "
 #: bin/mailmanctl:305
 msgid "Run this program as root or as the %(name)s user, or use -u."
 msgstr ""
-"���Υץ������� root �� %(name)s �桼���Ǽ¹Ԥ��Ƥ�������.\n"
-"�����Ǥʤ���� -u ���ץ�����ȤäƤ�������."
+"���Υץ������� root �� %(name)s �桼���Ǽ¹Ԥ��Ƥ���������\n"
+"�����Ǥʤ���� -u ���ץ�����ȤäƤ���������"
 
 #: bin/mailmanctl:336
 msgid "No command given."
-msgstr "���ޥ�ɤ�����ޤ���."
+msgstr "���ޥ�ɤ�����ޤ���"
 
 #: bin/mailmanctl:339
 msgid "Bad command: %(command)s"
@@ -10838,7 +10862,7 @@ msgstr "
 
 #: bin/mailmanctl:344
 msgid "Warning!  You may encounter permission problems."
-msgstr "�ٹ�! �ѡ��ߥå��������꤬�Ф뤫�⤷��ޤ���."
+msgstr "�ٹ�! �ѡ��ߥå��������꤬�Ф뤫�⤷��ޤ���"
 
 #: bin/mailmanctl:353
 msgid "Shutting down Mailman's master qrunner"
@@ -10880,22 +10904,22 @@ msgid ""
 "\n"
 "If password is not given on the command line, it will be prompted for.\n"
 msgstr ""
-"ü���������Ϥ��뤳�Ȥ�, �����ȤΥѥ���ɤ����ꤹ��\n"
+"ü���������Ϥ��뤳�Ȥǡ������ȤΥѥ���ɤ����ꤹ��\n"
 "\n"
 "�����ȥѥ���ɤϥꥹ�Ȥδ����ԥѥ���ɤ�ꥹ�Ȳ���Υѥ���ɤ�\n"
-"�����, �ۤȤ�ɤξ��ǻȤ����Ȥ��Ǥ���.\n"
+"����ˡ��ۤȤ�ɤξ��ǻȤ����Ȥ��Ǥ��롣\n"
 "\n"
 "����ˡ: %(PROGRAM)s [���ץ����] [�ѥ����]\n"
 "\n"
 "    -c/--listcreator\n"
-"        �����ȥѥ���ɤǤʤ�, �ꥹ�Ⱥ����ԤΥѥ���ɤ����ꤹ��.\n"
-"        �ꥹ�Ⱥ����Ԥϥꥹ�Ȥ���������������븢�¤���Ĥ�, ������\n"
-"        �����Ԥλ�����ǽ�Ϥ���Ĥ櫓�ǤϤʤ�.\n"
+"        �����ȥѥ���ɤǤʤ����ꥹ�Ⱥ����ԤΥѥ���ɤ����ꤹ�롣\n"
+"        �ꥹ�Ⱥ����Ԥϥꥹ�Ȥ���������������븢�¤���Ĥ���������\n"
+"        �����Ԥλ�����ǽ�Ϥ���Ĥ櫓�ǤϤʤ���\n"
 "\n"
 "    -h/--help\n"
-"        ���Υإ�ץ�å�������ɽ�����ƽ�λ����.\n"
+"        ���Υإ�ץ�å�������ɽ�����ƽ�λ���롣\n"
 "\n"
-"�ѥ���ɤ����ޥ�ɥ饤���̵�����ˤ�, ���Ϥ�¥���ץ���ץȤ��Ф�.\n"
+"�ѥ���ɤ����ޥ�ɥ饤���̵�����ˤϡ����Ϥ�¥���ץ���ץȤ��Ф롣\n"
 
 #: bin/mmsitepass:73
 msgid "site"
@@ -10915,7 +10939,7 @@ msgstr "
 
 #: bin/mmsitepass:89
 msgid "Passwords do not match; no changes made."
-msgstr "�ѥ���ɤ����פ��ޤ���; �ѹ��Ǥ��ޤ���."
+msgstr "�ѥ���ɤ����פ��ޤ���; �ѹ��Ǥ��ޤ���"
 
 #: bin/mmsitepass:92
 msgid "Interrupted..."
@@ -10923,11 +10947,11 @@ msgstr "
 
 #: bin/mmsitepass:98
 msgid "Password changed."
-msgstr "�ѥ���ɤ��ѹ����ޤ���."
+msgstr "�ѥ���ɤ��ѹ����ޤ�����"
 
 #: bin/mmsitepass:100
 msgid "Password change failed."
-msgstr "�ѥ���ɤ��ѹ��˼���."
+msgstr "�ѥ���ɤ��ѹ��˼��ԡ�"
 
 #: bin/msgfmt.py:5
 msgid ""
@@ -10956,33 +10980,33 @@ msgid ""
 "    --version\n"
 "        Display version information and exit.\n"
 msgstr ""
-"ʿʸ������ʸ����Х��ʥ�Υ�å�����������������������.\n"
+"ʿʸ������ʸ����Х��ʥ�Υ�å����������������������롣\n"
 "\n"
 "���Υץ�������ʿʸ�� Uniforum ��������Υ�å������������� (.po �ե�����)\n"
-"����, �Х��ʥ�� GNU �������� (.mo �ե�����) ���Ѵ�����. ���Υץ�������\n"
-"��ǽ�ϴ���Ū�� GNU �� msgfmt �ץ�������Ʊ���Ǥ��뤬, ��ñ������Ƥ���.\n"
+"���顢�Х��ʥ�� GNU �������� (.mo �ե�����) ���Ѵ����롣���Υץ�������\n"
+"��ǽ�ϴ���Ū�� GNU �� msgfmt �ץ�������Ʊ���Ǥ��뤬����ñ������Ƥ��롣\n"
 "\n"
 "���ץ����:\n"
 "    -o �ե�����\n"
 "    --output-file=�ե�����\n"
 "        �񤭹�����ϥե��������ꤹ��. ��ά����� filename.mo \n"
-"        (���ϥե�����̾�򸵤ˤ���) �ˤʤ�.\n"
+"        (���ϥե�����̾�򸵤ˤ���) �ˤʤ롣\n"
 "\n"
 "    -h\n"
 "    --help\n"
-"        ���Υإ�ץ�å�������ɽ�����ƽ�λ����.\n"
+"        ���Υإ�ץ�å�������ɽ�����ƽ�λ���롣\n"
 "\n"
 "    -V\n"
 "    --version\n"
-"        �С������������Ϥ��ƽ�λ����.\n"
+"        �С������������Ϥ��ƽ�λ���롣\n"
 
 #: bin/msgfmt.py:49
 msgid "Add a non-fuzzy translation to the dictionary."
-msgstr "fuzzy�ޡ������Ĥ����Ƥ��ʤ���ʸ�򼭽���ɲ�."
+msgstr "fuzzy�ޡ������Ĥ����Ƥ��ʤ���ʸ�򼭽���ɲá�"
 
 #: bin/msgfmt.py:57
 msgid "Return the generated output."
-msgstr "�����������Ϥ��֤�."
+msgstr "�����������Ϥ��֤���"
 
 #: bin/newlist:20
 msgid ""
@@ -11081,81 +11105,81 @@ msgid ""
 "\n"
 "Note that listnames are forced to lowercase.\n"
 msgstr ""
-"���������̤��Ͽ�Υ᡼��󥰥ꥹ�Ȥ��������.\n"
+"���������̤��Ͽ�Υ᡼��󥰥ꥹ�Ȥ�������롣\n"
 "\n"
 "����ˡ: %(PROGRAM)s [���ץ����] [�ꥹ��̾ [�����ԥ��ɥ쥹 [�ѥ����]]]\n"
 "\n"
 "���ץ����:\n"
 "    -l ����\n"
 "    --language=����\n"
-"        �ꥹ�Ȥθ���� `����' �����ꤹ��. �����2ʸ���θ��쥳����\n"
-"        (�� _ �μ���2ʸ���ι񥳡���) ��ɽ�����.\n"
+"        �ꥹ�Ȥθ���� `����' �����ꤹ�롣�����2ʸ���θ��쥳����\n"
+"        (�� _ �μ���2ʸ���ι񥳡���) ��ɽ����롣\n"
 "\n"
 "    -u urlhost\n"
 "    --urlhost=urlhost\n"
-"        �ꥹ�ȤΥ����֥��󥿥ե������Υۥ���̾�����.\n"
+"        �ꥹ�ȤΥ����֥��󥿥ե������Υۥ���̾����ꡣ\n"
 "\n"
 "    -e emailhost\n"
 "    --emailhost=emailhost\n"
-"        �ꥹ�ȤΥ᡼��ɥᥤ�����ꤹ��.\n"
+"        �ꥹ�ȤΥ᡼��ɥᥤ�����ꤹ�롣\n"
 "\n"
 "    -q/--quiet\n"
-"        �̾�����Ԥˤ�(��ǧ�θ�)�᡼��ǥꥹ�Ⱥ��������Τ���. ����\n"
-"        ���ץ������դ���ȳ�ǧ�ȥ᡼�����Τ�Ԥ�ʤ�.\n"
+"        �̾�����Ԥˤ�(��ǧ�θ�)�᡼��ǥꥹ�Ⱥ��������Τ��롣����\n"
+"        ���ץ������դ���ȳ�ǧ�ȥ᡼�����Τ�Ԥ�ʤ���\n"
 "\n"
 "    -a/--automate\n"
-"        �����Ԥؤ��������γ�ǧ�Ԥ��򤻤������Τ���������. newlist ��\n"
+"        �����Ԥؤ��������γ�ǧ�Ԥ��򤻤������Τ��������롣 newlist ��\n"
 "        ���ޥ�ɥ饤��ˤ��Υ��ץ����ȥꥹ��̾�������ԥ��ɥ쥹��\n"
 "        �����ԥѥ���ɤΤ��٤Ƥ���ꤹ�뤳�Ȥǡ�newlist �������÷�����\n"
-"        �¹ԡ����Ĵ����Ԥؤ����Τ�Ԥʤ����Ȥ��Ǥ���.\n"
+"        �¹ԡ����Ĵ����Ԥؤ����Τ�Ԥʤ����Ȥ��Ǥ��롣\n"
 "\n"
 "    -h/--help\n"
-"        ���Υإ�ץ�å�������ɽ�����ƽ�λ����.\n"
+"        ���Υإ�ץ�å�������ɽ�����ƽ�λ���롣\n"
 "\n"
-"���ޥ�ɹԤˤϤ����ĤǤ�������¤٤뤳�Ȥ��Ǥ���. �⤷̵����, �ץ���ץ�\n"
-"���Ф����Ϥ��׵᤹��.\n"
+"���ޥ�ɹԤˤϤ����ĤǤ�������¤٤뤳�Ȥ��Ǥ��롣�⤷̵���ȡ��ץ���ץ�\n"
+"���Ф����Ϥ��׵᤹�롣\n"
 "\n"
-"Mailman �Υꥹ�ȤϤ��줾��2�ĤΥѥ�᡼��, �Ĥޤ�᡼�뤬�ФƹԤ��Ȥ���\n"
-"�ۥ���̾��, �����֥��󥿥ե������� URL ����äƤ���. Mailman �ν��\n"
-"�����Ԥ��Ȥ���, �ǥե���Ȥ����ꤵ���. ������, ʣ���β��� Mailman \n"
-"�����Ȥ���äƤ���Ȥ��ˤ�, ���Υǥե���ȤϺ�������ꥹ�Ȥ˹��ʤ�\n"
-"���⤷��ʤ�.\n"
+"Mailman �Υꥹ�ȤϤ��줾��2�ĤΥѥ�᡼�����Ĥޤ�᡼�뤬�ФƹԤ��Ȥ���\n"
+"�ۥ���̾�ȡ������֥��󥿥ե������� URL ����äƤ��롣Mailman �ν��\n"
+"�����Ԥ��Ȥ��ˡ��ǥե���Ȥ����ꤵ��롣��������ʣ���β��� Mailman \n"
+"�����Ȥ���äƤ���Ȥ��ˤϡ����Υǥե���ȤϺ�������ꥹ�Ȥ˹��ʤ�\n"
+"���⤷��ʤ���\n"
 "\n"
-"�ɥᥤ�����ꤹ�뤿���, �ꥹ��̾��ʲ��Τ褦�˻��ꤷ��, ���ޥ�ɤ�񤯤���"
+"�ɥᥤ�����ꤹ�뤿��ˡ��ꥹ��̾��ʲ��Τ褦�˻��ꤷ�ơ����ޥ�ɤ�񤯤���"
 "���Ǥ���:\n"
 "\n"
 "    newlist --urlhost=www.mydom.ain mylist\n"
 "\n"
-"������, `www.mydom.ain' �Ϥ��β��ۥꥹ�Ȥδ��ܥۥ���̾�Ǥ���.\n"
-"�Ĥޤ�, �ꥹ�Ȱ���Υڡ�����\n"
+"������, `www.mydom.ain' �Ϥ��β��ۥꥹ�Ȥδ��ܥۥ���̾�Ǥ��롣\n"
+"�Ĥޤꡢ�ꥹ�Ȱ���Υڡ�����\n"
 "    http://www.mydom.ain/mailman/listinfo\n"
-"�Ǹ��뤳�Ȥ��Ǥ����ΤȤ���. �ޤ�, www.mydom.ain �� mm_cfg.py/\n"
-"Defaults.py ������������� VIRTUAL_HOSTS �򻲾Ȥ���Τ˻��Ѥ����.\n"
-"��������᡼��Υۥ���̾����Ф����Ȥˤʤ�.\n"
+"�Ǹ��뤳�Ȥ��Ǥ����ΤȤ��롣�ޤ���www.mydom.ain �� mm_cfg.py/\n"
+"Defaults.py ������������� VIRTUAL_HOSTS �򻲾Ȥ���Τ˻��Ѥ���롣\n"
+"��������᡼��Υۥ���̾����Ф����Ȥˤʤ롣\n"
 "\n"
-"�⤷, �᡼��Υۥ���̾�� VIRTUAL_HOSTS �Ǽ��Ф�����ΤȰ㤨����,\n"
-"urlhost �� VIRTUAL_HOSTS ����Ͽ����Ƥ��ʤ����ˤ�, ���Τ褦�ˤ���\n"
+"�⤷���᡼��Υۥ���̾�� VIRTUAL_HOSTS �Ǽ��Ф�����ΤȰ㤨���ꡢ\n"
+"urlhost �� VIRTUAL_HOSTS ����Ͽ����Ƥ��ʤ����ˤϡ����Τ褦�ˤ���\n"
 "`emailhost' ����ꤹ�뤳�Ȥ��Ǥ���:\n"
 "\n"
 "    newlist --urlhost=www.mydom.ain --emailhost=mydom.ain mylist\n"
 "\n"
-"������, `mydom.ain' �ϥ᡼��Υɥᥤ��̾�Ǥ���. �⤷, emailhost ����ꤻ��\n"
-"���ۥۥ��ȥơ��֥����� urlhost ��̵�����, mm_cfg.DEFAULT_EMAIL_HOST ��\n"
-"�᡼�륤�󥿥ե������˻Ȥ�.\n"
+"�����ǡ�`mydom.ain' �ϥ᡼��Υɥᥤ��̾�Ǥ��롣�⤷��emailhost ����ꤻ��\n"
+"���ۥۥ��ȥơ��֥����� urlhost ��̵����С�mm_cfg.DEFAULT_EMAIL_HOST ��\n"
+"�᡼�륤�󥿥ե������˻Ȥ���\n"
 "\n"
-"�ߴ����Τ���, �ꥹ��̾��ʲ��Τ褦�ˤ��ƿ������ꥹ�Ȥ�������뤳�Ȥ�Ǥ���:\n"
+"�ߴ����Τ��ᡢ�ꥹ��̾��ʲ��Τ褦�ˤ��ƿ������ꥹ�Ȥ�������뤳�Ȥ�Ǥ���:\n"
 "\n"
 "    mylist@www.mydom.ain\n"
 "\n"
-"������, www.mydom.ain �� `urlhost' �˻��Ѥ���, �ޤ����ۥۥ��ȥơ��֥��\n"
-"���줬�ʤ����, `emailhost' �ˤ���Ѥ����. `--urlhost' �� `--emailhost'��\n"
-"���꤬ͥ�褵��뤳�Ȥ�����.\n"
+"�����ǡ�www.mydom.ain �� `urlhost' �˻��Ѥ��졢�ޤ����ۥۥ��ȥơ��֥��\n"
+"���줬�ʤ���С�`emailhost' �ˤ���Ѥ���롣 `--urlhost' �� `--emailhost'��\n"
+"���꤬ͥ�褵��뤳�Ȥ����ա�\n"
 "\n"
-"�⤷, �ꥹ��̾�������� `mylist' ���ä���, �᡼��ۥ���̾��URL�Ϥ��줾��\n"
+"�⤷���ꥹ��̾�������� `mylist' ���ä��顢�᡼��ۥ���̾��URL�Ϥ��줾��\n"
 "Defaults.py �ޤ��� mm_cfg.py �� DEFAULT_EMAIL_HOST �� DEFAULT_URL\n"
-"(DEFAULT_URL_PATTERN �ؤ������ߤ�����) ���Ȥ���.\n"
+"(DEFAULT_URL_PATTERN �ؤ������ߤ�����) ���Ȥ��롣\n"
 "\n"
-"�ꥹ��̾�Ͼ�ʸ�����Ѵ������.\n"
+"�ꥹ��̾�Ͼ�ʸ�����Ѵ�����롣\n"
 
 #: bin/newlist:162
 msgid "Unknown language: %(lang)s"
@@ -11255,13 +11279,13 @@ msgid ""
 "Note also that this script should be started up from mailmanctl as a normal\n"
 "operation.  It is only useful for debugging if it is run separately.\n"
 msgstr ""
-"�ҤȤĤޤ��Ϥ���ʾ�� qrunner ��, ���٤ޤ��Ϸ����֤��¹Ԥ���.\n"
+"�ҤȤĤޤ��Ϥ���ʾ�� qrunner �򡢰��٤ޤ��Ϸ����֤��¹Ԥ��롣\n"
 "\n"
-"���ꤵ�줿�� runner �Υ��饹���饦��ɥ��ӥ�Ǽ¹Ԥ����. \n"
-"�Ĥޤ�, �ǽ�˻��ꤵ�줿 runner �����Υǥ��쥯�ȥ�ˤ���ե�����򤹤٤�\n"
-"��������. ���� qrunner �������򽪤��, ���� qrunner �����Υǥ��쥯�ȥ�\n"
-"�ˤ���ե�����������, ����˼����¹Ԥ����. �����֤��β����, ���ޥ�\n"
-"�ɹԤǻ���Ǥ���.\n"
+"���ꤵ�줿�� runner �Υ��饹���饦��ɥ��ӥ�Ǽ¹Ԥ���롣\n"
+"�Ĥޤꡢ�ǽ�˻��ꤵ�줿 runner �����Υǥ��쥯�ȥ�ˤ���ե�����򤹤٤�\n"
+"�������롣���� qrunner �������򽪤�ȡ����� qrunner �����Υǥ��쥯�ȥ�\n"
+"�ˤ���ե�����������������˼����¹Ԥ���롣�����֤��β���ϡ����ޥ�\n"
+"�ɹԤǻ���Ǥ��롣\n"
 "\n"
 "����ˡ: %(PROGRAM)s [���ץ����]\n"
 "\n"
@@ -11269,43 +11293,43 @@ msgstr ""
 "\n"
 "    -r runner[:���饤��:�ϰ�]\n"
 "    --runner=runner[:���饤��:�ϰ�]\n"
-"        ���ꤵ�줿 qrunner ��ư����. ����˻Ȥ�̾���� -l ���ץ�����\n"
-"        ɽ�������. ���ץ����� ���饤��:�ϰ� �ϰ�ĤΥ��塼(�Ԥ�����)��\n"
-"        ʣ���� qrunner �ץ������������Ƥ���˻��Ѥ���. �ϰϤϤ��Υ��塼\n"
-"        �˳�����Ƥ��� qrunner �ι�׿���, ���饤���� [0..�ϰ�] �δ֤�\n"
-"        ���� qrunner ���ֹ�Ǥ���.\n"
+"        ���ꤵ�줿 qrunner ��ư���롣����˻Ȥ�̾���� -l ���ץ�����\n"
+"        ɽ������롣���ץ����� ���饤��:�ϰ� �ϰ�ĤΥ��塼(�Ԥ�����)��\n"
+"        ʣ���� qrunner �ץ������������Ƥ���˻��Ѥ��롣�ϰϤϤ��Υ��塼\n"
+"        �˳�����Ƥ��� qrunner �ι�׿��ǡ����饤���� [0..�ϰ�] �δ֤�\n"
+"        ���� qrunner ���ֹ�Ǥ��롣\n"
 "\n"
-"        ���饤��:�ϰϤ���ꤹ�����, ��ư����뤽�줾��� qrunner ��\n"
-"        Ʊ���ϰ��ͤ���Ĥ褦�����դ��뤳��. ���饤��:�ϰϤ����ꤵ���\n"
-"        ����� 1:1 ���Ȥ���.\n"
+"        ���饤��:�ϰϤ���ꤹ����ϡ���ư����뤽�줾��� qrunner ��\n"
+"        Ʊ���ϰ��ͤ���Ĥ褦�����դ��뤳�ȡ����饤��:�ϰϤ����ꤵ���\n"
+"        ����� 1:1 ���Ȥ��롣\n"
 "\n"
-"        -r ���ץ�����ʣ�����ꤹ�뤳�Ȥ��Ǥ���. ���ξ��, �� qrunner ��\n"
-"        �饦��ɥ��ӥ�Ǽ¹Ԥ����. `All' �Ȥ���̾�������̤� runner ��,\n"
-"        -l ���ץ�����ɽ������뤹�٤Ƥ�runner��ư���뤳�Ȥ��̣����.\n"
+"        -r ���ץ�����ʣ�����ꤹ�뤳�Ȥ��Ǥ��롣���ξ�硢�� qrunner ��\n"
+"        �饦��ɥ��ӥ�Ǽ¹Ԥ���롣`All' �Ȥ���̾�������̤� runner �ϡ�\n"
+"        -l ���ץ�����ɽ������뤹�٤Ƥ�runner��ư���뤳�Ȥ��̣���롣\n"
 "\n"
 "    -once\n"
 "    -o\n"
-"        qrunner ��1��¹Ԥ���. ���Υ��ץ������ά�����, �ץ������� \n"
-"        SIGTERM �ޤ��� SIGINT ���������ޤ�̵�¤˼¹Ԥ����.\n"
+"        qrunner ��1��¹Ԥ��롣���Υ��ץ������ά����ȡ��ץ�������\n"
+"        SIGTERM �ޤ��� SIGINT ���������ޤ�̵���¤˼¹Ԥ���롣\n"
 "\n"
 "    -l/--list\n"
-"        ¸�ߤ��� qrunner ��̾����ɽ�����ƽ�λ����.\n"
+"        ¸�ߤ��� qrunner ��̾����ɽ�����ƽ�λ���롣\n"
 "\n"
 "    -v/--verbose\n"
-"        logs/qrunner �����ե�����˥ǥХå������񤭽Ф�.\n"
+"        logs/qrunner �����ե�����˥ǥХå������񤭽Ф���\n"
 "\n"
 "    -s/--subproc\n"
-"        mailmanctl �ε�ư������ץȤ��� qrunner ��¹Ԥ���Ȥ��˻Ȥ�.\n"
-"        ���顼��λ����ư��򤳤����Ȥߤ˹�碌��.\n"
+"        mailmanctl �ε�ư������ץȤ��� qrunner ��¹Ԥ���Ȥ��˻Ȥ���\n"
+"        ���顼��λ����ư��򤳤����Ȥߤ˹�碌�롣\n"
 "\n"
 "    -h/--help\n"
-"        ���Υ�å���������Ϥ��ƽ�λ����.\n"
+"        ���Υ�å���������Ϥ��ƽ�λ���롣\n"
 "\n"
-"-l �ޤ��� -h ����ꤹ��������, runner ��ɬ�ܤǤ���. �ޤ������ -l \n"
-"�����å���ɽ�������̾���Τɤ줫�Ǥʤ���Фʤ�ʤ�. \n"
+"-l �ޤ��� -h ����ꤹ����������runner ��ɬ�ܤǤ��롣�ޤ������ -l \n"
+"�����å���ɽ�������̾���Τɤ줫�Ǥʤ���Фʤ�ʤ���\n"
 "\n"
-"���Υ�����ץȤ��̾� mailmanctl ���鵯ư����뤳�Ȥ����ա����̤˼¹�\n"
-"������ϥǥХå���ͭ���ʾ��Ǥ��롣\n"
+"���Υ�����ץȤ��̾� mailmanctl ���鵯ư�����٤���ΤǤ��뤳�Ȥ��յ�\n"
+"���Ƥ��������̤˼¹Ԥ��뤳�Ȥ�ͭ�פʤΤϥǥХå���Ԥ��������Ǥ��롣\n"
 
 #: bin/qrunner:178
 msgid "%(name)s runs the %(runnername)s qrunner"
@@ -11317,7 +11341,7 @@ msgstr "All 
 
 #: bin/qrunner:215
 msgid "No runner name given."
-msgstr "runner ̾������ޤ���."
+msgstr "runner ̾������ޤ���"
 
 #: bin/rb-archfix:21
 msgid ""
@@ -11360,16 +11384,16 @@ msgstr ""
 "\n"
 "Mailman 2.1.3 ������ -article �ǡ����١����ե������, html_body\n"
 "°���������¸��ˤ�������. ����°���ϥ��꡼�����̤˾���\n"
-"����椨��ȯ�ʥꥹ�ȤǤ���ǽ�˱ƶ������ǽ��������.\n"
+"����椨��ȯ�ʥꥹ�ȤǤ���ǽ�˱ƶ������ǽ�������롣\n"
 "\n"
 "��:\n"
 "%% ls -1 archives/private/*/database/*-article | xargs %(PROGRAM)s\n"
 "\n"
 "���Υ�����ץȤ�¹Ԥ������ `bin/check_perms -f' ��¹Ԥ��뤳��\n"
 "\n"
-"�ޤ�, ��̤��褱��� -article.bak �ե������������Ȥ褤\n"
+"�ޤ�����̤��褱��� -article.bak �ե������������Ȥ褤\n"
 "\n"
-"���Υ�����ץȤ��ص��Τ�����󶡤���Ƥ���, ���ݡ��ȤϤʤ�\n"
+"���Υ�����ץȤ��ص��Τ�����󶡤���Ƥ��ꡢ���ݡ��ȤϤ��ʤ�\n"
 
 #: bin/remove_members:20
 msgid ""
@@ -11415,7 +11439,7 @@ msgid ""
 "\n"
 "    addr1 ... are additional addresses to remove.\n"
 msgstr ""
-"�ꥹ�Ȥ�������������.\n"
+"�ꥹ�Ȥ������������롣\n"
 "\n"
 "����ˡ:\n"
 "    remove_members [���ץ����] [�ꥹ��̾] [���ɥ쥹1 ...]\n"
@@ -11424,37 +11448,37 @@ msgstr ""
 "\n"
 "    --file=�ե�����\n"
 "    -f �ե�����\n"
-"        �ե�����˽񤫤�Ƥ��������ɥ쥹��������. �ե�����̾��\n"
-"        `-' ����ꤹ���, ɸ�����Ϥ����ɤ߹��ޤ��.\n"
+"        �ե�����˽񤫤�Ƥ��������ɥ쥹�������롣�ե�����̾��\n"
+"        `-' ����ꤹ��ȡ�ɸ�����Ϥ����ɤ߹��ޤ�롣\n"
 "\n"
 "    --all\n"
 "    -a\n"
-"        �᡼��󥰥ꥹ�Ȥβ���򤹤٤ƺ������.\n"
-"        (--fromall �Ȥ�Ʊ���˻��ѤǤ��ʤ�.)\n"
+"        �᡼��󥰥ꥹ�Ȥβ���򤹤٤ƺ�����롣\n"
+"        (--fromall �Ȥ�Ʊ���˻��ѤǤ��ʤ���)\n"
 "\n"
 "    --fromall\n"
-"        ���ɥ쥹�β���򤳤Υ����ƥ�Τ��٤ƤΥꥹ�Ȥ���������.\n"
-"        ���ۥɥᥤ������оݤȤʤ�. ���Υ��ץ����� -a/--all\n"
-"        ��Ʊ���˻��ꤹ�뤳�ȤϤǤ��ʤ�. �ޤ�, ���Υ��ץ��������\n"
-"        �����Ȥ���, �ꥹ��̾����ꤷ�ƤϤ����ʤ�.\n"
+"        ���ɥ쥹�β���򤳤Υ����ƥ�Τ��٤ƤΥꥹ�Ȥ��������롣\n"
+"        ���ۥɥᥤ������оݤȤʤ롣���Υ��ץ����� -a/--all\n"
+"        ��Ʊ���˻��ꤹ�뤳�ȤϤǤ��ʤ����ޤ������Υ��ץ��������\n"
+"        �����Ȥ��ϡ��ꥹ��̾����ꤷ�ƤϤ����ʤ���\n"
 "\n"
 "    --nouserack\n"
 "    -n\n"
-"        ����˳�ǧ���Υ᡼�������ʤ�. ���Υ��ץ������ά�����,\n"
-"        �ꥹ�Ȥδ����ͤ��Ȥ���.\n"
+"        ����˳�ǧ���Υ᡼�������ʤ������Υ��ץ������ά����ȡ�\n"
+"        �ꥹ�Ȥδ����ͤ��Ȥ��롣\n"
 "\n"
 "    --noadminack\n"
 "    -N\n"
-"        �����Ԥ˳�ǧ���Υ᡼�������ʤ�. ���Υ��ץ������ά�����,\n"
-"        �ꥹ�Ȥδ����ͤ��Ȥ���.\n"
+"        �����Ԥ˳�ǧ���Υ᡼�������ʤ������Υ��ץ������ά����ȡ�\n"
+"        �ꥹ�Ȥδ����ͤ��Ȥ��롣\n"
 "\n"
 "    --help\n"
 "    -h\n"
-"        ���Υإ�ץ�å�������ɽ�����ƽ�λ����\n"
+"        ���Υإ�ץ�å�������ɽ�����ƽ�λ���롣\n"
 "\n"
-"    �ꥹ��̾�ϻ��Ѥ���᡼��󥰥ꥹ�Ȥ�̾��.\n"
+"    �ꥹ��̾�ϻ��Ѥ���᡼��󥰥ꥹ�Ȥ�̾����\n"
 "\n"
-"    ���ɥ쥹1 ... �Ϻ������᡼�륢�ɥ쥹.\n"
+"    ���ɥ쥹1 ... �Ϻ������᡼�륢�ɥ쥹��\n"
 "\n"
 
 #: bin/remove_members:156
@@ -11463,7 +11487,7 @@ msgstr "
 
 #: bin/remove_members:163
 msgid "Error opening list %(listname)s... skipping."
-msgstr "%(listname)s �ꥹ�Ȥ����顼�dz����ޤ���, ���Ф��ޤ�."
+msgstr "%(listname)s �ꥹ�Ȥ����顼�dz����ޤ���... ���Ф��ޤ���"
 
 #: bin/remove_members:173
 msgid "No such member: %(addr)s"
@@ -11492,20 +11516,20 @@ msgid ""
 "    -v / --verbose\n"
 "        Print what the script is doing.\n"
 msgstr ""
-"�᡼��󥰥ꥹ�Ȥ�������Υѥ���ɤ�����ꤷ�ޤ�.\n"
+"�᡼��󥰥ꥹ�Ȥ�������Υѥ���ɤ�����ꤷ�ޤ���\n"
 "\n"
 "���Υ�����ץȤϻ��ꤷ���᡼��󥰥ꥹ�Ȥ�������Υѥ���ɤ������\n"
-"���ޤ�. ���ꥹ�Ȥ�������Υѥ�����ѹ��ˤ���ѤǤ��ޤ�. ������, �ѥ��"
+"���ޤ������ꥹ�Ȥ�������Υѥ�����ѹ��ˤ���ѤǤ��ޤ������������ѥ��"
 "��\n"
-"���ѹ����줿���Ȥ��������Τ���Τ�, ���ʤ������ܤȤʤ�ޤ�.\n"
+"���ѹ����줿���Ȥ��������Τ���Τϡ����ʤ������ܤȤʤ�ޤ���\n"
 "\n"
-"���Υ�����ץȤ� bin/withlist �β��Ǽ¹Ԥ��뤳�Ȥ����ꤷ�Ƥ��ޤ�. �Ĥޤ�,\n"
+"���Υ�����ץȤ� bin/withlist �β��Ǽ¹Ԥ��뤳�Ȥ����ꤷ�Ƥ��ޤ����Ĥޤꡢ\n"
 "\n"
 "% bin/withlist -l -r reset_pw �ꥹ��̾ [���ץ����]\n"
 "\n"
 "���ץ����:\n"
 "    -v / --verbose\n"
-"        ������ץȤ����򤷤Ƥ��뤫����Ϥ���.\n"
+"        ������ץȤ����򤷤Ƥ��뤫����Ϥ��롣\n"
 
 #: bin/reset_pw.py:77
 msgid "Changing passwords for list: %(listname)s"
@@ -11538,8 +11562,9 @@ msgid ""
 msgstr ""
 "�᡼��󥰥ꥹ�Ȥ������� (������) - ����!\n"
 "\n"
-"����ϥ᡼��󥰥ꥹ�Ȥκ��פ�(�ۤ�)�����õ��. �ǥե���ȤǤ�,\n"
-"�ꥹ�Ȥ���¸��ˤϺ������ʤ�. �Ť��ꥹ�Ȥ�꥿����������ˤϽ�ʬ�Ǥ���.\n"
+"����ϥ᡼��󥰥ꥹ�Ȥκ��פ�(�ۤ�)�����õ�롣�ǥե���ȤǤϡ�\n"
+"�ꥹ�Ȥ���¸��ˤϺ�����ʤ������Ť��ꥹ�Ȥ��ѻߤ���ΤˤϽ�ʬ�ꤴ���Ǥ�"
+"�롣\n"
 "\n"
 "����ˡ:\n"
 "    rmlist [-a] [-h] �ꥹ��̾\n"
@@ -11547,12 +11572,12 @@ msgstr ""
 "������:\n"
 "    --archives\n"
 "    -a\n"
-"        �ꥹ�Ȥ���¸��ˤ�������, �ޤ��ϴ��˥ꥹ�Ȥ��������Ƥ����\n"
-"        �ĤäƤ�����¸��ˤ�������.\n"
+"        �ꥹ�Ȥ���¸��ˤ������롢�ޤ��ϴ��˥ꥹ�Ȥ��������Ƥ����\n"
+"        �ĤäƤ�����¸��ˤ������롣\n"
 "\n"
 "    --help\n"
 "    -h\n"
-"        ���Υإ�ץ�å���������Ϥ��ƽ�λ����.\n"
+"        ���Υإ�ץ�å���������Ϥ��ƽ�λ���롣\n"
 "\n"
 
 #: bin/rmlist:73 bin/rmlist:76
@@ -11565,15 +11590,15 @@ msgstr "%(listname)s %(msg)s 
 
 #: bin/rmlist:105
 msgid "No such list (or list already deleted): %(listname)s"
-msgstr "%(listname)s �Ȥ����ꥹ�ȤϤ���ޤ��� (����, ���˺������Ƥ��ޤ�)."
+msgstr "%(listname)s �Ȥ����ꥹ�ȤϤ���ޤ��� (����, ���˺������Ƥ��ޤ�)��"
 
 #: bin/rmlist:108
 msgid "No such list: %(listname)s.  Removing its residual archives."
-msgstr "%(listname)s �Ȥ����ꥹ�ȤϤ���ޤ���. �Ĥ��줿��¸��ˤ������ޤ�."
+msgstr "%(listname)s �Ȥ����ꥹ�ȤϤ���ޤ��󡣻Ĥ��줿��¸��ˤ������ޤ���"
 
 #: bin/rmlist:112
 msgid "Not removing archives.  Reinvoke with -a to remove them."
-msgstr "��¸��ˤϺ�����ޤ���. �������ˤ� -a ��Ĥ��Ƥ⤦����"
+msgstr "��¸��ˤϺ�����ޤ��󡣺������ˤ� -a ��Ĥ��Ƥ⤦����"
 
 #: bin/rmlist:126
 msgid "list info"
@@ -11611,17 +11636,17 @@ msgid ""
 "\n"
 "Example: show_qfiles qfiles/shunt/*.pck\n"
 msgstr ""
-"Mailman �� qfiles �ˤ���᡼������Ƥ�ɽ������.\n"
+"Mailman �� qfiles �ˤ���᡼������Ƥ�ɽ�����롣\n"
 "\n"
 "����ˡ: show_qfiles [���ץ����] ���塼�ե����� ...\n"
 "\n"
 "���ץ����:\n"
 "\n"
 "    -q / --quiet\n"
-"        �᡼��ζ��ڤ�򼨤������å���������Ϥ��ʤ�.\n"
+"        �᡼��ζ��ڤ�򼨤������å���������Ϥ��ʤ���\n"
 "\n"
 "    -h / --help\n"
-"        ���Υإ�ץ�å���������Ϥ��ƽ�λ����.\n"
+"        ���Υإ�ץ�å���������Ϥ��ƽ�λ���롣\n"
 "\n"
 "��: show_qfiles qfiles/shunt/*.pck\n"
 
@@ -11693,13 +11718,13 @@ msgid ""
 "    listname\n"
 "        Required.  This specifies the list to synchronize.\n"
 msgstr ""
-"�ꥹ�Ȥβ����ʿʸ�Υե������Ʊ��������.\n"
+"�ꥹ�Ȥβ����ʿʸ�Υե������Ʊ�������롣\n"
 "\n"
 "���Υ�����ץȤ�, sendmail �� :include: �����Υ��ɥ쥹�ꥹ��(�����\n"
-"Majordomo �Ǥ���Ѥ���Ƥ���) ��Ȥ���������ͭ���Ǥ���. �᡼���\n"
-"�ꥹ�Ȥ���Ͽ����Ƥ��ʤ��ե�����Υ��ɥ쥹���ɲä���, �ե������\n"
-"���äƤ��ʤ��ꥹ�Ȳ���Ϻ�������. ¾�Υ��ץ����ǥ��ɥ쥹���ɲ�\n"
-"�ޤ��Ϻ�������Ȥ��˲��������뤫�����椹��.\n"
+"Majordomo �Ǥ���Ѥ���Ƥ���) ��Ȥ���������ͭ���Ǥ��롣�᡼���\n"
+"�ꥹ�Ȥ���Ͽ����Ƥ��ʤ��ե�����Υ��ɥ쥹���ɲä��졢�ե������\n"
+"���äƤ��ʤ��ꥹ�Ȳ���Ϻ������롣¾�Υ��ץ����ǥ��ɥ쥹���ɲ�\n"
+"�ޤ��Ϻ�������Ȥ��˲��������뤫�����椹�롣\n"
 "\n"
 "����ˡ: %(PROGRAM)s [���ץ����] -f �ե����� �ꥹ��̾\n"
 "\n"
@@ -11707,48 +11732,49 @@ msgstr ""
 "\n"
 "    --no-change\n"
 "    -n\n"
-"        �ºݤˤ��ѹ���Ԥ�ʤ�. �����, �ɤΤ褦���ѹ������뤫��\n"
-"        ɽ������.\n"
+"        �ºݤˤ��ѹ���Ԥ�ʤ�������ˡ��ɤΤ褦���ѹ������뤫��\n"
+"        ɽ�����롣\n"
 "\n"
 "    --welcome-msg[=<yes|no>]\n"
 "    -w[=<yes|no>\n"
-"        ��������Ͽ���줿����˴��ޥ᡼���Ф����ɤ��������ꤹ��.\n"
-"        �����, �ꥹ�Ȥ� `send_welcome_msg' ��������񤭤���.\n"
-"        -w=yes �ޤ��� -w �Ǵ��ޥ᡼���Ф�. -w=no �Ǥϥ᡼���\n"
-"        �Ф��ʤ�.\n"
+"        ��������Ͽ���줿����˴��ޥ᡼���Ф����ɤ��������ꤹ�롣\n"
+"        �ꥹ�Ȥ� `send_welcome_msg' �����꤬�ɤΤ褦�ˤʤäƤ��Ƥ�\n"
+"        ���Υ��ץ����������ͥ�褷��-w=yes �ޤ��� -w �Ǵ��ޥ᡼��\n"
+"        �����-w=no\n"
+" �Ǥϴ��ޥ᡼��ϽФ��ʤ���\n"
 "\n"
 "    --goodby-msg[=<yes|no>]\n"
 "    -g[=<yes|no>\n"
-"        ������줿����ˤ��̤�Υ᡼���Ф����ɤ��������ꤹ��.\n"
-"        �����, �ꥹ�Ȥ� `send_goodbye_msg' ��������񤭤���.\n"
-"        -g=yes �ޤ��� -g �Ǥ��̤�᡼���Ф�. -g=no �ǥ᡼���\n"
-"        �Ф��ʤ�.\n"
+"        ������줿����ˤ��̤�Υ᡼���Ф����ɤ��������ꤹ�롣\n"
+"        �ꥹ�Ȥ� `send_goodbye_msg' �����꤬�ɤΤ褦�ˤʤäƤ��Ƥ�\n"
+"        ���Υ��ץ����������ͥ�褷��-g=yes �ޤ��� -g �Ǥ��̤�᡼\n"
+"        ���Ф���-g=no �Ǥ��̤�᡼��ϽФ��ʤ���\n"
 "\n"
 "    --digest[=<yes|no>]\n"
 "    -g[=<yes|no>]\n"
-"        ��������Ͽ���줿�����ޤȤ��ɤ߲���Ȥ��뤫�ɤ��������.\n"
-"        -d=yes �ޤ��� -d �ǤޤȤ��ɤ߲���Ȥʤ�. -d=no ��(���뤤��\n"
-"        -d ���ץ������դ��ʤ���) �̾����Ȥʤ�.\n"
+"        ��������Ͽ���줿�����ޤȤ��ɤ߲���Ȥ��뤫�ɤ�������롣\n"
+"        -d=yes �ޤ��� -d �ǤޤȤ��ɤ߲���Ȥʤ롣-d=no ��(���뤤��\n"
+"        -d ���ץ������դ��ʤ���) �̾����Ȥʤ롣\n"
 "\n"
 "    --notifyadmin[=<yes|no>]\n"
 "    -a[=<yes|no>]\n"
-"        �������η�̤�ҤȤĤ��Ĵ����Ԥ����Τ��뤫�ɤ��������.\n"
-"        �⤷, �����Υ��ɥ쥹����Ͽ���Ƥ���ʤ�, ���Τ��ʤ��ۤ����褤!\n"
-"        -a=yes �ޤ��� -a �Ǵ����Ԥ����Τ���. -a=no �����Τ��ʤ�.\n"
-"        -a ���ץ����̵�����, �ꥹ�ȤΥǥե���Ȥ���Ѥ���.\n"
+"        �������η�̤��鷺�Ĵ����Ԥ����Τ��뤫�ɤ�������롣\n"
+"        �⤷�������Υ��ɥ쥹����Ͽ���Ƥ���ʤ顢���Τ��ʤ��ۤ����褤!\n"
+"        -a=yes �ޤ��� -a �Ǵ����Ԥ����Τ��롣-a=no �����Τ��ʤ���\n"
+"        -a ���ץ����̵����硢�ꥹ�ȤΥǥե���Ȥ���Ѥ��롣\n"
 "\n"
 "    --file <�ե�����̾ | ->\n"
 "    -f <�ե�����̾ | ->\n"
-"        ���Υ��ץ�����ɬ��. Ʊ����������ʿʸ�ե��������ꤹ��.\n"
-"        �᡼�륢�ɥ쥹�� 1�Ԥ� 1�Ĥ��ĤȤ���. �ե�����̾�� `-' ��\n"
+"        ���Υ��ץ�����ɬ�ܡ�Ʊ����������ʿʸ�ե��������ꤹ�롣\n"
+"        �᡼�륢�ɥ쥹�� 1�Ԥ� 1�Ĥ��ĤȤ��롣�ե�����̾�� `-' ��\n"
 "        ���ˤ�ɸ�����Ϥ��Ȥ���.\n"
 "\n"
 "    --help\n"
 "    -h\n"
-"        ���Υ�å�������ɽ������.\n"
+"        ���Υ�å�������ɽ�����롣\n"
 "\n"
 "    �ꥹ��̾\n"
-"        ɬ��. Ʊ������ꥹ�Ȥ����.\n"
+"        ɬ�ܡ�Ʊ������ꥹ�Ȥ���ꡣ\n"
 
 #: bin/sync_members:115
 msgid "Bad choice: %(yesno)s"
@@ -11792,7 +11818,7 @@ msgstr "̵
 
 #: bin/sync_members:215
 msgid "You must fix the preceding invalid addresses first."
-msgstr "�ޤ�, ̵���ʥ��ɥ쥹�������Ƥ�������."
+msgstr "�ޤ���̵���ʥ��ɥ쥹�������Ƥ���������"
 
 #: bin/sync_members:264
 msgid "Added  : %(s)s"
@@ -11818,8 +11844,8 @@ msgid ""
 "to ask for a brief summary.\n"
 msgstr ""
 "\n"
-"Mailman������������å�����. ����������ѿ��ȥ��������ܤ��ѿ���\n"
-"�����˰��פ��뤫�ɤ�����Ĵ�٤�.\n"
+"Mailman������������å����롣����������ѿ��ȥ��������ܤ��ѿ���\n"
+"�����˰��פ��뤫�ɤ�����Ĵ�٤롣\n"
 "\n"
 "����ˡ:\n"
 "\n"
@@ -11827,7 +11853,7 @@ msgstr ""
 "%(program)s [-q] <����>\n"
 "\n"
 "������, <����>�ϸ��쥳����(���Ȥ��� 'it' �ϥ����ꥢ��) -q ��û������\n"
-"���Ϥ��׵᤹��.\n"
+"���Ϥ��׵᤹�롣\n"
 
 #: bin/transcheck:58
 msgid "check a translation comparing with the original string"
@@ -11871,7 +11897,7 @@ msgstr ""
 msgid ""
 "check a translated template against the original one\n"
 "       search also <MM-*> tags if html is not zero"
-msgstr "�����ƥ�ץ졼�Ȥ��ܤ����. html �ξ��� <MM-*> �����⸡��"
+msgstr "�����ƥ�ץ졼�Ȥ��ܤ���ӡ�html �ξ��� <MM-*> �����⸡��"
 
 #: bin/transcheck:327
 msgid "scan the po file comparing msgids with msgstrs"
@@ -11893,25 +11919,25 @@ msgid ""
 "shunted to begin with.  For example, running unshunt on qfiles/out/\n"
 "will result in losing all the messages in that queue.\n"
 msgstr ""
-"�᡼��� shunt ���塼���鸵�Υ��塼�˰�ư����.\n"
+"�᡼��� shunt ���塼���鸵�Υ��塼�˰�ư���롣\n"
 "\n"
 "����ˡ: %(PROGRAM)s [���ץ����] [�ǥ��쥯�ȥ�]\n"
 "\n"
 "������:\n"
 "\n"
 "    -h / --help\n"
-"        �إ�פ�ɽ�����ƽ�λ.\n"
+"        �إ�פ�ɽ�����ƽ�λ��\n"
 "\n"
-"�ǥ��쥯�ȥ����ꤹ��� qfiles/shunt �ʳ��Υǥ��쥯�ȥ꤫���ư����.\n"
-"*** �ٹ� *** shunt ���줿�ΤǤϤʤ��᡼��� unshunt ���ƤϤ����ޤ���.\n"
-"�㤨��, qfiles/out �Υ᡼��� unshunt ����ȥ᡼�뤬�ä��Ƥ��ޤ��ޤ�.\n"
+"�ǥ��쥯�ȥ����ꤹ��� qfiles/shunt �ʳ��Υǥ��쥯�ȥ꤫���ư���롣\n"
+"*** �ٹ� *** shunt ���줿�ΤǤϤʤ��᡼��� unshunt ���ƤϤ����ޤ���\n"
+"�㤨�С�qfiles/out �Υ᡼��� unshunt ����ȥ᡼�뤬�ä��Ƥ��ޤ��ޤ���\n"
 
 #: bin/unshunt:85
 msgid ""
 "Cannot unshunt message %(filebase)s, skipping:\n"
 "%(e)s"
 msgstr ""
-"%(filebase)s �᡼��ե������ unshunt �Ǥ��ޤ���. ���Ф��ޤ�:\n"
+"%(filebase)s �᡼��ե������ unshunt �Ǥ��ޤ������Ф��ޤ�:\n"
 "%(e)s"
 
 #: bin/update:20
@@ -11933,21 +11959,21 @@ msgid ""
 "Use this script to help you update to the latest release of Mailman from\n"
 "some previous version.  It knows about versions back to 1.0b4 (?).\n"
 msgstr ""
-"ɬ�פʥ��åץ��졼�ɤ�Ԥ�.\n"
+"ɬ�פʥ��åץ��졼�ɤ�Ԥ���\n"
 "\n"
 "����ˡ: %(PROGRAM)s [���ץ����]\n"
 "\n"
 "���ץ����:\n"
 "    -f/--force\n"
-"        ����Ū�˥��åץ��졼�ɤν�����Ԥ�. �̾��, �⤷���󥹥ȡ���\n"
-"        ���줿 Mailman �ΥС�����󤬸��ߤΤ�Τ��Ѥ�ʤ����, (����\n"
-"        �����󥰥졼�ɤ����Τ��줿��) ����Ԥ��ʤ�.\n"
+"        ����Ū�˥��åץ��졼�ɤν�����Ԥ����̾�ϡ��⤷���󥹥ȡ���\n"
+"        ���줿 Mailman �ΥС�����󤬸��ߤΤ�Τ��Ѥ�ʤ���С�(����\n"
+"        �����󥰥졼�ɤ����Τ��줿��) ����Ԥ��ʤ���\n"
 "\n"
 "    -h/--help\n"
-"        ���Υƥ����Ȥ�ɽ�����ƽ�λ����.\n"
+"        ���Υƥ����Ȥ�ɽ�����ƽ�λ���롣\n"
 "\n"
-"�����ΥС�����󤫤�ǿ���Mailman��꡼���˹�������Ȥ���, ���Υ�����ץ�\n"
-"��¹Ԥ���. ����� 1.0b4 �ޤǤΥС��������ΤäƤ���.\n"
+"�����ΥС�����󤫤�ǿ���Mailman��꡼���˹�������Ȥ��ϡ����Υ�����ץ�\n"
+"��¹Ԥ��롣����� 1.0b4 �ޤǤΥС��������ΤäƤ��롣\n"
 
 #: bin/update:107
 msgid "Fixing language templates: %(listname)s"
@@ -11970,8 +11996,8 @@ msgid ""
 "For some reason, %(mbox_dir)s exists as a file.  This won't work with\n"
 "b6, so I'm renaming it to %(mbox_dir)s.tmp and proceeding."
 msgstr ""
-"�ʤ�餫����ͳ�� %(mbox_dir)s ���ե�����Ȥ���¸�ߤ��ޤ�. b6 �ǤϤ����\n"
-"�Ȥ��ޤ���Τ�, %(mbox_dir)s.tmp ���ѹ�������˿ʤߤޤ�."
+"�ʤ�餫����ͳ�� %(mbox_dir)s ���ե�����Ȥ���¸�ߤ��ޤ��� b6 �ǤϤ����\n"
+"�Ȥ��ޤ���Τǡ�%(mbox_dir)s.tmp ���ѹ�������˿ʤߤޤ���"
 
 #: bin/update:255
 msgid ""
@@ -11987,15 +12013,15 @@ msgid ""
 "script.\n"
 msgstr ""
 "\n"
-"%(listname)s �� public �� private �� mbox �ե����뤬����ޤ�. ���Υꥹ��\n"
-"�� private ����¸��ˤ�Ȥ��ޤ��Τ�, private �� mbox �ե����� --\n"
-" %(o_pri_mbox_file)s -- ��ͭ���ʥե�����Ȱ����ޤ�.\n"
+"%(listname)s �� public �� private �� mbox �ե����뤬����ޤ������Υꥹ��\n"
+"�� private ����¸��ˤ�Ȥ��ޤ��Τǡ�private �� mbox �ե����� --\n"
+" %(o_pri_mbox_file)s -- ��ͭ���ʥե�����Ȱ����ޤ���\n"
 "        %(o_pub_mbox_file)s\n"
 "��\n"
 "        %(o_pub_mbox_file)s.pre6\n"
-"���ѹ����ޤ�.\n"
+"���ѹ����ޤ���\n"
 "\n"
-"���Υե������ `arch' ���ޥ�ɤ�Ȥä���¸��ˤ��Ȥ߹��ळ�Ȥ��Ǥ��ޤ�.\n"
+"���Υե������ `arch' ���ޥ�ɤ�Ȥä���¸��ˤ��Ȥ߹��ळ�Ȥ��Ǥ��ޤ���\n"
 
 #: bin/update:270
 msgid ""
@@ -12009,15 +12035,15 @@ msgid ""
 "You can integrate that into the archives if you want by using the 'arch'\n"
 "script.\n"
 msgstr ""
-"%s �� public �� private �� mbox �ե����뤬����ޤ�. ���Υꥹ��\n"
-"�� public ����¸��ˤ�Ȥ��ޤ��Τ�, public �� mbox �ե����� --\n"
-" %s -- ��ͭ���ʥե�����Ȱ����ޤ�.\n"
+"%s �� public �� private �� mbox �ե����뤬����ޤ������Υꥹ��\n"
+"�� public ����¸��ˤ�Ȥ��ޤ��Τǡ�public �� mbox �ե����� --\n"
+" %s -- ��ͭ���ʥե�����Ȱ����ޤ���\n"
 "        %s\n"
 "��\n"
 "        %s.pre6\n"
-"���ѹ����ޤ�.\n"
+"���ѹ����ޤ���\n"
 "\n"
-"���Υե������ `arch' ���ޥ�ɤ�Ȥä���¸��ˤ��Ȥ߹��ळ�Ȥ��Ǥ��ޤ�.\n"
+"���Υե������ `arch' ���ޥ�ɤ�Ȥä���¸��ˤ��Ȥ߹��ळ�Ȥ��Ǥ��ޤ���\n"
 
 #: bin/update:287
 msgid "- updating old private mbox file"
@@ -12030,11 +12056,11 @@ msgid ""
 "    to\n"
 "        %(newname)s"
 msgstr ""
-"    ̤�ΤΥե����뤬����ޤ�.\n"
+"    ̤�ΤΥե����뤬����ޤ���\n"
 "        %(o_pri_mbox_file)s\n"
-"    ��,\n"
+"    �ϡ�\n"
 "        %(newname)s\n"
-"    �˰�ư���ޤ�."
+"    �˰�ư���ޤ���"
 
 #: bin/update:309
 msgid "- updating old public mbox file"
@@ -12047,11 +12073,11 @@ msgid ""
 "    to\n"
 "        %(newname)s"
 msgstr ""
-"    ̤�ΤΥե����뤬����ޤ�.\n"
+"    ̤�ΤΥե����뤬����ޤ���\n"
 "        %(o_pub_mbox_file)s\n"
-"    ��,\n"
+"    �ϡ�\n"
 "        %(newname)s\n"
-"    �˰�ư���ޤ�."
+"    �˰�ư���ޤ���"
 
 #: bin/update:353
 msgid "- This list looks like it might have <= b4 list templates around"
@@ -12063,11 +12089,11 @@ msgstr "- %(o_tmpl)s 
 
 #: bin/update:363
 msgid "- both %(o_tmpl)s and %(n_tmpl)s exist, leaving untouched"
-msgstr "- %(o_tmpl)s �� %(n_tmpl)s ������ޤ�. ���Τޤޤˤ��ޤ�"
+msgstr "- %(o_tmpl)s �� %(n_tmpl)s ������ޤ������Τޤޤˤ��ޤ�"
 
 #: bin/update:366
 msgid "- %(o_tmpl)s doesn't exist, leaving untouched"
-msgstr "- %(o_tmpl)s �Ϥ���ޤ���. ���Τޤޤˤ��ޤ�"
+msgstr "- %(o_tmpl)s �Ϥ���ޤ��󡣤��Τޤޤˤ��ޤ�"
 
 #: bin/update:396
 msgid "removing directory %(src)s and everything underneath"
@@ -12111,11 +12137,11 @@ msgstr "Mailman 2.1.4 
 
 #: bin/update:598
 msgid "Ignoring bad pended data: %(key)s: %(val)s"
-msgstr "��α�ǡ����˸���. ̵�뤷�ޤ�: %(key)s: %(val)s"
+msgstr "��α�ǡ����˸��ꡣ̵�뤷�ޤ�: %(key)s: %(val)s"
 
 #: bin/update:614
 msgid "WARNING: Ignoring duplicate pending ID: %(id)s."
-msgstr "�ٹ�: ��αID�˽�ʣ����. ̵�뤷�ޤ�: %(id)s."
+msgstr "�ٹ�: ��αID�˽�ʣ���ꡣ̵�뤷�ޤ�: %(id)s."
 
 #: bin/update:667
 msgid "getting rid of old source files"
@@ -12131,7 +12157,7 @@ msgid ""
 "If your archives are big, this could take a minute or two..."
 msgstr ""
 "�Ť� HTML ��¸��ˤ� b6 ��ư���褦�˥ѡ��ߥå������ѹ���\n"
-"��¸��ˤ��礭����, ����� 1,2 ʬ������ޤ�..."
+"��¸��ˤ��礭���ȡ������ 1,2 ʬ������ޤ�..."
 
 #: bin/update:689
 msgid "done"
@@ -12151,7 +12177,7 @@ msgstr "- 
 
 #: bin/update:722
 msgid "- usenet watermarks updated and gate_watermarks removed"
-msgstr "- �ͥåȥ˥塼���ο��ɼ������λ. gate_watermark����"
+msgstr "- �ͥåȥ˥塼���ο��ɼ������λ��gate_watermark����"
 
 #: bin/update:736
 msgid ""
@@ -12179,24 +12205,24 @@ msgstr ""
 "\n"
 "���� ���� ���� ���� ����\n"
 "\n"
-"    ��¸�� Mailman �򥢥åץ��졼�ɤ��褦�Ȥ��Ƥ��ޤ���,\n"
-"    �����ΥС�����󤬤狼��ޤ���.\n"
+"    ��¸�� Mailman �򥢥åץ��졼�ɤ��褦�Ȥ��Ƥ��ޤ�����\n"
+"    �����ΥС�����󤬤狼��ޤ���\n"
 "\n"
-"    Mailman 1.0b9 ������ΥС�����󤫤�Υ��åץ��졼�ɤ�, \n"
-"    ���Ȥǥꥹ�Ȥ򹹿�����ɬ�פ�����ޤ�.\n"
-"    ���줾��Υ᡼��󥰥ꥹ�ȤˤĤ���, template/options.html ����\n"
-"    lists/<�ꥹ��̾>/options.html �˥��ԡ�����ɬ�פ�����ޤ�.\n"
+"    Mailman 1.0b9 ������ΥС�����󤫤�Υ��åץ��졼�ɤϡ�\n"
+"    ���Ȥǥꥹ�Ȥ򹹿�����ɬ�פ�����ޤ���\n"
+"    ���줾��Υ᡼��󥰥ꥹ�ȤˤĤ��ơ�template/options.html ����\n"
+"    lists/<�ꥹ��̾>/options.html �˥��ԡ�����ɬ�פ�����ޤ���\n"
 "\n"
-"    ������, ���Υե�����򥦥��֥��󥿥ե��������Խ��������, \n"
-"    �ѹ����Ƥ򤳤Υե������ȿ�Ǥ����ʤ���Фʤ�ޤ���.\n"
-"    ȿ�Ǥ����ʤ�����ѹ��ϼ����ޤ�.\n"
+"    �����������Υե�����򥦥��֥��󥿥ե��������Խ�������硢\n"
+"    �ѹ����Ƥ򤳤Υե������ȿ�Ǥ����ʤ���Фʤ�ޤ���\n"
+"    ȿ�Ǥ����ʤ�����ѹ��ϼ����ޤ���\n"
 "\n"
 "���� ���� ���� ���� ����\n"
 "\n"
 
 #: bin/update:793
 msgid "No updates are necessary."
-msgstr "������ɬ�פϤ���ޤ���."
+msgstr "������ɬ�פϤ���ޤ���"
 
 #: bin/update:796
 msgid ""
@@ -12204,9 +12230,9 @@ msgid ""
 "This is probably not safe.\n"
 "Exiting."
 msgstr ""
-"%(hexlversion)s ���� %(hextversion)s �ؤΥ����󥰥졼�ɤ򸡽Ф��ޤ���.\n"
-"�����˼¹ԤǤ��ʤ���ǽ��������ޤ�.\n"
-"��λ���ޤ�."
+"%(hexlversion)s ���� %(hextversion)s �ؤΥ����󥰥졼�ɤ򸡽Ф��ޤ�����\n"
+"�����˼¹ԤǤ��ʤ���ǽ��������ޤ���\n"
+"��λ���ޤ���"
 
 #: bin/update:801
 msgid "Upgrading from version %(hexlversion)s to %(hextversion)s"
@@ -12230,17 +12256,17 @@ msgstr ""
 "\n"
 "���顼:\n"
 "\n"
-"���å��Ǥ��ʤ��ꥹ�Ȥ�����ޤ�. ���åץ��졼�����Mailman����ư���Ƥ�\n"
-"����, %(lockdir)s �ǥ��쥯�ȥ�˻Ȥ��Ƥ��ʤ����å��ե����뤬�ĤäƤ�\n"
-"�����Τɤ��餫�Ǥ�.\n"
+"���å��Ǥ��ʤ��ꥹ�Ȥ�����ޤ������åץ��졼�����Mailman����ư���Ƥ�\n"
+"������%(lockdir)s �ǥ��쥯�ȥ�˻Ȥ��Ƥ��ʤ����å��ե����뤬�ĤäƤ�\n"
+"�����Τɤ��餫�Ǥ���\n"
 "\n"
-"Mailman ����ߤ��ƸŤ����å��򤹤٤ƺ����, ���줫�� \"make update\" ��\n"
-"���ȤǼ¹Ԥ��Ƥ�������. �ܤ����� INSTALL �� UPGRADE �Υե�����˽�\n"
-"��Ƥޤ��Τ�, ���ɤߤ�������. \n"
+"Mailman ����ߤ��ƸŤ����å��򤹤٤ƺ���������줫�� \"make update\" ��\n"
+"���ȤǼ¹Ԥ��Ƥ����������ܤ����� INSTALL �� UPGRADE �Υե�����˽�\n"
+"��Ƥޤ��Τǡ����ɤߤ���������\n"
 
 #: bin/version:19
 msgid "Print the Mailman version.\n"
-msgstr "Mailman �С�������ɽ�����ޤ�.\n"
+msgstr "Mailman �С�������ɽ�����ޤ���\n"
 
 #: bin/version:26
 msgid "Using Mailman version:"
@@ -12362,68 +12388,68 @@ msgid ""
 "and run this from the command line:\n"
 " %% bin/withlist -l -r changepw mylist somebody@somewhere.org foobar\n"
 msgstr ""
-"MailingList���֥������Ȥ����뤿��ΰ���Ū�����Ȥ�.\n"
+"MailingList���֥������Ȥ����뤿��ΰ���Ū�����Ȥߡ�\n"
 "\n"
-"���Υ�����ץȤλȤ�����2�̤ꤢ��: ���󥿥饯�ƥ��֤ȥץ������Ū�Ǥ���.\n"
+"���Υ�����ץȤλȤ�����2�̤ꤢ��: ���󥿥饯�ƥ��֤ȥץ������Ū�Ǥ��롣\n"
 "���󥿥饯�ƥ��֤˻Ȥ���, Pyhton �Υ��󥿥饯�ƥ��֥��󥿥ץ꥿���Ѥ���\n"
-"MailList ���֥������Ȥ򸡺�������, �ѹ�������, ͷ�֤��Ȥ��Ǥ���.\n"
-"���󥿥饯�ƥ��֤˼¹Ԥ���Ȥ��ˤ�, �������Х��̾�����֤� `m' ��\n"
-"���� MailList ���֥������Ȥ�¸�ߤ���. �ޤ�, MailList ���饹�򥰥����Х�\n"
-"̾�����֤��ɤ߹���.\n"
+"MailList ���֥������Ȥ򸡺������ꡢ�ѹ������ꡢͷ�֤��Ȥ��Ǥ��롣\n"
+"���󥿥饯�ƥ��֤˼¹Ԥ���Ȥ��ˤϡ��������Х��̾�����֤� `m' ��\n"
+"���� MailList ���֥������Ȥ�¸�ߤ��롣�ޤ���MailList ���饹�򥰥����Х�\n"
+"̾�����֤��ɤ߹��ࡣ\n"
 "\n"
 "�ץ������Ū�ˤ� MailList ���֥������Ȥ�����褦�ʴؿ���񤯤��Ȥ�\n"
-"��ǽ��, ���Υ�����ץȤϲȻ����ڤ���������ä򤹤�(�ʲ�����򻲾�).\n"
+"��ǽ�ǡ����Υ�����ץȤϲȻ����ڤ���������ä򤹤�(�ʲ�����򻲾�)��\n"
 "���ξ��ΰ���Ū��ʸ��:\n"
 "\n"
 "%% bin/withlist [���ץ����] �ꥹ��̾ [���� ...]\n"
 "\n"
 "���ץ����:\n"
 "    -l / --lock\n"
-"        �ꥹ�Ȥ򳫤��Ȥ��˥��å�����. �̾�, �ꥹ�Ȥϥ��å������˳���\n"
-"        (�Ĥޤ�, �ɤ߹������Ѥ����). �夫�� `m.Lock()' �����Ϥ���\n"
-"        ���Ȥǥ��å����뤳�Ȥ��Ǥ���.\n"
+"        �ꥹ�Ȥ򳫤��Ȥ��˥��å����롣�̾�ꥹ�Ȥϥ��å������˳���\n"
+"        (�Ĥޤ�, �ɤ߹������Ѥ����)���夫�� `m.Lock()' �����Ϥ���\n"
+"        ���Ȥǥ��å����뤳�Ȥ��Ǥ��롣\n"
 "\n"
-"        ���Υ��ץ�����Ȥ��Ȥ�, ɬ�� m.Save() ��λ���˸ƤӽФ�����\n"
-"        �����դ��ʤ���. �ʤ��ʤ�, ���󥿥ץ꥿�Υ��꡼�󥢥å׽����Ǥ�\n"
-"        MailList ���֥������Ȥ��ѹ���ưŪ����¸���ʤ�����Ǥ���.\n"
+"        ���Υ��ץ�����Ȥ��Ȥ���ɬ�� m.Save() ��λ���˸ƤӽФ�����\n"
+"        �����դ��ʤ������ʤ��ʤ顢���󥿥ץ꥿�Υ��꡼�󥢥å׽����Ǥ�\n"
+"        MailList ���֥������Ȥ��ѹ���ưŪ����¸���ʤ�����Ǥ��롣\n"
 "        (��ưŪ�˥��å�����ϹԤ�)\n"
 "\n"
 "    -i / --interactive\n"
 "        ¾�ν�������λ�����饤�󥿥饯�ƥ��֥⡼�ɤΥץ���ץȤ����\n"
-"        ����� -r ���ץ���󤬻��ꤵ��Ƥ��ʤ��Ȥ��Υǥե���ȤǤ���.\n"
+"        ����� -r ���ץ���󤬻��ꤵ��Ƥ��ʤ��Ȥ��Υǥե���ȤǤ��롣\n"
 "\n"
 "    --run [module.]callable\n"
 "    -r [module.]callable\n"
 "        ������ MailList ���֥������ȤˤĤ��ƥ�����ץȤ�¹Ԥ���Ȥ���\n"
-"        �Ȥ����Ȥ��Ǥ���. ����� `module' (����� withlist �Τ���\n"
-"        �ǥ��쥯�ȥ���֤���Ƥ��뤫, sys.path �ǥ�������\n"
-"        ��ǽ�Ǥ��뤳��) �� import ��, `callable' ��ƤӽФ�. callable\n"
-"        �ϥ��饹�ޤ��ϴؿ��Ǥ���. �ޤ�, MailList ���֥������Ȥ���1����\n"
-"        �Ȥ��ƸƤӽФ�. �⤷, ���ޥ�ɹԤ��ɲäΰ���������� callable\n"
-"        �ΰ���³�������Ȥ����Ϥ����.\n"
+"        �Ȥ����Ȥ��Ǥ��롣����� `module' (����� withlist �Τ���\n"
+"        �ǥ��쥯�ȥ���֤���Ƥ��뤫��sys.path �ǥ�������\n"
+"        ��ǽ�Ǥ��뤳��) �� import ����`callable' ��ƤӽФ���callable\n"
+"        �ϥ��饹�ޤ��ϴؿ��Ǥ��롣�ޤ���MailList ���֥������Ȥ���1����\n"
+"        �Ȥ��ƸƤӽФ����⤷�����ޥ�ɹԤ��ɲäΰ���������� callable\n"
+"        �ΰ���³�������Ȥ����Ϥ���롣\n"
 "\n"
-"        module �ϥ��ץ�����, �⤷��ά������ callable ��̾�������\n"
-"        �⥸�塼�뤬 import �����.\n"
+"        module �ϥ��ץ����ǡ��⤷��ά������ callable ��̾�������\n"
+"        �⥸�塼�뤬 import ����롣\n"
 "\n"
-"       �������Х��ѿ��� `r' �˸ƤӽФ��η�̤�����.\n"
+"       �������Х��ѿ��� `r' �˸ƤӽФ��η�̤����롣\n"
 "\n"
 "    --all / -a\n"
-"        ���Υ��ץ����� -r ���ץ�������ꤷ���Ȥ���ͭ���Ǥ���. �⤷\n"
-"        ���٤ƤΥ᡼��󥰥ꥹ�Ȥ˥�����ץȤ�Ŭ�Ѥ������Ȥ��ˤ�, �����\n"
-"        �Ȥ�. -a ����ꤷ���Ȥ��ˤ�, ���ޥ�ɹԤ˥ꥹ��̾������ƤϤ�����"
-"��.\n"
-"        �ѿ� `r' �Ϥ��٤Ƥη�̤Υꥹ�ȤȤʤ�.\n"
+"        ���Υ��ץ����� -r ���ץ�������ꤷ���Ȥ���ͭ���Ǥ��롣�⤷\n"
+"        ���٤ƤΥ᡼��󥰥ꥹ�Ȥ˥�����ץȤ�Ŭ�Ѥ������Ȥ��ˤϡ������\n"
+"        �Ȥ���-a ����ꤷ���Ȥ��ˤϡ����ޥ�ɹԤ˥ꥹ��̾������ƤϤ�����"
+"����\n"
+"        �ѿ� `r' �Ϥ��٤Ƥη�̤Υꥹ�ȤȤʤ롣\n"
 "\n"
 "    --quiet / -q\n"
-"        ���֥�å������򤹤٤���������.\n"
+"        ���֥�å������򤹤٤��������롣\n"
 "\n"
 "    --help / -h\n"
 "        ���Υ�å���������Ϥ��ƽ�λ����\n"
 "\n"
 "\n"
-"-r ���ץ����λȤ�������򤢤���. ���Ȥ���, Mailman �Υ��󥹥ȡ���\n"
-"�ǥ��쥯�ȥ��, `listaddr.py' �Ȥ���̾���Υե����뤬����, �ʲ���2�Ĥ�\n"
-"�ؿ������äƤ���Ȥ���.\n"
+"-r ���ץ����λȤ�������򤢤��롣���Ȥ��С�Mailman �Υ��󥹥ȡ���\n"
+"�ǥ��쥯�ȥ�ˡ�`listaddr.py' �Ȥ���̾���Υե����뤬���ꡢ�ʲ���2�Ĥ�\n"
+"�ؿ������äƤ���Ȥ��롣\n"
 "\n"
 "def listaddr(mlist):\n"
 "    print mlist.GetListEmail()\n"
@@ -12431,7 +12457,7 @@ msgstr ""
 "def requestaddr(mlist):\n"
 "    print mlist.GetRequestEmail()\n"
 "\n"
-"�����, ���ޥ�ɥ饤�󤫤鼡�Τ褦�ˤ���, �ꥹ�Ȥ���ƥ��ɥ쥹��ɽ������\n"
+"����ȡ����ޥ�ɥ饤�󤫤鼡�Τ褦�ˤ��ơ��ꥹ�Ȥ���ƥ��ɥ쥹��ɽ������\n"
 "���Ȥ��Ǥ���:\n"
 "\n"
 "%% bin/withlist -r listaddr mylist\n"
@@ -12440,7 +12466,7 @@ msgstr ""
 "listaddr.listaddr() ��¹��� ...\n"
 "mylist@myhost.com\n"
 "\n"
-"�ޤ�, �ꥹ�Ȥο������ɥ쥹�ϰʲ��Τ褦�ˤ���ɽ���Ǥ���:\n"
+"�ޤ����ꥹ�Ȥο������ɥ쥹�ϰʲ��Τ褦�ˤ���ɽ���Ǥ���:\n"
 "\n"
 "%% bin/withlist -r listaddr.requestaddr mylist\n"
 "mylist �Υꥹ�Ȥ��ɤ߹����� (���å����)\n"
@@ -12448,7 +12474,7 @@ msgstr ""
 "listaddr.requestaddr() ��¹��� ...\n"
 "mylist-request@myhost.com\n"
 "\n"
-"�⤦��Ĥ���Ȥ���, ����ꥹ�ȤΤ������Υѥ���ɤ��ѹ��������Ȥ��褦.\n"
+"�⤦��Ĥ���Ȥ��ơ�����ꥹ�ȤΤ������Υѥ���ɤ��ѹ��������Ȥ��褦��\n"
 "���Τ褦�ʴؿ��� `changepw.py' ������Ƥ���:\n"
 "\n"
 "from Mailman.Errors import NotAMemberError\n"
@@ -12460,7 +12486,7 @@ msgstr ""
 "    except NotAMember:\n"
 "        print '���ɥ쥹������ޤ���:', addr\n"
 "\n"
-"������, ���ޥ�ɥ饤�󤫤鼡�Τ褦�˼¹Ԥ���:\n"
+"�����ơ����ޥ�ɥ饤�󤫤鼡�Τ褦�˼¹Ԥ���:\n"
 "%% bin/withlist -l -r changepw mylist somebody@somewhere.org foobar\n"
 
 #: bin/withlist:164
@@ -12473,10 +12499,10 @@ msgid ""
 "though.\n"
 "    "
 msgstr ""
-"���å������ꥹ�Ȥ���å��������. ������, ���ۤΤ����� Save() �Ϥ��ʤ�.\n"
+"���å������ꥹ�Ȥ���å�������롣�����������ۤΤ����� Save() �Ϥ��ʤ���\n"
 "\n"
-"  ���󥿥ץ꥿�������ʥ�ǽ�λ������, os._exit() ���ƤФ줿�Ȥ��ˤ�,\n"
-"  �¹Ԥ���ʤ�. �㳰�����������ˤϸƤФ��.\n"
+"  ���󥿥ץ꥿�������ʥ�ǽ�λ�����ꡢos._exit() ���ƤФ줿�Ȥ��ˤϡ�\n"
+"  �¹Ԥ���ʤ����㳰�����������ˤϸƤФ�롣\n"
 "  "
 
 #: bin/withlist:175
@@ -12505,11 +12531,11 @@ msgstr "
 
 #: bin/withlist:237
 msgid "No list name supplied."
-msgstr "�ꥹ�Ȥ�̾����ɬ�פǤ�."
+msgstr "�ꥹ�Ȥ�̾����ɬ�פǤ���"
 
 #: bin/withlist:246
 msgid "--all requires --run"
-msgstr "--all �ˤ� --run ��ɬ�פǤ�."
+msgstr "--all �ˤ� --run ��ɬ�פǤ���"
 
 #: bin/withlist:266
 msgid "Importing %(module)s..."
@@ -12538,17 +12564,17 @@ msgid ""
 "given,\n"
 "all lists are bumped.\n"
 msgstr ""
-"�ޤȤ��ɤߤδ��������ä�, �����1�˥ꥻ�åȤ���\n"
+"�ޤȤ��ɤߤδ��������ä��������1�˥ꥻ�åȤ���\n"
 "\n"
 "����ˡ: %(PROGRAM)s [���ץ����] [�ꥹ��̾ ...]\n"
 "\n"
 "���ץ����:\n"
 "\n"
 "    --help/-h\n"
-"        ���Υ�å�������ɽ�����ƽ�λ.\n"
+"        ���Υ�å�������ɽ�����ƽ�λ��\n"
 "\n"
-"���ޥ�ɹԤΥꥹ�ȤˤĤ��� bump ����. �ꥹ��̾��̵�����ˤ�\n"
-"���٤ƤΥꥹ�Ȥ� bump ����.\n"
+"���ޥ�ɹԤΥꥹ�ȤˤĤ��� bump ���롣�ꥹ��̾��̵�����ˤ�\n"
+"���٤ƤΥꥹ�Ȥ� bump ���롣\n"
 
 #: cron/checkdbs:20
 msgid ""
@@ -12561,21 +12587,21 @@ msgid ""
 "    -h/--help\n"
 "        Print this message and exit.\n"
 msgstr ""
-"��α��δ�������������å���, ɬ�פʤ�ꥹ�ȴ����Ԥ˥᡼�뤹��.\n"
+"��α��δ�������������å�����ɬ�פʤ�ꥹ�ȴ����Ԥ˥᡼�뤹�롣\n"
 "\n"
 "����ˡ: %(PROGRAM)s [���ץ����]\n"
 "\n"
 "���ץ����:\n"
 "\n"
 "    -h / --help\n"
-"        ���Υ�å�������ɽ�����ƽ�λ����.\n"
+"        ���Υ�å�������ɽ�����ƽ�λ���롣\n"
 
 #: cron/checkdbs:108
 msgid ""
 "Notice: %(discarded)d old request(s) automatically expired.\n"
 "\n"
 msgstr ""
-"����: %(discarded)d ��ο����Ʒ郎�����ڤ�Ȥʤ�ޤ���.\n"
+"����: %(discarded)d ��ο����Ʒ郎�����ڤ�Ȥʤ�ޤ�����\n"
 "\n"
 
 #: cron/checkdbs:121
@@ -12633,23 +12659,23 @@ msgid ""
 "    -h / --help\n"
 "        Print this message and exit.\n"
 msgstr ""
-"bad �� shunt ���塼�ǥ��쥯�ȥ���ݽ�. ����1��¹Ԥ�侩.\n"
+"bad �� shunt ���塼�ǥ��쥯�ȥ���ݽ�������1��¹Ԥ�侩��\n"
 "\n"
-"���Υ�����ץȤ� 'bad' �� 'shunt' �Υǥ��쥯�ȥ����, \n"
-"�⤷, mm_cfg.BAD_SHUNT_STALE_AFTER > 0 �Ǥ����, �����ÿ����Ť�\n"
-"�ե������������ޤ�.\n"
+"���Υ�����ץȤ� 'bad' �� 'shunt' �Υǥ��쥯�ȥ���󤷡�\n"
+"�⤷��mm_cfg.BAD_SHUNT_STALE_AFTER > 0 �Ǥ���С������ÿ����Ť�\n"
+"�ե������������ޤ���\n"
 "\n"
-"�⤷, mm_cfg.BAD_SHUNT_ARCHIVE_DIRECTORY ���񤭹��߲�ǽ�ǥ��쥯�ȥ�\n"
-"�Ǥ����, �����Υե�����Ϥ����ذ�ư���ޤ�. �Ǥʤ����, ������ޤ�.\n"
+"�⤷��mm_cfg.BAD_SHUNT_ARCHIVE_DIRECTORY ���񤭹��߲�ǽ�ǥ��쥯�ȥ�\n"
+"�Ǥ���С������Υե�����Ϥ����ذ�ư���ޤ����Ǥʤ���С�������ޤ���\n"
 "\n"
-"'bad' �� 'shunt' ľ�����̾�ե������������������ޤ�. ����ʳ���\n"
-"�����åפ��ޤ�.\n"
+"'bad' �� 'shunt' ľ�����̾�ե������������������ޤ�������ʳ���\n"
+"�����åפ��ޤ���\n"
 "\n"
 "����ˡ: %(PROGRAM)s [���ץ����]\n"
 "\n"
 "���ץ����:\n"
 "    -h / --help\n"
-"        ���Υ�å���������Ϥ��ƽ�λ����.\n"
+"        ���Υ�å���������Ϥ��ƽ�λ���롣\n"
 
 #: cron/disabled:20
 msgid ""
@@ -12700,22 +12726,22 @@ msgid ""
 "    --listname=listname\n"
 "        Process only the given list, otherwise do all lists.\n"
 msgstr ""
-"������߲�����������. 1��1��¹Ԥ���Ȥ褤.\n"
+"������߲����������롣1��1��¹Ԥ���Ȥ褤��\n"
 "\n"
-"���Υ�����ץȤ������Υ᡼��󥰥ꥹ�Ȥ���, ��������ߤ���Ƥ���\n"
-"�����õ���Ф�. �⤷, ��ߤ���ͳ���������顼�ˤ���ΤǤ����, \n"
-"���β���Ϻ������Τ����. ������, �������Τ��������ۤ�����, �ꥹ��\n"
-"�����������.\n"
+"���Υ�����ץȤ������Υ᡼��󥰥ꥹ�Ȥ��󤷡���������ߤ���Ƥ���\n"
+"�����õ���Ф����⤷����ߤ���ͳ���������顼�ˤ���ΤǤ����, \n"
+"���β���Ϻ������Τ���롣�����ơ��������Τ��������ۤ����顢�ꥹ��\n"
+"����������롣\n"
 "\n"
 "--byadmin, --byuser,  --unknown �Υե饰��Ȥ��Ȥ�������ͳ�����\n"
-"��������ˤ����Τ��Ԥ���. ���٤Ƥ���߲�������Τ���ˤ�, --all ��\n"
+"��������ˤ����Τ��Ԥ��롣���٤Ƥ���߲�������Τ���ˤϡ� --all ��\n"
 "�Ȥ�\n"
 "\n"
 "����ˡ: %(PROGRAM)s [���ץ����]\n"
 "\n"
 "���ץ����:\n"
 "    -h / --help\n"
-"        ���Υ�å�������ɽ�����ƽ�λ.\n"
+"        ���Υ�å�������ɽ�����ƽ�λ��\n"
 "\n"
 "    -o / --byadmin\n"
 "        �ꥹ�ȴ����Ԥˤ�ä���ߤ��줿����ˤ����Τ�����\n"
@@ -12735,11 +12761,11 @@ msgstr ""
 "        ���٤Ƥ���߲�������Τ�����\n"
 "\n"
 "    -f / --force\n"
-"        ���������Τ�������ˤʤäƤʤ��Ƥ�, ��߲�������Τ���\n"
+"        ���������Τ�������ˤʤäƤʤ��Ƥ⡢��߲�������Τ���\n"
 "\n"
 "    -l �ꥹ��̾\n"
 "    --listname=�ꥹ��̾\n"
-"        �ꥹ��̾�Υꥹ�Ȥ�����������. �Ǥʤ����, �����Υꥹ�Ȥ����.\n"
+"        �ꥹ��̾�Υꥹ�Ȥ����������롣�Ǥʤ���С������Υꥹ�Ȥ������\n"
 
 #: cron/disabled:145
 msgid "[disabled by periodic sweep and cull, no message available]"
@@ -12758,7 +12784,7 @@ msgid ""
 "        Print this text and exit.\n"
 "\n"
 msgstr ""
-"NNTP�����Ф��䤤��碌��Ԥ�, �᡼��󥰥ꥹ�Ȥ���Ѥ��뵭������.\n"
+"NNTP�����Ф��䤤��碌��Ԥ����᡼��󥰥ꥹ�Ȥ���Ѥ��뵭�����롣\n"
 "\n"
 "����ˡ: gate_news [���ץ����]\n"
 "\n"
@@ -12766,7 +12792,7 @@ msgstr ""
 "\n"
 "    --help\n"
 "    -h\n"
-"        ���Υƥ����Ȥ�ɽ�����ƽ�λ.\n"
+"        ���Υƥ����Ȥ�ɽ�����ƽ�λ��\n"
 "\n"
 
 #: cron/mailpasswds:19
@@ -12797,22 +12823,22 @@ msgid ""
 msgstr ""
 "���ꥹ�Ȥ�������˥ѥ������˺���Τ�����\n"
 "\n"
-"���Υץ������Ϥ��٤ƤΥ᡼��󥰥ꥹ�Ȥ�������, ����Ȥ��Υѥ���ɤ�\n"
-"�����. mm_cfg.VIRTUAL_HOST_OVERVIEW �����Ǥ����, �ꥹ�ȤΥۥ���̾��\n"
-"���롼�ײ�����. ����, (�Ʋ��ۥۥ��Ȥ�) ���줾��β���˥ꥹ�ȤΥѥ��\n"
-"�ɤȲ�����ץ����ڡ����� URL ��ޤ�᡼�����������. �ѥ������˺����\n"
-"���������� mm_cfg.MAILMAN_SITE_LIST �ʤΤ�, ɬ�����ꤷ�Ƥ�������.\n"
+"���Υץ������Ϥ��٤ƤΥ᡼��󥰥ꥹ�Ȥ�������������Ȥ��Υѥ���ɤ�\n"
+"����롣mm_cfg.VIRTUAL_HOST_OVERVIEW �����Ǥ���С��ꥹ�ȤΥۥ���̾��\n"
+"���롼�ײ����롣���ˡ�(�Ʋ��ۥۥ��Ȥ�) ���줾��β���˥ꥹ�ȤΥѥ��\n"
+"�ɤȲ�����ץ����ڡ����� URL ��ޤ�᡼����������롣�ѥ������˺����\n"
+"���������� mm_cfg.MAILMAN_SITE_LIST �ʤΤǡ�ɬ�����ꤷ�Ƥ������ȡ�\n"
 "\n"
 "����ˡ: %(PROGRAM)s [���ץ����]\n"
 "\n"
 "���ץ����:\n"
 "    -l �ꥹ��̾\n"
 "    --listname=�ꥹ��̾\n"
-"        ���ꤵ�줿�ꥹ�ȤˤĤ��ƥѥ������˺���Τ�����. ������ά����\n"
-"        ��, ���٤ƤΥꥹ�ȤˤĤ�������. ʣ���� -l/--listname �����Ǥ���.\n"
+"        ���ꤵ�줿�ꥹ�ȤˤĤ��ƥѥ������˺���Τ����롣������ά����\n"
+"        �ȡ����٤ƤΥꥹ�ȤˤĤ������롣ʣ���� -l/--listname �����Ǥ��롣\n"
 "\n"
 "    -h/--help\n"
-"        ���Υ�å�������ɽ�����ƽ�λ����.\n"
+"        ���Υ�å�������ɽ�����ƽ�λ���롣\n"
 
 #: cron/mailpasswds:216
 msgid "Password // URL"
@@ -12847,26 +12873,26 @@ msgid ""
 "        this, all archivable lists are processed.\n"
 "\n"
 msgstr ""
-"gzip�ǰ��̤��� Pipermail����¸����ѥƥ����ȥե���������������.\n"
+"gzip�ǰ��̤��� Pipermail����¸����ѥƥ����ȥե��������������롣\n"
 "\n"
-"���Υ�����ץȤ������ cron �Ǽ¹Ԥ��뤳��. ���ޥ�ɥ饤�󤫤�\n"
-"�¹Ԥ���Ȥ��ϰʲ��Υ��ץ�����ǧ������.\n"
+"���Υ�����ץȤ������ cron �Ǽ¹Ԥ��뤳�ȡ����ޥ�ɥ饤�󤫤�\n"
+"�¹Ԥ���Ȥ��ϰʲ��Υ��ץ�����ǧ�����롣\n"
 "\n"
 "����ˡ: %(program)s [-v] [-h] [�ꥹ��̾]\n"
 "\n"
 "������:\n"
 "    --verbose\n"
 "    -v\n"
-"        gzip ����Ȥ��˥ե�����̾��ɽ������.\n"
+"        gzip ����Ȥ��˥ե�����̾��ɽ�����롣\n"
 "\n"
 "    --help\n"
 "    -h\n"
 "        ���Υ�å�������ɽ�����ƽ�λ����\n"
 "\n"
 "    �ꥹ��̾\n"
-"        �ꥹ��̾�ǻ��ꤷ���ꥹ�Ȥ� .txt �ե���������򰵽̤���.\n"
-"        �ꥹ��̾�λ��꤬��ά������, ��¸��ˤ���Ĥ��٤Ƥ�\n"
-"        �ꥹ�ȤˤĤ��ƽ�������.\n"
+"        �ꥹ��̾�ǻ��ꤷ���ꥹ�Ȥ� .txt �ե���������򰵽̤��롣\n"
+"        �ꥹ��̾�λ��꤬��ά�����ȡ���¸��ˤ���Ĥ��٤Ƥ�\n"
+"        �ꥹ�ȤˤĤ��ƽ������롣\n"
 "\n"
 
 #: cron/senddigests:20
@@ -12891,7 +12917,7 @@ msgid ""
 "        multiple lists.\n"
 msgstr ""
 "digest_send_periodic �����åȤ���Ƥ��ƥ᡼�뤬ί�ޤäƤ���ꥹ�Ȥ�\n"
-"�Ĥ���, �ޤȤ��ɤߤ�ȯ������\n"
+"�Ĥ��ơ��ޤȤ��ɤߤ�ȯ������\n"
 "\n"
 "����ˡ: %(PROGRAM)s [���ץ����]\n"
 "\n"
@@ -12901,14 +12927,14 @@ msgstr ""
 "\n"
 "    -l �ꥹ��̾\n"
 "    --listname=�ꥹ��̾\n"
-"        �ꥹ��̾�ǻ��ꤷ���ꥹ�ȤˤĤ��Ƥ���, �ޤȤ��ɤߤ���������.\n"
-"        ���줬̵�����, ���٤ƤΥꥹ�Ȥν����򤹤�.\n"
+"        �ꥹ��̾�ǻ��ꤷ���ꥹ�ȤˤĤ��Ƥ������ޤȤ��ɤߤ��������롣\n"
+"        ���줬̵����硢���٤ƤΥꥹ�Ȥν����򤹤롣\n"
 "\n"
 "    -e �ꥹ��̾\n"
 "    --exceptlist=�ꥹ��̾\n"
-"        �ꥹ��̾�ǻ��ꤷ���ꥹ�ȤˤĤ��Ƥ�, �ޤȤ��ɤߤ��������ʤ�.\n"
+"        �ꥹ��̾�ǻ��ꤷ���ꥹ�ȤˤĤ��Ƥϡ��ޤȤ��ɤߤ��������ʤ���\n"
 "        ʣ���Υꥹ�Ȥ�ޤȤ��ɤ��������оݤ��鳰������˷����֤�\n"
-"        ���ꤹ�뤳�Ȥ��Ǥ���."
+"        ���ꤹ�뤳�Ȥ��Ǥ��롣"
 
 #~ msgid "The message headers matched a filter rule"
 #~ msgstr "�᡼��إå����ե��륿��§�˹��פ��ޤ���"
diff --git a/messages/ja/README b/messages/ja/README
index 9f9602cf..c6670677 100644
--- a/messages/ja/README
+++ b/messages/ja/README
@@ -1,5 +1,5 @@
 Mailman - The GNU Mailing List Management System
-Copyright (C) 1998-2015 by the Free Software Foundation, Inc.
+Copyright (C) 1998-2018 by the Free Software Foundation, Inc.
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 ����� Mailman 2.1 �� README ��Ρ����ϻ��׻᤬����������Τ򸵤�
@@ -8,34 +8,34 @@ Copyright (C) 1998-2015 by the Free Software Foundation, Inc.
 
 �Ϥ����
 
-    ����� GNU Mailman ���ʤ�� GNU �������ѵ���(GPL) �Τ�Ȥ����ۤ���� 
-    �᡼��󥰥ꥹ�ȴ��������ƥ�Ǥ������Υץ��������Ȥ�̾���� "Mailman" 
+    ����� GNU Mailman ���ʤ�� GNU �������ѵ���(GPL) �Τ�Ȥ����ۤ����
+    �᡼��󥰥ꥹ�ȴ��������ƥ�Ǥ������Υץ��������Ȥ�̾���� "Mailman"
     ���֤�ޤ���â�����ǽ�� 'M' ����ʸ���ǡ������ܤ� 'm' �� ��ʸ����
     �񤭤ޤ�������¾�Τɤ���֤��ְ㤤�Ǥ���
 
-    Mailman �ϼ�� Python �Ĥޤ�ե꡼�Υ��֥������Ȼظ�������ץȸ���� 
+    Mailman �ϼ�� Python �Ĥޤ�ե꡼�Υ��֥������Ȼظ�������ץȸ����
     �񤫤�Ƥ��ޤ����������ƥ�����Ū�Ǥ����餫�� ANSI C �Υ����ɤ�
     �ޤޤ�ޤ���
 
     Mailman �Ϻǽ� John Viega �ˤ�äƳ�ȯ����ޤ��������θ塢
-    (Version 1.0b3 �ޤ�) Ken Manheimer ����ȯ�˷Ȥ��ޤ���������� 
+    (Version 1.0b3 �ޤ�) Ken Manheimer ����ȯ�˷Ȥ��ޤ����������
     1.0 �ǽ��ǤޤǤκ�Ȥϥ��롼�פ��Ϥǡ����פʹ׸��Ԥ� Barry Warsaw��
     Ken Manheimer��Scott Cotton��Harald Meland��John Viega �Ǥ���
     Version 1.0 ������ϼ�� Barry Warsaw ���ݼ�ˤ����ꡢ ¿���οͤ���
     ����ι׸�������ޤ������ܤ����� ACKNOWLEDGMENTS �ե�������ɤ��
-    ����������Jeremy Hylton �� Mailman 2.0 �� Pipermail�����ɤ� 
+    ����������Jeremy Hylton �� Mailman 2.0 �� Pipermail�����ɤ�
     �׸����ޤ�����
 
     Mailman �Υۡ���ڡ�����
 
         http://www.list.org
 
-    �ˤ��ꡤ���Υߥ顼��
+    �ˤ��ꡢ���Υߥ顼��
 
         https://www.gnu.org/software/mailman/
         http://mailman.sf.net
 
-    �ˤ���ޤ���
+    �ˤ���ޤ���
 
     Mailman 2.1 �� Python 2.4 �ޤ��ϰʹߤΥС�������ɬ�פȤ��ޤ���
     (����: Python 3 �ʹߤˤ��б����Ƥ��ޤ���)
@@ -44,22 +44,24 @@ Copyright (C) 1998-2015 by the Free Software Foundation, Inc.
         https://www.python.org
 
     �����񤤤Ƥ������(2015ǯ2��10��)�Ǥκǿ��� 2.7 �ϥѥå���꡼��
-    �Ǥ���Python 2.7.9 ��Ȥ����Ȥ�侩���ޤ���
-    (����: ���������äƤ���2017ǯ2��23������ 2.7.14 ���ФƤ��ꡢ
-    �����Ȥ����Ȥ�侩���ޤ���)
+    �Ǥ���Python 2.7.9 ��Ȥ����Ȥ򶯤��侩���ޤ���
+    (����: ���������äƤ���2018ǯ7��16������ 2.7.15 ���ФƤ��ꡢ
+    �����Ȥ����Ȥ򶯤��侩���ޤ���)
 
     Mailman 2.1 �� Python 2.2 �����ΥС������Ǥ�ư�������ޤ���
     Python 2.3 �Ǥϵ�ǽ�Τ����ΰ�����ư��ʤ��Ȼפ��ޤ���
+    (����: Mailman 2.1.27 �ʹߤǤ� Python 2.5 ������ΥС�������
+    ���ݡ��ȤϤʤ��ʤ�ޤ�����)
 
     �ޤ� Python �� Mailman �������ˤ� ANSI C ����ѥ����ɬ�פǤ���
     gcc (GNU C ����ѥ���)�Ϥ�����Ū��Ŭ�礷�Ƥ��ޤ��� Mailman ��
     ���ߤΤȤ��� GNU/Linux �Ȥ���¾�� UNIX ���Υ��ڥ졼�ƥ��󥰥����ƥ�
     (�㤨�� Solaris��*BSD��MacOSX����) �ǤΤߺ�ư���ޤ���Windows �Ǥ�
-    ư���ޤ��󤬡����֤ȥ᡼��Υ��饤����ȥ��եȤ� Mailman �Ȥ�
+    ư���ޤ��󤬡������֤ȥ᡼��Υ��饤����ȥ��եȤ� Mailman �Ȥ�
     ��³�ˤϽ�ʬ��ǽ���ޤ���
 
     ���󥹥ȡ���ˤ� INSTALL �ե�����򸫤Ƥ����������⤷�������ΥС�
-    ����� ����С�����󥢥åפ��褦�Ȥ��Ƥ���ΤǤ���С�UPGRADING 
+    ����� ����С�����󥢥åפ��褦�Ȥ��Ƥ���ΤǤ���С�UPGRADING
     �ե������ ���פʾ������äƤ��ޤ��Τ�ɬ���ɤ�Ǥ���������
 
 ��ħ
@@ -68,14 +70,14 @@ Copyright (C) 1998-2015 by the Free Software Foundation, Inc.
     (�����)��˾�ꥹ�ȤˤĤ��Ƥ� TODO �ե�������ɤ�Ǥ���������
     Mailman ��ư��Ƥ���Ȥ����ϡ�
 
-        http://mail.python.org/mailman/listinfo
+        https://mail.python.org/mailman/listinfo
 
     �Ǹ��뤳�Ȥ��Ǥ��ޤ���
 
-    Mailman �ϥ᡼��󥰥ꥹ�ȴ����ץ������˴��Ԥ����ɸ��Ū�� 
+    Mailman �ϥ᡼��󥰥ꥹ�ȴ����ץ������˴��Ԥ����ɸ��Ū��
     ��ħ��ۤȤ�������Ƥ��ޤ�������ˡ�
 
-    - �ꥹ�ȴ����ΤۤȤ�����Ƥκ�Ȥ� Web �١����Ǥ���Web�١����� 
+    - �ꥹ�ȴ����ΤۤȤ�����Ƥκ�Ȥ� Web �١����Ǥ���Web�١�����
       ��Ͽ�ȥ桼������������Ǥ��ޤ������줾��Υ᡼��󥰥ꥹ�Ȥ�
       "�ۡ���ڡ���" �ϥ������ޥ����Ǥ��ޤ���
 
@@ -102,17 +104,17 @@ Copyright (C) 1998-2015 by the Free Software Foundation, Inc.
 
     - ��ĥ���Τ���᡼�������ѥ��ץ饤��
 
-    - ���ۥɥᥤ��򥵥ݡ��� 
+    - ���ۥɥᥤ��򥵥ݡ���
 
 ɬ�׻���
 
     �ǥե���ȤΥ᡼������������ľ�� SMTP ��³��ȤäƤ��ꡢ�ݡ���
     �ֹ�25��ư���Ƥ���ɤ�ʥ᡼�����������ƥ�(MTA) �Ǥ��äƤ⹽��
-    �ޤ��󡥤Ǥ����顤�ɤ�� MTA �Ǥ� Mailman ��Ȥ����Ȥ��Ǥ��ޤ�
+    �ޤ��󡣤Ǥ����顢�ɤ�� MTA �Ǥ� Mailman ��Ȥ����Ȥ��Ǥ��ޤ�
     ��������� MTA (Exim �� Postfix) ��Ȥ��ȡ������֤��̤����ꥹ��
     �κ����Ⱥ���⥵�ݡ��ȤǤ��ޤ���
 
-    Mailman �� CGI/1.1 �򥵥ݡ��Ȥ���ɤ�� web �����ФǤ�Ȥ��ޤ��� 
+    Mailman �� CGI/1.1 �򥵥ݡ��Ȥ���ɤ�� web �����ФǤ�Ȥ��ޤ���
     ��������� HTML�ϤȤƤ�ʿ�ޤDz����򥱥��äƤ��ޤ��Τǡ��ۤȤ�ɤ�
     �֥饦���ˤȤäƥե��ɥ꡼�ΤϤ��Ǥ���
 
@@ -125,80 +127,80 @@ Copyright (C) 1998-2015 by the Free Software Foundation, Inc.
     �䤽��¾�Υ��å������ץ饰�����ɬ�פ���ޤ���
 
 �Ϥ���ƥꥹ�Ȥ��������
-    (����: ���ΤΥ��������ϸ��ߤ�README�ˤϤʤ����������Ƥ� doc 
+    (����: ���Υ��������ϸ��ߤ�README�ˤϤʤ����������Ƥ� doc
     �ǥ��쥯�ȥ�ʲ��ˤ��륤�󥹥ȡ���ޥ˥奢��(installation manual)��
     ���������12 ����� 13 �ǥ��С�����Ƥ��ޤ�����2016ǯ3��2�����ߤǤ�
     ���μ�������Ϥʤ��褦�˻פ��ޤ��������ä��������ʤΤǻĤ���
-     �����ޤ���)
+    �����ޤ���)
 
-    �ʲ��μ���, ���ʤ������� INSTALL �ե�����˽��ä� Mailman ��
-    ���󥹥ȡ��뤷, ����ѤߤǤ���Ȳ��ꤷ�Ƥ��ޤ�. �ƥ��ȤΥꥹ��
-    ���������ˤ�, �ʲ��Τ褦�ˤ��Ƥ�������:
+    �ʲ��μ��ϡ����ʤ������� INSTALL �ե�����˽��ä� Mailman ��
+    ���󥹥ȡ��뤷������ѤߤǤ���Ȳ��ꤷ�Ƥ��ޤ����ƥ��ȤΥꥹ��
+    ���������ˤϡ��ʲ��Τ褦�ˤ��Ƥ�������:
 
-    - �ǽ��, �����ȴ����ԤΥѥ���ɤ����ꤷ�ޤ�. ���󥹥ȡ���
+    - �ǽ�ˡ������ȴ����ԤΥѥ���ɤ����ꤷ�ޤ������󥹥ȡ���
       �����ǥ��쥯�ȥ�(�ǥե���ȤǤ� /usr/local/mailman) �� cd ����
-      ���Τ褦�ˤ��ޤ�.
+      ���Τ褦�ˤ��ޤ���
 
       % bin/mmsitepass
       New site password: [yourpassword]
       Again to confirm password: [yourpassword]
       Password changed.
 
-      ����: �⤷, ���ʤ����Ķ��ѿ� LANG �� ja �����ꤷ����
-        �ʲ��Τ褦�ʥץ���ץȤ��ФƤ��뤫�⤷��ޤ���.
+      ����: �⤷�����ʤ����Ķ��ѿ� LANG �� ja �����ꤷ����
+        �ʲ��Τ褦�ʥץ���ץȤ��ФƤ��뤫�⤷��ޤ���
 
         % bin/mmsitepass
         ������ ������ �Υѥ����:
         �ѥ���ɳ�ǧ:
         �ѥ���ɤ��ѹ����ޤ���.
 
-    - ���Τ褦�� URL ����³���ޤ�.
+    - ���Τ褦�� URL ����³���ޤ���
 
         http://my.dom.ain/mailman/create
 
-      ���̤˽ФƤ���ؼ��˽��äƥե�����˵������ޤ�. ������, 
+      ���̤˽ФƤ���ؼ��˽��äƥե�����˵������ޤ��������ơ�
       "�ꥹ�Ⱥ����Ԥ�ǧ�ڥѥ����: " �ΤȤ�������ۤɤΥѥ����
-      ������ޤ�. ��ʬ�Υ᡼�륢�ɥ쥹��"�ǽ�Υꥹ�ȴ����ԥ��ɥ쥹"
-      �������, �֥ꥹ�Ⱥ�����λ�פ�᡼��Ǵ����Ԥ��Τ餻��褦��,
-      "�Ϥ�" �����Ӥޤ�.
+      ������ޤ�����ʬ�Υ᡼�륢�ɥ쥹��"�ǽ�Υꥹ�ȴ����ԥ��ɥ쥹"
+      ������ơ��֥ꥹ�Ⱥ�����λ�פ�᡼��Ǵ����Ԥ��Τ餻��褦�ˡ�
+      "�Ϥ�" �����Ӥޤ���
 
-    - �֥ꥹ�Ȥ��������פ򥯥�å����ޤ�.
+    - �֥ꥹ�Ȥ��������פ򥯥�å����ޤ���
 
-    - �᡼�������å�����, �������᡼��󥰥ꥹ�Ȥ��������줿���Ȥ�
-      �Τ餻��᡼����ɤߤޤ�.
+    - �᡼�������å����ơ��������᡼��󥰥ꥹ�Ȥ��������줿���Ȥ�
+      �Τ餻��᡼����ɤߤޤ���
 
-    - ����: �⤷, Exim �� Postfix �ʳ��� MTA ��ȤäƤ�����ˤ�,
-      (�㤨��, Sendmail �� qmail) �᡼��󥰥ꥹ�Ȥ� alias ����
-      ���ꤹ��Ȥ���, ���֤�ɬ�פǤ�. ���ʤ���������ä��᡼���
-      �񤫤줿�ؼ��˽��äƤ�������. (���ʤ��� MTA �ˤĤ��ƤɤΤ褦��
-      ������褤�Τ��ΤäƤ���ɬ�פ�����ޤ�. �ܤ�����, ���ʤ���
-      MTA �ˤĤ��Ƥ� README ���ɤ�Ǥ�������.)
+    - ����: �⤷��Exim �� Postfix �ʳ��� MTA ��ȤäƤ�����ˤϡ�
+      (�㤨�С�Sendmail �� qmail) �᡼��󥰥ꥹ�Ȥ� alias ����
+      ���ꤹ��Ȥ��������֤�ɬ�פǤ������ʤ���������ä��᡼���
+      �񤫤줿�ؼ��˽��äƤ���������(���ʤ��� MTA �ˤĤ��ƤɤΤ褦��
+      ������褤�Τ��ΤäƤ���ɬ�פ�����ޤ����ܤ����ϡ����ʤ���
+      MTA �ˤĤ��Ƥ� README ���ɤ�Ǥ���������)
 
-    - �ꥹ�Ȥδ����ڡ����عԤäƤ�������. (�����֥ڡ����Υ�󥯤�
+    - �ꥹ�Ȥδ����ڡ����عԤäƤ���������(�����֥ڡ����Υ�󥯤�
       �᡼��˽񤫤줿��󥯤򤿤ɤ�ޤ�) ŵ��Ū�� URL �ϼ��Τ褦��
-      �ʤäƤ���Ϥ��Ǥ�.
+      �ʤäƤ���Ϥ��Ǥ���
 
         http://my.dom.ain/mailman/admin/mysitelist
 
       �ꥹ�ȤΥѥ���ɤ�����ơ֥�������...�פ򥯥�å����ޤ�
 
-    - �ֲ�������פ򥯥�å���, ³���ơ֤ޤȤ��������Ͽ�פعԤ��ޤ�.
+    - �ֲ�������פ򥯥�å�����³���ơ֤ޤȤ��������Ͽ�פعԤ��ޤ���
 
     - ��ʬ�Υ᡼�륢�ɥ쥹���礭�ʥƥ����ȥե�����ɤ������
-      ���ѹ�����������פ򥯥�å����ޤ�.
+      ���ѹ�����������פ򥯥�å����ޤ���
 
-    - ��ʬ�Υ᡼�륽�եȤ�Ȥä�, yourlist@my.dom.ain ���Ƥ˥᡼���
-      �Ф��Ƹ��Ƥ�������. Mailman ���ͳ�������������᡼�뤬
-      1,2 ʬ�Τ������Ϥ��Ǥ��礦.
+    - ��ʬ�Υ᡼�륽�եȤ�Ȥäơ�yourlist@my.dom.ain ���Ƥ˥᡼���
+      �Ф��Ƹ��Ƥ���������Mailman ���ͳ�������������᡼�뤬
+      1,2 ʬ�Τ������Ϥ��Ǥ��礦��
 
-    ����ǤȤ������ƤΥ᡼��󥰥ꥹ�Ⱥ����ȥƥ��Ȥ���λ���ޤ���.
-    �⤷, �ĤޤŤ��褦�ʤ��Ȥ������, ���Υ��������Τ���¾�ξ����
-    ���Ƥ�������.
+    ����ǤȤ������ƤΥ᡼��󥰥ꥹ�Ⱥ����ȥƥ��Ȥ���λ���ޤ�����
+    �⤷, �ĤޤŤ��褦�ʤ��Ȥ�����С����Υ��������Τ���¾�ξ����
+    ���Ƥ���������
 
 
 ����¾�ξ���
 
-    ����饤��ʸ���, ���ʤ��� Mailman �򳫤����ǥ��쥯�ȥ�β���
+    ����饤��ʸ��ϡ����ʤ��� Mailman �򳫤����ǥ��쥯�ȥ�β���
 
         file:doc/
 
@@ -206,16 +208,16 @@ Copyright (C) 1998-2015 by the Free Software Foundation, Inc.
 
     ���ߥ�˥ƥ���ư�ǤޤȤ��줿����Τ���� wiki �ϰʲ��ˤ���ޤ���
 
-        http://wiki.list.org
+        https://wiki.list.org
 
    wiki �ˤ� Mailman ���ߥ�˥ƥ����ݼ餷�Ƥ��륪��饤��FAQ���ޤޤ��
    ���ꡢ�����ˤ�����ʾ��󤬤���ޤ���
 
-        http://wiki.list.org/display/DOC/Frequently+Asked+Questions
+        https://wiki.list.org/display/DOC/Frequently+Asked+Questions
 
    �ޤ�������ʤ�ʸ��ˤؤΥ�󥯤ϰʲ����̤�Ǥ���
 
-        http://wiki.list.org/display/DOC/
+        https://wiki.list.org/display/DOC/
 
 
 (����¾�αѸ�ξ���ˤĤ��ƤϱѸ��Ǥ�README�򸫤Ƥ�������)
diff --git a/messages/ja/doc/Defaults.py.in b/messages/ja/doc/Defaults.py.in
index d800c55b..b6420372 100644
--- a/messages/ja/doc/Defaults.py.in
+++ b/messages/ja/doc/Defaults.py.in
@@ -18,15 +18,15 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
 # USA.
 
-# [����] ���Υե�����ϡ�Mailman 2.1.26 ����ʪ�˴ޤޤ��
-#   Mailman/Defaults.py.in (launchpad.net �Ǥ� Bazaar ��ӥ�����
-#   1770) �Υ�������ʬ�����ܸ� (���̸�) ������������ΤǤ���
+# [����] ���Υե�����ϡ�Mailman 2.1.27 ����ʪ�˴ޤޤ��
+#   Mailman/Defaults.py.in (launchpad.net �ǤΥե������ Bazaar
+#  ��ӥ����� 1792) �Υ�������ʬ�����ܸ� (���̸�) ������������ΤǤ���
 #   �������ξ��ϸ�ʸ��Ʊ�͡�GNU ���̸������ѵ�������� (GNU
 #   General Public License) �˽����ޤ� (�嵭�⻲�Ȥ�������)�����Ƥ�
 #   ���Τ�����Τ���ˤϡ�����ʪ�˴ޤޤ�븶ʸ�򻲾Ȥ���뤳�Ȥ�
 #   �����ᤷ�ޤ���
 #   ����: IKEDA Soji <hatuka@nezumi.nu>
-#   (2.1.22 �Ǥκ���: Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp>)
+#   (2.1.22 �ʹߤκ���: Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp>)
 
 
 """���ۻ����� Mailman �μ��פ������ѿ��ν�������͡�"""
@@ -275,9 +275,12 @@ KNOWN_SPAMMERS = []
 
 # �ץ饤�Х��������ץ����... -> ���ǥ᡼��ե��륿 �� header_filter_rules ��
 # �إå��Υޥå��󥰤ϡ����줾���Unicode���Ѵ�����������������˹Ԥ��ޤ���
-# ��������Ϥ����������ˤ���������������ꤷ�ޤ���
-# http://docs.python.jp/2/library/unicodedata.html#unicodedata.normalize
-# �򻲾Ȥ��Ƥ���������
+# ��������Ϥ����������ˤ���������������ꤷ�ޤ��� 'NFC', 'NFD', 'NFKC',
+# 'NFKD' �Τ����줫����ꤷ�ޤ���
+# https://docs.python.org/2/library/unicodedata.html#unicodedata.normalize
+# (����: ���ܸ�ɥ������
+# https://docs.python.org/ja/2.7/library/unicodedata.html#unicodedata.normalize
+# )�򻲾Ȥ��Ƥ���������
 NORMALIZE_FORM = 'NFKC'
 
 
@@ -329,7 +332,7 @@ WEB_HEAD_ADD = None
 # ����2�Ĥ�����ϡ��ɲäǥ��������׽�����Ԥ����ɤ������ɤ�ʸ����
 # �����֤������뤫����ꤷ�ޤ�������: ����ʸ����ʣ���Х��ȤΥ������󥹤�
 # ɽ���褦�ʥ��󥳡��ǥ��󥰤Ǥ�(����:��ʸ��character sets...ʸ�������
-# �ʤäƤ��뤬 character set �� encoding ��Ʊ���Ƥ�����ۤ���)��
+# �ʤäƤ��뤬 character set �� encoding ��Ʊ���Ƥ���Ȼפ���)��
 # �ɲäΥ��������׽�����ͭ���ˤ���ȡ�ʣ���Х��Ȥ��¤Ӥΰ����� HTML ��
 # ���λ��Ȥ��֤������Ƥ��ޤ���̵���Ǥ��ä��Ϥ���ʸ��������Ƥ��ޤ����Ȥ�
 # ���뤫�⤷��ޤ���
@@ -388,7 +391,6 @@ DEFAULT_ARCHIVE = On
 
 # ����ǥ��������֤ϸ������뤫����ˤ��뤫��
 # 0=������1=����
-# 0=public, 1=private
 DEFAULT_ARCHIVE_PRIVATE = 0
 
 # ARCHIVE_TO_MBOX
@@ -848,7 +850,7 @@ SMTP_LOG_EACH_FAILURE = (
 # ����ȥ����뤷�ޤ���VERP �Ȥ� Variable Envelope Return Path (����
 # ����٥����� Return PATH) �Τ��Ȥǡ��ʲ������������ޤ�:
 #
-# http://cr.yp.to/proto/verp.txt
+# https://cr.yp.to/proto/verp.txt
 #
 # ����ϡ�enverope �����ԥ��ɥ쥹(�ĤޤꡢSMTP �� ��MAIL FROM:�פΥ��ɥ쥹)
 # ����˲桹(Mailman)���狼��褦�˼����ԤΥ��ɥ쥹����沽���ƴޤޤ���
@@ -886,16 +888,14 @@ VERP_FORMAT = '%(bounces)s+%(mailbox)s=%(host)s'
 # 2���ܤ� �Х��󥹤�ȯ������MTA����ΥХ��󥹥᡼��� To: �إå��˥��åȤ����
 # �����������ɥ쥹���դ����沽���뤿�������ɽ���򵭽Ҥ��ޤ��������
 # ���������Ҥ���Τ����ѽ��פǤ��������Ǥ������Ѥ��Ƥ��� Python ������ɽ����
-#Ĵ�٤Ƥ������������������Ƥ���Τ�Ʊ����bounces�ס���mailbox�ס���host�פ�
+# Ĵ�٤Ƥ������������������Ƥ���Τ�Ʊ����bounces�ס���mailbox�ס���host�פ�
 # 3 �Ĥ�̾���Ĥ��Υ��롼�פ�������ʤ���Фʤ�ޤ��󡣤�������ɽ����
 # ��ʸ����ʸ������̤����˥���ѥ��뤵��ޤ���
 VERP_REGEXP = r'^(?P<bounces>[^+]+?)\+(?P<mailbox>[^=]+)=(?P<host>[^@]+)@.*$'
 
-# VERP format and regexp for probe messages
 # ��å������θ����Τ���� VERP �ν񼰤�����ɽ�� 
 VERP_PROBE_FORMAT = '%(bounces)s+%(token)s'
 VERP_PROBE_REGEXP = r'^(?P<bounces>[^+]+?)\+(?P<token>[^@]+)@.*$'
-# Set this Yes to activate VERP probe for disabling by bounce
 # ������Yes�פ����ꤹ��ȥХ��󥹤ˤ��������ߤΤ���� VERP ������
 # ͭ���ˤʤ�ޤ���
 VERP_PROBES = No
@@ -1162,9 +1162,9 @@ HOLD_MESSAGES_AS_PICKLES = Yes
 # �����ѿ��� admin CGI �Υڡ����ǥꥹ�ȸ��̤�����ʬ���ɽ��������֤�
 # ����ȥ����뤷�ޤ���
 ADMIN_CATEGORIES = [
-    # First column
+    # ������
     'general', 'passwords', 'language', 'members', 'nondigest', 'digest',
-    # Second column
+    # ������
     'privacy', 'bounce', 'archive', 'gateway', 'autoreply',
     'contentfilter', 'topics',
     ]
@@ -1254,7 +1254,6 @@ DEFAULT_MSG_FOOTER = """--
 # ˾�ळ�ȤǤ��礦��
 OLD_STYLE_PREFIXING = Yes
 
-# Scrub regular delivery
 # ���������᡼���ź�եե�����������ޤ�
 DEFAULT_SCRUB_NONDIGEST = False
 
@@ -1593,7 +1592,7 @@ MIME_DIGEST_KEEP_HEADERS = [
 # ���Υإå���ʣ������Ϥ���뤳�Ȥ�����ޤ���
 PLAIN_DIGEST_KEEP_HEADERS = [
     'Message',
-    # RFC 1153 headers in order
+    # RFC 1153 �إå������
     'Date', 'From', 'To', 'Cc', 'Subject', 'Message-ID', 'Keywords',
     'Content-Type',
     ]
@@ -1605,7 +1604,6 @@ PLAIN_DIGEST_KEEP_HEADERS = [
 # ����ͤǤ��뤳�Ȥ����ա�
 #####
 
-# Should we do any bounced mail response at all?
 # �ɤ�ʥХ��󥹥᡼����Ф��Ƥ�Ȥˤ��������򤷤ޤ���?
 DEFAULT_BOUNCE_PROCESSING = Yes
 
@@ -1794,11 +1792,11 @@ TEXTFIELDWIDTH = 40
 
 # �桼��������ܤΤ���Υӥåȥե�����ɡ����������Υꥹ�Ȥν���ͤˤĤ��Ƥ�
 # ���Ҥ� DEFAULT_NEW_MEMBER_OPTIONS �򻲾Ȥ��Ʋ�������
-Digests             = 0 # handled by other mechanism, doesn't need a flag.
-DisableDelivery     = 1 # Obsolete; use set/getDeliveryStatus()
-DontReceiveOwnPosts = 2 # Non-digesters only
+Digests             = 0 # ¾�λ��Ȥߤ����椹��Τǥե饰�Ȥ��Ƥ�����
+DisableDelivery     = 1 # �ѻ�; set/getDeliveryStatus() ����Ѥ���
+DontReceiveOwnPosts = 2 # ���������Υ桼���Τ�
 AcknowledgePosts    = 4
-DisableMime         = 8 # Digesters only
+DisableMime         = 8 # ������������(�ޤȤ��ɤ�)�Υ桼���Τ�
 ConcealSubscription = 16
 SuppressPasswordReminder = 32
 ReceiveNonmatchingTopics = 64
@@ -1836,10 +1834,10 @@ OPTINFO = {'hide'    : ConcealSubscription,
 #   ��å������ʤɤΥꥯ������(����)�ν�����Ԥ����ȤΤǤ����
 # - List administrator(�ꥹ�ȴ�����), �ꥹ�Ȥ����Τ򥳥�ȥ����뤹�뤳�Ȥ�
 #   �Ǥ���Ԥǡ��ꥹ�Ȥ����ꡢ�ꥹ�Ȥβ���Υ桼�����ץ������ѹ���
-#   ���������������������ʤɤ�Ԥ����Ȥ��Ǥ��ޤ��� 
+#   ���������������������ʤɤ�Ԥ����Ȥ��Ǥ��ޤ���
 # - Site administrator(�����ȴ�����), �����Ȥ˴ؤ�����Τ򥳥�ȥ����뤹��
 #   ���ȤΤǤ���Ԥǡ���ǽҤ٤����ƤΥ�������Ԥ����Ȥ��Ǥ��ޤ���
-#   ���ο�ʪ���̾拾�ޥ�ɥ饤��ǤΥ����������ǽ�Ǥ��� 
+#   ���ο�ʪ���̾拾�ޥ�ɥ饤��ǤΥ����������ǽ�Ǥ���
 
 UnAuthorized = 0
 AuthUser = 1          # �桼����ï��
diff --git a/messages/ko/LC_MESSAGES/mailman.po b/messages/ko/LC_MESSAGES/mailman.po
index b6077c37..7bc40d55 100644
--- a/messages/ko/LC_MESSAGES/mailman.po
+++ b/messages/ko/LC_MESSAGES/mailman.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: 2002-03-28 19:21+09:00\n"
 "Last-Translator: Hyejin Soang, Wongyo Jung<redcloak@igrus.inha.ac.kr, "
 "andsoon@igrus.inha.ac.kr>\n"
@@ -220,7 +220,7 @@ msgstr "
 msgid "by the list administrator"
 msgstr "����Ʈ ������"
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "�˼����� ������ ����"
 
@@ -236,23 +236,23 @@ msgstr "
 msgid "Bounce action notification"
 msgstr "�ٿ ���� �˸�"
 
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "���� �Ұ�"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr ""
 
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
 msgid "(no subject)"
 msgstr "(���� ����)"
 
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr "[�ٿ�� ���� �ڼ��� ���� �̿� �Ұ�.]"
 
@@ -266,7 +266,7 @@ msgstr "
 
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -274,7 +274,7 @@ msgstr "<em>%(safelistname)s</em> 
 
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -284,8 +284,8 @@ msgstr "
 
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -297,7 +297,7 @@ msgid "Authorization failed."
 msgstr "�μ� ����"
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr ""
 
@@ -314,7 +314,7 @@ msgstr ""
 "            ��� ��Ŀ��� �� �� �ϳ��� �� �����Ͻñ� �ٶ��ϴ�."
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "���: "
 
@@ -470,7 +470,7 @@ msgstr "
 msgid "Go to the general list information page"
 msgstr "���ϸ� ���� ������ ����"
 
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 #, fuzzy
 msgid "Edit the public HTML pages and text files"
 msgstr "���� ������ �����ϱ�"
@@ -563,7 +563,7 @@ msgstr "
 msgid "Regexp:"
 msgstr "����ǥ����:"
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "����:"
 
@@ -723,7 +723,7 @@ msgid "nodupes"
 msgstr "�ߺ��� �Ⱦ�!"
 
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr "��� ������"
 
@@ -755,7 +755,7 @@ msgstr ""
 msgid "notmetoo"
 msgstr "������ �Ⱦ�!"
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr "��ޱ���"
 
@@ -1069,152 +1069,152 @@ msgstr "
 msgid "Submit Your Changes"
 msgstr "���� ����"
 
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr "�۰����� ��й�ȣ�� ���� ���� �ʽ��ϴ�."
 
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 #, fuzzy
 msgid "Poster passwords did not match"
 msgstr "����� ��й�ȣ�� ���� ���� �ʽ��ϴ�."
 
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 #, fuzzy
 msgid "Administrator passwords did not match"
 msgstr "������ ��й�ȣ�� ���� ���� �ʽ��ϴ�."
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "�̹� ȸ���Դϴ�."
 
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr "&lt;���� ��&gt;"
 
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "�߸���/���� E���� �ּ�"
 
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr "�������� �ּ��Դϴ�. (������ �ʴ� ���ڸ� ���>�մϴ�.)"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "���������� �ʴ�� ����:"
 
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "���������� ���Ե� ����:"
 
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "�ʴ� ����:"
 
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "���� ����:"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "���������� ��� ����:"
 
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr "��ȸ���� Ż���� �� �����ϴ�:"
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 msgid "You must provide both current and new addresses."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 #, fuzzy
 msgid "%(schange_to)s is already a list member."
 msgstr " �� �̹� ȸ���Դϴ�."
 
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 #, fuzzy
 msgid "%(schange_to)s is not a valid email address."
 msgstr "�ùٸ� E���� �ּҸ� �Է��ϼž� �մϴ�."
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 #, fuzzy
 msgid "%(schange_to)s is already a member"
 msgstr " �� �̹� ȸ���Դϴ�."
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 #, fuzzy
 msgid "%(list_name)s address change notice."
 msgstr "%(realname)s �� ����"
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 #, fuzzy
 msgid "Notification sent to %(schange_from)s."
 msgstr "���� ����"
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 #, fuzzy
 msgid "Notification sent to %(schange_to)s."
 msgstr "���� ����"
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr "�߸��� �۰��� ��ȣ�Դϴ�."
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 #, fuzzy
 msgid "member mgt page"
 msgstr "ȸ�� ���� �������� ����"
 
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "������ ���� �ʾҽ��ϴ�."
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr "���� ���ܿ��� ���õ� ȸ��: %(user)s"
 
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "���������� ���ŵ� ����:"
 
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "�� ����:"
 
@@ -1769,8 +1769,8 @@ msgstr ""
 "\n"
 "<p> Ȥ�� Ż�� ��û�� ����ϱ� ���ؼ� <em>����ϰ� ������</em>�� ��������."
 
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "Ż���ϱ�"
 
@@ -2345,47 +2345,51 @@ msgstr "
 msgid "List name is required."
 msgstr "����Ʈ �̸��� �ʿ��մϴ�."
 
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr "%(realname)s -- %(template_info)s HTML �����ϱ�"
 
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr "HTML ���� : ����"
 
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr "%(safetemplatename)s: �߸��� ���ø�"
 
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr "%(realname)s -- HTML ������ �����ϱ�"
 
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr "������ �������� �����ϼ���:"
 
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "���ϸ� ����Ʈ ���� ���� ����, Ȥ�� ����."
 
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "������ �� �ϼ̴ٸ� \"�����ϱ�\" �� �����ּ���."
 
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "�����ϱ�"
 
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr "�� html �������� ���� �� �����ϴ�."
 
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr "HTML �� ������� �ʾҽ��ϴ�."
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2394,20 +2398,20 @@ msgid ""
 "             "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 #, fuzzy
 msgid "Page Unchanged."
 msgstr "HTML �� ������� �ʾҽ��ϴ�."
 
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr "HTML �� ���������� ������Ʈ �Ǿ����ϴ�."
 
@@ -2467,7 +2471,7 @@ msgstr ""
 msgid "Edit Options"
 msgstr "���� ���� �κ�"
 
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "�� ������ ����"
@@ -2476,94 +2480,94 @@ msgstr "
 msgid "This form requires JavaScript."
 msgstr ""
 
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "CGI ��ũ��Ʈ ����"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "E���� �ּҰ� �־����� �ʾҽ��ϴ�."
 
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 #, fuzzy
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "�̻��� ������ E���� �ּҸ� �ּ̽��ϴ�."
 
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr "%(safeuser)s ��� ����ڰ� �����ϴ�."
 
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 #, fuzzy
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr "Ȯ�� E������ ���������ϴ�."
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 #, fuzzy
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
 "             forwarded to the list administrator for approval."
 msgstr "����� Ż�� ��û�� ������ ���� ����Ʈ �����ڿ��� ���޵Ǿ����ϴ�."
 
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 #, fuzzy
 msgid ""
 "If you are a list member,\n"
 "            your password has been emailed to you."
 msgstr "����� �н����带 ������ ������ ��ſ��� ���޵Ǿ����ϴ�"
 
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "���� ����"
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr "����� �н����带 ������ ������ ��ſ��� ���޵Ǿ����ϴ�"
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
 msgstr ""
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr ""
 
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 #, fuzzy
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr "%(hostname)s ���� %(safeuser)s �� ���� ����Ʈ ����"
 
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
 msgstr "��û�� ���ϸ� ����Ʈ�� ���� �������� �湮�ϽǷ��� ��ũ�� Ŭ���ϼ���."
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
 "            subscription for this mailing list has been changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "E���� �ּҰ� ���� �ʽ��ϴ�!"
 
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr "����� �̹� E���� �ּҸ� ������Դϴ�."
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 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 "
@@ -2572,33 +2576,33 @@ msgid ""
 "%(safeuser)s will be changed. "
 msgstr ""
 
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 #, fuzzy
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "%(newaddr)s �� �̹� ����Ʈ�� ȸ���Դϴ�."
 
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "E���� �ּҴ� ��� ������ �ȵ˴ϴ�."
 
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 #, fuzzy
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr "Ȯ�� �޼����� %(newaddr)s �� ���������ϴ�."
 
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "�߸��� E���� �ּҸ� �ּ̽��ϴ�."
 
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "�̻��� ������ E���� �ּҸ� �ּ̽��ϴ�."
 
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s �� �̹� ����Ʈ�� ȸ���Դϴ�."
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 #, fuzzy
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
@@ -2609,12 +2613,12 @@ msgstr ""
 "�� ������ �ִٰ� �����Ͻø� ����Ʈ ������( %(owneraddr)s )���� �����Ͻñ� ��"
 "���ϴ�."
 
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 #, fuzzy
 msgid "Member name successfully changed. "
 msgstr "ȸ�� �̸��� ���������� ����Ǿ����ϴ�."
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 #, fuzzy
 msgid ""
 "The list administrator may not change the\n"
@@ -2624,15 +2628,15 @@ msgstr ""
 "���� ��� ������ ���������� ������� �ʾҽ��ϴ�. ������ ����� �ٸ� ������ ��"
 "�������� ����Ǿ����ϴ�."
 
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "�н�����(��)�� ��������� �ȵ˴ϴ�."
 
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "�н�����(��)�� ���� �ʽ��ϴ�!"
 
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 #, fuzzy
 msgid ""
 "The list administrator may not change the\n"
@@ -2643,12 +2647,12 @@ msgstr ""
 "���� ��� ������ ���������� ������� �ʾҽ��ϴ�. ������ ����� �ٸ� ������ ��"
 "�������� ����Ǿ����ϴ�."
 
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "��й�ȣ�� ���������� ����Ǿ����ϴ�."
 
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
@@ -2657,15 +2661,15 @@ msgstr ""
 "����� �Ʒ��� <em>Ż���ϱ�</em>��ư üũ�ڽ��� ���������ν� ����� Ż�� ��û"
 "�� Ȯ���ؾ� �մϴ�. ����� Ż����� �ʾҽ��ϴ�!"
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 msgid "via the member options page"
 msgstr "ȸ�� ���� �������� ����"
 
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "�� �����"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -2675,7 +2679,7 @@ msgstr ""
 "����� Ż�� ��û�� ����Ʈ �۰������� ������ ���� ���������� ���޵Ǿ����ϴ�. "
 "����� �۰������� ������ ���� ������ E���Ϸ� ������ �� �ֽ��ϴ�."
 
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -2689,7 +2693,7 @@ msgstr ""
 "�ֽ��ϴ�. ���� �������� Ż�� ���� � ������ �����ø� %(owneraddr)s (����"
 "Ʈ ������) �� ���� �ֽñ� �ٶ��ϴ�."
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -2697,7 +2701,7 @@ msgid ""
 "                changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -2708,7 +2712,7 @@ msgstr ""
 "���� ��� ������ ���������� ������� �ʾҽ��ϴ�. ������ ����� �ٸ� ������ ��"
 "�������� ����Ǿ����ϴ�."
 
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -2719,63 +2723,63 @@ msgstr ""
 "���� ��� ������ ���������� ������� �ʾҽ��ϴ�. ������ ����� �ٸ� ������ ��"
 "�������� ����Ǿ����ϴ�."
 
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "���� ������ ���������� �����Ͽ����ϴ�."
 
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "����� �ϳ� �̻��� ��������� ������ �� �ֽ��ϴ�."
 
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>��, �� ���� Ż���Ͻ� ���մϴ�.</em>"
 
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "���� ��й�ȣ �����ϱ�"
 
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "���� �ٸ� ���� ���"
 
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "������ ���� ��й�ȣ�� E���Ϸ� ������~"
 
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "��й�ȣ"
 
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "�α� �ƿ�"
 
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "���� �����ϱ�"
 
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "����"
 
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "��"
 
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "���� E���� �ּҿ� �̸� �����ϱ�"
 
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "<em>������ ���ǵ� ���� �����ϴ�.</em>"
 
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
@@ -2785,20 +2789,20 @@ msgstr ""
 "�̹� ����Ǿ� �ִ� �ּ�(<em>%(cpuser)s</em)�� �� ���ϸ� ����Ʈ�� �����ϼ̽���"
 "��."
 
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "%(realname)s ����Ʈ: ȸ�� ���� �α� ������"
 
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "E���� �ּҿ�"
 
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 #, fuzzy
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr "%(realname)s ����Ʈ: %(safeuser)s ȸ�� ����"
 
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 #, fuzzy
 msgid ""
 "In order to change your membership option, you must\n"
@@ -2827,19 +2831,19 @@ msgstr ""
 "�� ���°ų�, ������ ȭ�鿡�� ���� �ִ� \"<em>�α׾ƿ�</em>\"(�������� ������"
 "���� �α� �� �ϸ� �� �� �ֽ��ϴ�.) �� Ŭ���ϸ� �ڵ����� �������ϴ�."
 
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "E���� �ּ�:"
 
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "��й�ȣ:"
 
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "���"
 
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -2852,11 +2856,11 @@ msgstr ""
 "���ϳ��� �ȳ����� ���ñ� �ٶ��ϴ�.)�� �Ϸ��ϱ� ���� ����� �������� ��ũ�� ��"
 "���ϰ� �ֽ��ϴ�."
 
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "����� �����(Reminder)"
 
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
@@ -2864,27 +2868,27 @@ msgstr ""
 "<em>���� ��й�ȣ�� ������!</em> ��ư�� Ŭ�������ν� ����� ��й�ȣ�� ��ſ�"
 "�� ��޵� ���Դϴ�."
 
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "���� ��й�ȣ�� ������!"
 
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr "<����>"
 
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "��û�� ������ Ʋ���ϴ�: %(topicname)s"
 
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "���� �ɷ����� ���λ���"
 
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "�̸�: "
 
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr "����(����ǥ��������):"
 
@@ -6265,7 +6269,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -6290,7 +6294,7 @@ msgstr ""
 "�����ǰų�, Ȥ�� �������ϴ�.\n"
 "\n"
 "<p> �Ʒ��� �ؽ�Ʈ �ڽ����� ��(line)���� �ϳ��� �ּҸ� ���� �� ������ ^ ����"
-"�� �����ϴ� ���� <a href=\"http://docs.python.org/library/re.html\">Python ��"
+"�� �����ϴ� ���� <a href=\"https://docs.python.org/2/library/re.html\">Python ��"
 "�� ǥ����</a>�� ��Ÿ���ϴ�. �齽������ �������ν� Python �� raw ���ڿ��� ���"
 "�� �� �ֽ��ϴ�.(���� ��� ����� �Ϲ������� �ϳ��� �齽������ ����մϴ�.)<p>"
 "�����Խ� ������ �׻� ó���� ������ �Ͻʽÿ�."
@@ -6972,7 +6976,7 @@ msgstr "
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -6994,7 +6998,7 @@ msgid ""
 "\">topics_bodylines_limit</a>\n"
 "             configuration variable."
 msgstr ""
-"���� �ɷ������ ����� �Ʒ����� ���� href=\"http://docs.python.org/library/"
+"���� �ɷ������ ����� �Ʒ����� ���� href=\"https://docs.python.org/2/library/"
 "re.html\">���� ǥ���� - �ɷ�����</a>�� ���� ������ E���� �޼��� �з��� �� "
 "�ֽ��ϴ�. ���� �޼����� ��� <code>����:</code> Ȥ�� <code>Ű����:</code>�� "
 "�ɷ����� ����� �°� �Ǹ� �޼����� ���������� ���� <em>������(���� ��: �ٱ�"
@@ -7499,7 +7503,7 @@ msgstr "
 msgid "Once a month, your password will be emailed to you as a reminder."
 msgstr "�Ѵ޿� �ѹ� �������� �н����带 Email�� �����帳�ϴ�."
 
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 #, fuzzy
 msgid "The current archive"
 msgstr "���� �����"
@@ -7857,7 +7861,7 @@ msgstr "
 msgid "Posting of your message titled \"%(subject)s\""
 msgstr "\"%(subject)s\" ������ ������"
 
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "[������ �����ϴ�]"
 
@@ -7869,28 +7873,28 @@ msgstr "
 msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr "%(addr)s �� ������ %(realname)s ����Ʈ�� ���� ���ο� ���� ��û"
 
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "���� ��û"
 
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "������ ��ٸ��� �ϱ�"
 
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr "%(addr)s �ּҷ� %(realname)s �� ������ ���ο� Ż�� ��û"
 
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr "Ż�� ��û"
 
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr "���� �޼���"
 
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr "%(realname)s ���ϸ� ����Ʈ�� ���� ��û�� �����Ǿ����ϴ�."
 
@@ -8007,56 +8011,56 @@ msgstr "%(listname)s 
 msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr "%(listname)s ���ϸ� ����Ʈ���� Ż��Ǽ̽��ϴ�."
 
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr "%(remote)s ����"
 
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr "%(realname)s �� �����ϱ� ���ؼ��� �۰������� ������ �ʿ��մϴ�."
 
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "%(realname)s ���� ����"
 
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr "Ż���ϱ�� �۰������� ������ �ʿ��մϴ�."
 
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr "%(realname)s �� ����"
 
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 #, fuzzy
 msgid "%(realname)s address change notification"
 msgstr "%(realname)s �� ����"
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "�߸��� Ȯ�� ���ڿ�"
 
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "�߸��� Ȯ�� ���ڿ�"
 
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr "%(name)s �� �����ϱ� ���ؼ��� �������� ������ �ʿ��մϴ�."
 
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "�߸��� Ȯ�� ���ڿ�"
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "����� ������ ���� "
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr ""
 
@@ -8130,15 +8134,15 @@ msgstr ""
 msgid "Original message suppressed by Mailman site configuration\n"
 msgstr ""
 
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr "Mailman �� ����Ͽ����ϴ�.<br>���� %(version)s"
 
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr "Python Powered"
 
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr "Gnu's Not Unux"
 
@@ -9128,7 +9132,7 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
@@ -11348,11 +11352,11 @@ msgstr ""
 
 #~ msgid ""
 #~ "<li>Find members by\n"
-#~ "                <a href=\"http://docs.python.org/library/re.html#regular-"
+#~ "                <a href=\"https://docs.python.org/2/library/re.html#regular-"
 #~ "expression-syntax\"\n"
 #~ "                >Python regular expression</a> (<em>regexp</em>)<br>"
 #~ msgstr ""
-#~ "<li><a href=\"http://docs.python.org/library/re.html#regular-expression-"
+#~ "<li><a href=\"https://docs.python.org/2/library/re.html#regular-expression-"
 #~ "syntax\">\n"
 #~ "Python ���� ǥ����</a> (<em>regexp</em>)�� ȸ�� ã��<br>"
 
diff --git a/messages/lt/LC_MESSAGES/mailman.po b/messages/lt/LC_MESSAGES/mailman.po
index 671407fa..f974cc23 100644
--- a/messages/lt/LC_MESSAGES/mailman.po
+++ b/messages/lt/LC_MESSAGES/mailman.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mailman 2.1\n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: 2002-12-26 09:07+0200\n"
 "Last-Translator: Mantas Kriauciunas <mantas@akl.lt>\n"
 "Language-Team: Lithuanian <info@akl.lt>\n"
@@ -223,7 +223,7 @@ msgstr "J
 msgid "by the list administrator"
 msgstr "forumo administratoriaus"
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "d�l ne�inom� prie�as�i�"
 
@@ -240,24 +240,24 @@ msgstr "u
 msgid "Bounce action notification"
 msgstr "Bounce action notification"
 
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "u�drausta"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 #, fuzzy
 msgid " The last bounce received from you was dated %(date)s"
 msgstr " The last bounce received from you was dated %(date)s"
 
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
 msgid "(no subject)"
 msgstr "(nenurodyta tema)"
 
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 #, fuzzy
 msgid "[No bounce details are available]"
 msgstr "[No bounce details are available]"
@@ -272,7 +272,7 @@ msgstr "administratoriaus"
 
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -280,7 +280,7 @@ msgstr "N
 
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -290,8 +290,8 @@ msgstr "Klaida"
 
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -303,7 +303,7 @@ msgid "Authorization failed."
 msgstr "Nes�kminga registracija"
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr ""
 
@@ -323,7 +323,7 @@ msgstr ""
 "                forumu."
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "Persp�jimas: "
 
@@ -500,7 +500,7 @@ msgstr "Tend to pending moderator requests"
 msgid "Go to the general list information page"
 msgstr "Eikite � pagrindin� forumo informacijos puslap�"
 
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 #, fuzzy
 msgid "Edit the public HTML pages and text files"
 msgstr "Redaguoti skelbiamus HTML puslapius"
@@ -605,7 +605,7 @@ msgstr "Topic name:"
 msgid "Regexp:"
 msgstr "Regexp:"
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "Apra�as:"
 
@@ -781,7 +781,7 @@ msgid "nodupes"
 msgstr "nodupes"
 
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 #, fuzzy
 msgid "digest"
 msgstr "digest"
@@ -819,7 +819,7 @@ msgstr "B"
 msgid "notmetoo"
 msgstr "not metoo"
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr "nomail"
 
@@ -1164,155 +1164,155 @@ msgstr "Patvirtinkite moderatoriaus slapta
 msgid "Submit Your Changes"
 msgstr "Patvirtinti J�s� pakeitimus"
 
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr "Neatitinka moderatoriaus slapta�odis"
 
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 #, fuzzy
 msgid "Poster passwords did not match"
 msgstr "J�s� slapta�od�iai nesutampa."
 
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 #, fuzzy
 msgid "Administrator passwords did not match"
 msgstr "Neatitinka administratoriaus slapta�odis"
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "Jau dalyvis"
 
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 #, fuzzy
 msgid "&lt;blank line&gt;"
 msgstr "&lt;tu��ia eilut�&gt;"
 
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "Neteisingas el. pa�to adresas"
 
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 #, fuzzy
 msgid "Hostile address (illegal characters)"
 msgstr "Hostile address (illegal characters)"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "S�kmingai pakviesti:"
 
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "S�kmingai u�sisak�"
 
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "Nes�kmingai kviesti:"
 
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "Nes�kmingai u�sisakin�jo:"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "S�kmingai atsisak�:"
 
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr "Ne nariai neturi ko atsisakyti:"
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 msgid "You must provide both current and new addresses."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 #, fuzzy
 msgid "%(schange_to)s is already a list member."
 msgstr "forumo dalyvis nuo seniau"
 
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 #, fuzzy
 msgid "%(schange_to)s is not a valid email address."
 msgstr "Turite �vesti galiojant� el. pa�to adres�."
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 #, fuzzy
 msgid "%(schange_to)s is already a member"
 msgstr "forumo dalyvis nuo seniau"
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 #, fuzzy
 msgid "%(list_name)s address change notice."
 msgstr "%(realname)s atsisakymo patvirtinimas"
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 #, fuzzy
 msgid "Notification sent to %(schange_from)s."
 msgstr "Prane�imai"
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 #, fuzzy
 msgid "Notification sent to %(schange_to)s."
 msgstr "Prane�imai"
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 #, fuzzy
 msgid "Bad moderation flag value"
 msgstr "Bad moderation flag value"
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 msgid "member mgt page"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "Neu�sisak�s"
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 #, fuzzy
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr "Ignoring changes to deleted member: %(user)s"
 
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "S�kmingai pa�alinti:"
 
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "Klaida atsisakant:"
 
@@ -1850,8 +1850,8 @@ msgid ""
 "    request."
 msgstr ""
 
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "Atsisakyti"
 
@@ -2341,47 +2341,51 @@ msgstr " Slapta
 msgid "List name is required."
 msgstr "B�tinas forumo pavadinimas"
 
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr "%(realname)s -- Redaguoti %(template_info)s HTML"
 
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr "Redaguoti HYML : Klaida"
 
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr "%(realname)s -- HTML Puslapio Redagavimas"
 
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "Per�i�r�ti arba redaguoti forumo nustatymus."
 
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "Kai �vedin�jate pakeitimus..."
 
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "I�si�sti Pakeitimus"
 
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr "HTML negali b�ti tu��ias."
 
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr "HTML nepakeistas."
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2390,20 +2394,20 @@ msgid ""
 "             "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 #, fuzzy
 msgid "Page Unchanged."
 msgstr "HTML nepakeistas."
 
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr "HTML s�kmingai atnaujintas."
 
@@ -2464,7 +2468,7 @@ msgstr ""
 msgid "Edit Options"
 msgstr "Keisti nustatymus"
 
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "�i�r�ti �� puslap�"
@@ -2473,35 +2477,35 @@ msgstr "
 msgid "This form requires JavaScript."
 msgstr ""
 
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "CFI skripto klaida"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "Ne�vestas adresas"
 
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 #, fuzzy
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "Neteisingas adresas"
 
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr "N�ra tokio vartotojo: %(safeuser)s."
 
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 #, fuzzy
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr "Jums i�si�stas patvirtinimas."
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 #, fuzzy
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
@@ -2510,59 +2514,59 @@ msgstr ""
 "J�s� prisijungimo pra�ymas buvo persi�stas forumo administratoriui\n"
 "� %(listowner)s."
 
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 #, fuzzy
 msgid ""
 "If you are a list member,\n"
 "            your password has been emailed to you."
 msgstr "Jums i�si�stas slapta�od�io priminimas."
 
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "Nes�kmingas prisijungimas."
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr "Jums i�si�stas slapta�od�io priminimas."
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
 msgstr ""
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr ""
 
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 #, fuzzy
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr "I�vardinti %(safeuser)s u�sisakymus serveryje %(hostname)s"
 
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
 msgstr ""
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
 "            subscription for this mailing list has been changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr ""
 
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr ""
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 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 "
@@ -2571,84 +2575,84 @@ msgid ""
 "%(safeuser)s will be changed. "
 msgstr ""
 
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "Naujasis adresas %(newaddr)s jau forumo dalyvis"
 
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "Negalima praleisti adreso"
 
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr "%(newaddr)s i�si�stas patvirtinimo lai�kas."
 
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "Neteisingas adresas"
 
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "Neteisingas adresas"
 
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s �io forumo dalyvis nuo anks�iau."
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
 "                      think this restriction is erroneous, please contact\n"
 "                      the list owners at %(owneraddr)s."
 msgstr ""
 
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr "Dalyvio vardas s�kmingai pakeistas. "
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 msgid ""
 "The list administrator may not change the\n"
 "                    password for a user."
 msgstr ""
 
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "Slapta�odis negali b�ti tu��ias"
 
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "Slapta�od�iai nesutampa!"
 
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 msgid ""
 "The list administrator may not change the\n"
 "            password for this user's other subscriptions.  However, the\n"
 "            password for this mailing list has been changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "Slapta�odis s�kmingai pakeistas."
 
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
 "                have not been unsubscribed!"
 msgstr ""
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 #, fuzzy
 msgid "via the member options page"
 msgstr "Forumo %(realname)s dalyvi� nustatymo puslapio prisijungimas"
 
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "Atsisakymo rezultatai"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -2656,7 +2660,7 @@ msgid ""
 "            decision."
 msgstr ""
 
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -2666,7 +2670,7 @@ msgid ""
 "            %(owneraddr)s."
 msgstr ""
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -2674,7 +2678,7 @@ msgid ""
 "                changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -2682,7 +2686,7 @@ msgid ""
 "            other options have been set successfully."
 msgstr ""
 
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -2690,83 +2694,83 @@ msgid ""
 "            your other options have been set successfully."
 msgstr ""
 
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "S�kmingai �ra��te nustatymus."
 
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "Gausite vien� paskutin� rinkin�."
 
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>Taip, a� tikrai noriu atsisakyti</em>"
 
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "Pakeiskite mano slapta�od�"
 
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "Parodyti kitus mano u�sisakytus forumus"
 
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "I�si�skite man mano slapta�od�"
 
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "Slapta�odis"
 
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "Atsijungti"
 
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "Patvirtinti mano pakeitimus"
 
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "dien�"
 
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "diena"
 
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "Pakeisti Mano Adres� ir Vard�"
 
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr ""
 
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
 "<em>%(cpuser)s</em>."
 msgstr ""
 
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "Forumo %(realname)s dalyvi� nustatymo puslapio prisijungimas"
 
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr " el. pa�to adresas ir "
 
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 #, fuzzy
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr "Forumo %(realname)s dalyvio %(safeuser)s nustatymai"
 
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -2797,19 +2801,19 @@ msgstr ""
 "    i�saugoti.\n"
 "    "
 
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr " El. pa�to adresas:"
 
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr " Slapta�odis:"
 
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr " Prisijungti"
 
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -2825,11 +2829,11 @@ msgstr ""
 "    galite patvirtinti ir lai�ku; �r. instrukcijas patvirtinimo\n"
 "    lai�ke)."
 
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr " Slapta�od�io priminimas"
 
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
@@ -2837,27 +2841,27 @@ msgstr ""
 "Spustelkite mygtuk� <em>Priminti</em> \n"
 "\t\tir Jums bus i�si�stas J�s� slapta�odis."
 
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "Priminti"
 
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr ""
 
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr ""
 
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "Vardas:"
 
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr "Fragmentas (regexp):"
 
@@ -5911,7 +5915,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -6491,7 +6495,7 @@ msgstr ""
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -6971,7 +6975,7 @@ msgid "Once a month, your password will be emailed to you as a reminder."
 msgstr ""
 "<br>Kart� � m�nes� el. pa�to lai�ku Jums bus primenamss J�s� slapta�odis."
 
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 msgid "The current archive"
 msgstr ""
 
@@ -7285,7 +7289,7 @@ msgstr ""
 msgid "Posting of your message titled \"%(subject)s\""
 msgstr ""
 
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "[Nenurodyta prie�astis]"
 
@@ -7297,28 +7301,28 @@ msgstr ""
 msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr ""
 
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "U�sisakymo pra�ymas"
 
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "Atstatyti naryst� forume."
 
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr ""
 
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr ""
 
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr ""
 
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr ""
 
@@ -7412,56 +7416,56 @@ msgstr "You are not a member of the %(listname)s mailing list"
 msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr "You are not a member of the %(listname)s mailing list"
 
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr " nuo %(remote)s"
 
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr "forumo %(realname)s u�sisakymui b�tinas pri�i�r�tojo patvirtinimas"
 
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "%(realname)s u�sisakymo patvirtinimas"
 
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr "atsisakymui b�tinas pri�i�r�tojo patvirtinimas"
 
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr "%(realname)s atsisakymo patvirtinimas"
 
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 #, fuzzy
 msgid "%(realname)s address change notification"
 msgstr "%(realname)s atsisakymo patvirtinimas"
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "Bloga patvirtinimo eilut�"
 
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "Bloga patvirtinimo eilut�"
 
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr ""
 
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "Bloga patvirtinimo eilut�"
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "�veskite patvirtinimo eilut�"
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr ""
 
@@ -7543,15 +7547,15 @@ msgstr ""
 msgid "Original message suppressed by Mailman site configuration\n"
 msgstr ""
 
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr ""
 
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr ""
 
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr ""
 
@@ -8531,7 +8535,7 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
diff --git a/messages/mailman.pot b/messages/mailman.pot
index 56489f6b..95d11280 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 Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\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"
@@ -205,7 +205,7 @@ msgstr ""
 msgid "by the list administrator"
 msgstr ""
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297
 #: Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr ""
@@ -222,22 +222,22 @@ msgstr ""
 msgid "Bounce action notification"
 msgstr ""
 
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 msgid "disabled address"
 msgstr ""
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr ""
 
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
 msgid "(no subject)"
 msgstr ""
 
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr ""
 
@@ -251,7 +251,7 @@ msgstr ""
 
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121
 #: Mailman/Cgi/confirm.py:62 Mailman/Cgi/edithtml.py:86
-#: Mailman/Cgi/listinfo.py:55 Mailman/Cgi/options.py:100
+#: Mailman/Cgi/listinfo.py:55 Mailman/Cgi/options.py:101
 #: Mailman/Cgi/private.py:108 Mailman/Cgi/rmlist.py:75
 #: Mailman/Cgi/roster.py:59 Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -260,7 +260,7 @@ msgstr ""
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136
 #: Mailman/Cgi/confirm.py:80 Mailman/Cgi/create.py:50
 #: Mailman/Cgi/edithtml.py:103 Mailman/Cgi/listinfo.py:67
-#: Mailman/Cgi/options.py:119 Mailman/Cgi/private.py:125
+#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:125
 #: Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72 Mailman/Cgi/roster.py:153
 #: Mailman/Cgi/roster.py:154 Mailman/Cgi/subscribe.py:55
 #: Mailman/Cgi/subscribe.py:66 Mailman/Cgi/subscribe.py:81
@@ -270,7 +270,7 @@ msgstr ""
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137
 #: Mailman/Cgi/confirm.py:81 Mailman/Cgi/create.py:51
 #: Mailman/Cgi/edithtml.py:104 Mailman/Cgi/listinfo.py:68
-#: Mailman/Cgi/options.py:83 Mailman/Cgi/options.py:120
+#: Mailman/Cgi/options.py:84 Mailman/Cgi/options.py:121
 #: Mailman/Cgi/private.py:126 Mailman/Cgi/rmlist.py:49
 #: Mailman/Cgi/roster.py:73 Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -282,7 +282,7 @@ msgid "Authorization failed."
 msgstr ""
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr ""
 
@@ -296,7 +296,7 @@ msgid ""
 msgstr ""
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr ""
 
@@ -424,7 +424,7 @@ msgstr ""
 msgid "Go to the general list information page"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 msgid "Edit the public HTML pages and text files"
 msgstr ""
 
@@ -511,7 +511,7 @@ msgstr ""
 msgid "Regexp:"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr ""
 
@@ -667,7 +667,7 @@ msgid "nodupes"
 msgstr ""
 
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr ""
 
@@ -699,7 +699,7 @@ msgstr ""
 msgid "notmetoo"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr ""
 
@@ -970,143 +970,143 @@ msgstr ""
 msgid "Submit Your Changes"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 msgid "Poster passwords did not match"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 msgid "Administrator passwords did not match"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 msgid "You must provide both current and new addresses."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 msgid "%(schange_to)s is already a list member."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 msgid "%(schange_to)s is not a valid email address."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 msgid "%(schange_to)s is already a member"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 msgid "%(list_name)s address change notice."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 msgid "Notification sent to %(schange_from)s."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 msgid "Notification sent to %(schange_to)s."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 msgid "member mgt page"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr ""
 
@@ -1579,8 +1579,8 @@ msgid ""
 "    request."
 msgstr ""
 
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr ""
 
@@ -2046,47 +2046,51 @@ msgstr ""
 msgid "List name is required."
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2095,19 +2099,19 @@ msgid ""
 "             "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 msgid "Page Unchanged."
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr ""
 
@@ -2155,7 +2159,7 @@ msgstr ""
 msgid "Edit Options"
 msgstr ""
 
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr ""
@@ -2164,89 +2168,89 @@ msgstr ""
 msgid "This form requires JavaScript."
 msgstr ""
 
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr ""
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr ""
 
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr ""
 
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr ""
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
 "             forwarded to the list administrator for approval."
 msgstr ""
 
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 msgid ""
 "If you are a list member,\n"
 "            your password has been emailed to you."
 msgstr ""
 
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr ""
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
 msgstr ""
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr ""
 
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
 msgstr ""
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
 "            subscription for this mailing list has been changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr ""
 
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr ""
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 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 of\n"
@@ -2254,83 +2258,83 @@ msgid ""
 "%(safeuser)s will be changed. "
 msgstr ""
 
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr ""
 
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr ""
 
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr ""
 
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr ""
 
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr ""
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
 "                      think this restriction is erroneous, please contact\n"
 "                      the list owners at %(owneraddr)s."
 msgstr ""
 
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr ""
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 msgid ""
 "The list administrator may not change the\n"
 "                    password for a user."
 msgstr ""
 
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr ""
 
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr ""
 
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 msgid ""
 "The list administrator may not change the\n"
 "            password for this user's other subscriptions.  However, the\n"
 "            password for this mailing list has been changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
 "                have not been unsubscribed!"
 msgstr ""
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 msgid "via the member options page"
 msgstr ""
 
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr ""
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -2338,7 +2342,7 @@ msgid ""
 "            decision."
 msgstr ""
 
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -2347,7 +2351,7 @@ msgid ""
 "            %(owneraddr)s."
 msgstr ""
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -2355,96 +2359,96 @@ msgid ""
 "                changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However your\n"
 "            other options have been set successfully."
 msgstr ""
 
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  However\n"
 "            your other options have been set successfully."
 msgstr ""
 
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr ""
 
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr ""
 
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr ""
 
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr ""
 
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr ""
 
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr ""
 
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr ""
 
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr ""
 
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr ""
 
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr ""
 
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr ""
 
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr ""
 
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr ""
 
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
 "<em>%(cpuser)s</em>."
 msgstr ""
 
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr ""
 
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr ""
 
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -2459,19 +2463,19 @@ msgid ""
 "    "
 msgstr ""
 
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr ""
 
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr ""
 
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr ""
 
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -2480,37 +2484,37 @@ msgid ""
 "    message)."
 msgstr ""
 
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr ""
 
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
 msgstr ""
 
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr ""
 
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr ""
 
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr ""
 
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr ""
 
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr ""
 
@@ -5239,7 +5243,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do so\n"
 "            as if you were using Python raw strings (i.e. you generally just\n"
 "            use a single backslash).\n"
@@ -5766,7 +5770,7 @@ msgstr ""
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains a\n"
 "             match against a topic filter, the message is logically placed\n"
@@ -6186,7 +6190,7 @@ msgstr ""
 msgid "Once a month, your password will be emailed to you as a reminder."
 msgstr ""
 
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 msgid "The current archive"
 msgstr ""
 
@@ -6492,7 +6496,7 @@ msgstr ""
 msgid "Posting of your message titled \"%(subject)s\""
 msgstr ""
 
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr ""
 
@@ -6504,27 +6508,27 @@ msgstr ""
 msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr ""
 
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr ""
 
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 msgid "via admin approval"
 msgstr ""
 
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr ""
 
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr ""
 
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr ""
 
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr ""
 
@@ -6614,51 +6618,51 @@ msgstr ""
 msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr ""
 
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr ""
 
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr ""
 
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr ""
 
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr ""
 
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr ""
 
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 msgid "%(realname)s address change notification"
 msgstr ""
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 msgid "via email confirmation"
 msgstr ""
 
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 msgid "via web confirmation"
 msgstr ""
 
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr ""
 
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 msgid "email confirmation"
 msgstr ""
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 msgid "web confirmation"
 msgstr ""
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr ""
 
@@ -6731,15 +6735,15 @@ msgid ""
 "Original message suppressed by Mailman site configuration\n"
 msgstr ""
 
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr ""
 
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr ""
 
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr ""
 
@@ -7681,7 +7685,7 @@ msgid ""
 "Regular expression syntax is Perl5-like, using the Python re module.  Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
diff --git a/messages/marked.files b/messages/marked.files
index 59ab3d8a..3fd8ab55 100644
--- a/messages/marked.files
+++ b/messages/marked.files
@@ -1,133 +1,133 @@
-Mailman/Autoresponder.py
-Mailman/Gui/Topics.py
-Mailman/Gui/Archive.py
-Mailman/Gui/Bounce.py
-Mailman/Gui/Usenet.py
-Mailman/Gui/NonDigest.py
-Mailman/Gui/Membership.py
-Mailman/Gui/Passwords.py
-Mailman/Gui/Digest.py
-Mailman/Gui/Autoresponse.py
-Mailman/Gui/GUIBase.py
-Mailman/Gui/__init__.py
-Mailman/Gui/ContentFilter.py
-Mailman/Gui/Language.py
-Mailman/Gui/Privacy.py
-Mailman/Gui/General.py
-Mailman/MemberAdaptor.py
-Mailman/Commands/__init__.py
-Mailman/Pending.py
+Mailman/SafeDict.py
+Mailman/Post.py
+Mailman/LockFile.py
+Mailman/Version.py
 Mailman/CSRFcheck.py
-Mailman/Digester.py
+Mailman/Autoresponder.py
+Mailman/Bouncer.py
+Mailman/Bouncers/Microsoft.py
+Mailman/Bouncers/Caiwireless.py
+Mailman/Bouncers/Yale.py
+Mailman/Bouncers/SimpleWarning.py
+Mailman/Bouncers/GroupWise.py
 Mailman/Bouncers/Yahoo.py
+Mailman/Bouncers/LLNL.py
 Mailman/Bouncers/SMTP32.py
-Mailman/Bouncers/Yale.py
 Mailman/Bouncers/AOL.py
-Mailman/Bouncers/SimpleMatch.py
-Mailman/Bouncers/SimpleWarning.py
-Mailman/Bouncers/Caiwireless.py
-Mailman/Bouncers/Qmail.py
-Mailman/Bouncers/BouncerAPI.py
-Mailman/Bouncers/Netscape.py
-Mailman/Bouncers/Postfix.py
-Mailman/Bouncers/Exim.py
 Mailman/Bouncers/Exchange.py
-Mailman/Bouncers/Microsoft.py
-Mailman/Bouncers/LLNL.py
-Mailman/Bouncers/GroupWise.py
-Mailman/Bouncers/Compuserve.py
 Mailman/Bouncers/__init__.py
-Mailman/Bouncers/DSN.py
+Mailman/Bouncers/Compuserve.py
+Mailman/Bouncers/Postfix.py
 Mailman/Bouncers/Sina.py
-Mailman/Mailbox.py
-Mailman/UserDesc.py
-Mailman/Version.py
-Mailman/Bouncer.py
-Mailman/versions.py
-Mailman/LockFile.py
-Mailman/SecurityManager.py
+Mailman/Bouncers/BouncerAPI.py
+Mailman/Bouncers/Qmail.py
+Mailman/Bouncers/DSN.py
+Mailman/Bouncers/SimpleMatch.py
+Mailman/Bouncers/Netscape.py
+Mailman/Bouncers/Exim.py
+Mailman/HTMLFormatter.py
+Mailman/GatewayManager.py
+Mailman/MTA/__init__.py
+Mailman/MTA/Manual.py
+Mailman/MTA/Postfix.py
+Mailman/MTA/Utils.py
+Mailman/Archiver/HyperArch.py
+Mailman/Archiver/Archiver.py
+Mailman/Archiver/__init__.py
+Mailman/Archiver/pipermail.py
+Mailman/Archiver/HyperDatabase.py
+Mailman/__init__.py
+Mailman/Message.py
+Mailman/MemberAdaptor.py
 Mailman/OldStyleMemberships.py
-Mailman/Queue/RetryRunner.py
-Mailman/Queue/BounceRunner.py
-Mailman/Queue/MaildirRunner.py
-Mailman/Queue/VirginRunner.py
-Mailman/Queue/CommandRunner.py
-Mailman/Queue/Switchboard.py
-Mailman/Queue/sbcache.py
-Mailman/Queue/ArchRunner.py
+Mailman/Pending.py
+Mailman/Digester.py
+Mailman/Cgi/options.py
+Mailman/Cgi/Auth.py
+Mailman/Cgi/subscribe.py
+Mailman/Cgi/admindb.py
+Mailman/Cgi/create.py
+Mailman/Cgi/listinfo.py
+Mailman/Cgi/__init__.py
+Mailman/Cgi/admin.py
+Mailman/Cgi/rmlist.py
+Mailman/Cgi/edithtml.py
+Mailman/Cgi/roster.py
+Mailman/Cgi/private.py
+Mailman/Cgi/confirm.py
+Mailman/Site.py
+Mailman/MailList.py
+Mailman/Utils.py
+Mailman/Gui/Autoresponse.py
+Mailman/Gui/Digest.py
+Mailman/Gui/NonDigest.py
+Mailman/Gui/__init__.py
+Mailman/Gui/GUIBase.py
+Mailman/Gui/Usenet.py
+Mailman/Gui/Bounce.py
+Mailman/Gui/Topics.py
+Mailman/Gui/Language.py
+Mailman/Gui/Archive.py
+Mailman/Gui/ContentFilter.py
+Mailman/Gui/Passwords.py
+Mailman/Gui/Membership.py
+Mailman/Gui/General.py
+Mailman/Gui/Privacy.py
 Mailman/Queue/NewsRunner.py
 Mailman/Queue/IncomingRunner.py
+Mailman/Queue/sbcache.py
+Mailman/Queue/Runner.py
 Mailman/Queue/OutgoingRunner.py
+Mailman/Queue/VirginRunner.py
+Mailman/Queue/MaildirRunner.py
 Mailman/Queue/__init__.py
-Mailman/Queue/Runner.py
-Mailman/ListAdmin.py
-Mailman/Message.py
-Mailman/SafeDict.py
-Mailman/TopicMgr.py
+Mailman/Queue/ArchRunner.py
+Mailman/Queue/BounceRunner.py
+Mailman/Queue/CommandRunner.py
+Mailman/Queue/Switchboard.py
+Mailman/Queue/RetryRunner.py
+Mailman/Mailbox.py
+Mailman/Defaults.py
+Mailman/i18n.py
+Mailman/versions.py
+Mailman/Commands/__init__.py
 Mailman/Errors.py
-Mailman/HTMLFormatter.py
-Mailman/Utils.py
 Mailman/htmlformat.py
-Mailman/__init__.py
-Mailman/Logging/StampedLogger.py
-Mailman/Logging/Syslog.py
-Mailman/Logging/Logger.py
-Mailman/Logging/MultiLogger.py
-Mailman/Logging/Utils.py
-Mailman/Logging/__init__.py
-Mailman/MTA/Manual.py
-Mailman/MTA/Postfix.py
-Mailman/MTA/Utils.py
-Mailman/MTA/__init__.py
-Mailman/MailList.py
-Mailman/i18n.py
-Mailman/Deliverer.py
-Mailman/GatewayManager.py
-Mailman/Post.py
-Mailman/Handlers/FileRecips.py
-Mailman/Handlers/ToDigest.py
-Mailman/Handlers/Hold.py
-Mailman/Handlers/Cleanse.py
-Mailman/Handlers/AvoidDuplicates.py
+Mailman/ListAdmin.py
+Mailman/UserDesc.py
+Mailman/SecurityManager.py
+Mailman/TopicMgr.py
 Mailman/Handlers/SpamDetect.py
-Mailman/Handlers/Acknowledge.py
-Mailman/Handlers/OwnerRecips.py
-Mailman/Handlers/WrapMessage.py
-Mailman/Handlers/ToArchive.py
-Mailman/Handlers/MimeDel.py
-Mailman/Handlers/Tagger.py
+Mailman/Handlers/Hold.py
 Mailman/Handlers/Moderate.py
+Mailman/Handlers/Approve.py
+Mailman/Handlers/AfterDelivery.py
+Mailman/Handlers/OwnerRecips.py
 Mailman/Handlers/ToUsenet.py
-Mailman/Handlers/Emergency.py
-Mailman/Handlers/Scrubber.py
+Mailman/Handlers/ToArchive.py
 Mailman/Handlers/SMTPDirect.py
-Mailman/Handlers/ToOutgoing.py
+Mailman/Handlers/Scrubber.py
+Mailman/Handlers/CookHeaders.py
+Mailman/Handlers/WrapMessage.py
+Mailman/Handlers/MimeDel.py
+Mailman/Handlers/__init__.py
 Mailman/Handlers/Decorate.py
+Mailman/Handlers/ToOutgoing.py
+Mailman/Handlers/Replybot.py
+Mailman/Handlers/Emergency.py
+Mailman/Handlers/Tagger.py
+Mailman/Handlers/Acknowledge.py
 Mailman/Handlers/Sendmail.py
-Mailman/Handlers/CookHeaders.py
 Mailman/Handlers/CalcRecips.py
-Mailman/Handlers/__init__.py
-Mailman/Handlers/AfterDelivery.py
 Mailman/Handlers/CleanseDKIM.py
-Mailman/Handlers/Approve.py
-Mailman/Handlers/Replybot.py
-Mailman/Site.py
-Mailman/Defaults.py
-Mailman/Archiver/Archiver.py
-Mailman/Archiver/HyperDatabase.py
-Mailman/Archiver/HyperArch.py
-Mailman/Archiver/__init__.py
-Mailman/Archiver/pipermail.py
-Mailman/Cgi/listinfo.py
-Mailman/Cgi/options.py
-Mailman/Cgi/rmlist.py
-Mailman/Cgi/create.py
-Mailman/Cgi/edithtml.py
-Mailman/Cgi/Auth.py
-Mailman/Cgi/confirm.py
-Mailman/Cgi/private.py
-Mailman/Cgi/roster.py
-Mailman/Cgi/__init__.py
-Mailman/Cgi/admin.py
-Mailman/Cgi/subscribe.py
-Mailman/Cgi/admindb.py
+Mailman/Handlers/ToDigest.py
+Mailman/Handlers/FileRecips.py
+Mailman/Handlers/Cleanse.py
+Mailman/Handlers/AvoidDuplicates.py
+Mailman/Logging/StampedLogger.py
+Mailman/Logging/__init__.py
+Mailman/Logging/Logger.py
+Mailman/Logging/Utils.py
+Mailman/Logging/Syslog.py
+Mailman/Logging/MultiLogger.py
+Mailman/Deliverer.py
diff --git a/messages/nl/LC_MESSAGES/mailman.po b/messages/nl/LC_MESSAGES/mailman.po
index 1029ca87..9cf1da52 100644
--- a/messages/nl/LC_MESSAGES/mailman.po
+++ b/messages/nl/LC_MESSAGES/mailman.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mailman 2.1.14\n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: 2010-07-07 14:17+0100\n"
 "Last-Translator: Jan Veuger <info@janveuger.com>\n"
 "Language-Team: Dutch <info@janveuger.com>\n"
@@ -207,7 +207,7 @@ msgstr "door uzelf"
 msgid "by the list administrator"
 msgstr "door de lijstbeheerder"
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "om onbekende redenen"
 
@@ -223,23 +223,23 @@ msgstr "uitgezet"
 msgid "Bounce action notification"
 msgstr "Bounceactiemelding"
 
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "uitgezet"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr " De laatste bounce ontvangen van u was gedateerd %(date)s"
 
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
 msgid "(no subject)"
 msgstr "(geen onderwerp)"
 
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr "[Er zijn geen bouncedetails beschikbaar]"
 
@@ -253,7 +253,7 @@ msgstr "Beheerder"
 
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -261,7 +261,7 @@ msgstr "Er is geen lijst met de naam <em>%(safelistname)s</em>"
 
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -271,8 +271,8 @@ msgstr "Fout"
 
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -284,7 +284,7 @@ msgid "Authorization failed."
 msgstr "Autorisatie mislukt."
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr ""
 
@@ -303,7 +303,7 @@ msgstr ""
 "          anders is de maillijst onbruikbaar."
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "Waarschuwing: "
 
@@ -463,7 +463,7 @@ msgstr "Verwerk wachtende moderatorverzoeken"
 msgid "Go to the general list information page"
 msgstr "Ga naar de lijstinformatiepagina"
 
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 msgid "Edit the public HTML pages and text files"
 msgstr "Bewerk de publiek toegankelijke HTML-pagina's en de tekstbestanden"
 
@@ -556,7 +556,7 @@ msgstr "Naam onderwerp:"
 msgid "Regexp:"
 msgstr "Uitdrukking:"
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "Omschrijving:"
 
@@ -716,7 +716,7 @@ msgid "nodupes"
 msgstr "geen<br>dubbele"
 
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr "verzamel<br>mail"
 
@@ -748,7 +748,7 @@ msgstr "S"
 msgid "notmetoo"
 msgstr "geen<br>eigen"
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr ""
 
@@ -1077,150 +1077,150 @@ msgstr "Bevestig het post-wachtwoord:"
 msgid "Submit Your Changes"
 msgstr "Verstuur de wijzigingen"
 
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr "Moderatorwachtwoorden kwamen niet overeen"
 
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 msgid "Poster passwords did not match"
 msgstr "Uw post-wachtwoorden kwamen niet overeen."
 
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 msgid "Administrator passwords did not match"
 msgstr "Beheerderswachtwoorden kwamen niet overeen"
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "Is al lid"
 
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr "&lt;lege regel&gt;"
 
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "Ongeldig e-mailadres"
 
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr "Verdacht adres (niet toegestane lettertekens)"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr "Verboden adres (komt overeen met %(pattern)s)"
 
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "Met succes uitgenodigd:"
 
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "Met succes aangemeld:"
 
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "Fout bij het uitnodigen:"
 
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "Fout bij het aanmelden:"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "Met succes afgemeld:"
 
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr "Kan niet-leden niet afmelden:"
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 msgid "You must provide both current and new addresses."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 #, fuzzy
 msgid "%(schange_to)s is already a list member."
 msgstr " is al lid"
 
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 #, fuzzy
 msgid "%(schange_to)s is not a valid email address."
 msgstr "U moet een geldig e-mailadres opgeven."
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 #, fuzzy
 msgid "%(schange_to)s is already a member"
 msgstr " is al lid"
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 #, fuzzy
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr "%(addr)s is verboden (komt overeen met: %(patt)s)"
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 #, fuzzy
 msgid "%(list_name)s address change notice."
 msgstr "%(realname)s afmeldingsbericht"
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 #, fuzzy
 msgid "Notification sent to %(schange_from)s."
 msgstr "Meldingen"
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 #, fuzzy
 msgid "Notification sent to %(schange_to)s."
 msgstr "Meldingen"
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr "Verkeerde moderatie-instelling:"
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 msgid "member mgt page"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "Niet aangemeld"
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr "Negeer wijzigingen voor verwijderd lid: %(user)s"
 
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "Met succes verwijderd:"
 
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "Fout bij afmelden:"
 
@@ -1797,8 +1797,8 @@ msgstr ""
 "    <p>Of klik op <em>Annuleer en negeer</em> om uw afmeldingsverzoek in\n"
 "    te trekken."
 
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "Afmelden"
 
@@ -2407,47 +2407,51 @@ msgstr "Verstuur maandelijkse wachtwoordherinneringen?"
 msgid "List name is required."
 msgstr "Lijstnaam is vereist."
 
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr "%(realname)s -- Bewerken html voor %(template_info)s"
 
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr "Bewerk HTML : Fout"
 
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr "%(safetemplatename)s: Geen geldige template"
 
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr "%(realname)s -- HTML-pagina Bewerken"
 
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr "Selecteer pagina om te bewerken:"
 
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "Bekijk of wijzig de instellingen van de lijst."
 
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "Als u klaar bent met het bewerken ..."
 
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "Verstuur de wijzigingen"
 
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr "HTML-pagina mag niet leeg zijn!"
 
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr "HTML niet veranderd."
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2461,19 +2465,19 @@ msgstr ""
 "is daarom geweigerd.  Als u toch deze wijzigingen wilt aanbrengen, heeft u\n"
 "shell access nodig voor uw Mailman server.\n"
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr "Zie"
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr "FAQ 4.48."
 
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 msgid "Page Unchanged."
 msgstr "Pagina niet veranderd."
 
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr "HTML met succes bijgewerkt."
 
@@ -2535,7 +2539,7 @@ msgstr ""
 msgid "Edit Options"
 msgstr "Wijzig opties"
 
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "Bekijk deze pagina in"
@@ -2544,34 +2548,34 @@ msgstr "Bekijk deze pagina in"
 msgid "This form requires JavaScript."
 msgstr ""
 
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "Fout in CGI-script"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "Er is geen adres opgegeven"
 
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "Ongeldig e-mailadres: %(safeuser)s"
 
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr "Niet bestaand lid: %(safeuser)s."
 
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 #, fuzzy
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr "Het bevestigingsbericht is verzonden."
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 #, fuzzy
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
@@ -2580,7 +2584,7 @@ msgstr ""
 "Uw afmeldingsverzoek is doorgestuurd\n"
 "                    naar de lijstmoderator ter goedkeuring."
 
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 #, fuzzy
 msgid ""
 "If you are a list member,\n"
@@ -2589,15 +2593,15 @@ msgstr ""
 "Indien u lid bent van de lijst, is er nu een herinneringsbericht met uw "
 "wachtwoord naar u verzonden."
 
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "Authentificatie is mislukt."
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr "Een herinneringsbericht met uw wachtwoord is naar u verzonden."
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
@@ -2605,16 +2609,16 @@ msgstr ""
 "The lijstbeheerder mag de andere abonnementen\n"
 "            van deze gebruiker niet inzien."
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr "Opmerking:"
 
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr "Aanmeldingen voor %(safeuser)s op %(hostname)s"
 
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
@@ -2622,7 +2626,7 @@ msgstr ""
 "Klik op een link om uw instellingenpagina voor de\n"
 "        betreffende maillijst te bezoeken."
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
@@ -2632,15 +2636,15 @@ msgstr ""
 "            andere abonnementen van deze gebruiker niet wijzigen.  Het\n"
 "            abonnement op deze maillijst is echter gewijzigd."
 
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "Adressen komen niet overeen!"
 
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr "U gebruikt reeds dat e-mailadres"
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 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 "
@@ -2654,31 +2658,31 @@ msgstr ""
 "voor alle maillijsten waarvan u lid bent.  Na bevestiging zal het adres\n"
 "%(safeuser)s in alle maillijsten worden gewijzigd. "
 
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "Het nieuwe adres %(newaddr)s is reeds lid."
 
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "E-mailadressen dienen ingevuld te worden"
 
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr "Een bevestigingsbericht is verzonden naar %(newaddr)s."
 
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "Foutief e-mailadres opgegeven"
 
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "Ongeldig e-mailadres opgegeven"
 
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s is al lid van de lijst."
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
 "                      think this restriction is erroneous, please contact\n"
@@ -2689,11 +2693,11 @@ msgstr ""
 "        kunt u contact opnemen met de lijsteigenaren:\n"
 "        %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr "Gebruikersnaam is met succes veranderd. "
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 msgid ""
 "The list administrator may not change the\n"
 "                    password for a user."
@@ -2701,15 +2705,15 @@ msgstr ""
 "De lijstbeheerder kan het wachtwoord\n"
 "            van een gebruiker niet wijzigen."
 
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "Wachtwoorden dienen ingevuld te worden"
 
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "Wachtwoorden kwamen niet overeen!"
 
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 msgid ""
 "The list administrator may not change the\n"
 "            password for this user's other subscriptions.  However, the\n"
@@ -2719,12 +2723,12 @@ msgstr ""
 "            andere abonnementen van deze gebruiker niet wijzigen.  Het\n"
 "            wachtwoord voor deze maillijst is echter gewijzigd."
 
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "Wachtwoord is met succes veranderd."
 
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
@@ -2734,16 +2738,16 @@ msgstr ""
 "                onder de button <em>Afmelden</em> aan te vinken.  U\n"
 "                bent niet afgemeld!"
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 #, fuzzy
 msgid "via the member options page"
 msgstr "%(realname)s lijst: inlogpagina voor lidmaatschapsinstellingen"
 
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "Afmeldingsresultaat"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -2755,7 +2759,7 @@ msgstr ""
 "            ontvangen zodra de lijstmoderators een beslissing hebben\n"
 "            genomen."
 
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -2771,7 +2775,7 @@ msgstr ""
 "            contact op met de lijsteigenaren op het volgende e-mailadres:\n"
 "            %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -2782,7 +2786,7 @@ msgstr ""
 "            andere abonnementen van deze gebruiker niet wijzigen.  De\n"
 "            abonnementsopties van deze maillijst zijn echter gewijzigd."
 
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -2794,7 +2798,7 @@ msgstr ""
 "            optie niet worden aangezet. Alle andere wijzigingen van uw\n"
 "            instellingen zijn wel met succes doorgevoerd."
 
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -2806,63 +2810,63 @@ msgstr ""
 "            worden aangezet. Alle andere wijzigingen van uw instellingen\n"
 "            zijn wel met succes doorgevoerd."
 
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "De wijzigingen van uw instellingen zijn met succes doorgevoerd."
 
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "U krijgt wellicht nog ��n laatste verzamelmail toegestuurd."
 
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>Ja, ik wil mezelf echt afmelden</em>"
 
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "Wijzig mijn wachtwoord"
 
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "Laat mijn andere aanmeldingen zien"
 
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "Stuur mijn wachtwoord per e-mail toe"
 
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "wachtwoord"
 
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "Uitloggen"
 
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "Verstuur de wijzigingen"
 
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "dagen"
 
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "dag"
 
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr "%(days)d %(units)s"
 
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "Verander mijn e-mailadres en naam"
 
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "<em>Geen onderwerpen gedefinieerd</em>"
 
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
@@ -2872,20 +2876,20 @@ msgstr ""
 "U bent op deze lijst aangemeld met het adres\n"
 "<em>%(cpuser)s</em>."
 
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "%(realname)s lijst: inlogpagina voor lidmaatschapsinstellingen"
 
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "e-mailadres en "
 
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr ""
 "%(realname)s lijst: lidmaatschapsinstellingen voor gebruiker %(safeuser)s"
 
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -2913,19 +2917,19 @@ msgstr ""
 "    niet ge�ffectueerd worden.\n"
 "    "
 
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "E-mailadres:"
 
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "Wachtwoord"
 
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "Inloggen"
 
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -2939,11 +2943,11 @@ msgstr ""
 "    dit desgewenst ook per e-mail doen; het bevestigingsbericht bevat\n"
 "    instructies daartoe)."
 
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "Wachtwoordherinnering"
 
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
@@ -2951,27 +2955,27 @@ msgstr ""
 "Door op de button <em>Herinnering</em> te klikken, krijgt u uw wachtwoord\n"
 "    per e-mail toegestuurd."
 
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "Herinnering"
 
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr "<onvolledig>"
 
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "Vermelde onderwerp is niet geldig: %(topicname)s"
 
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "Details onderwerpfilter"
 
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "Naam:"
 
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr "Patroon (als uitdrukking):"
 
@@ -7097,7 +7101,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -7135,7 +7139,7 @@ msgstr ""
 "            <p>In de onderstaande tekstvelden dient u per regel ��n adres\n"
 "            in te vullen. Start de regel met een ^ teken om er de juiste\n"
 "            <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >reguliere Python uitdrukking</a> van te maken. Bij gebruik\n"
 "            van 'backslashes' (schuine strepen) kunt u deze invoeren alsof\n"
 "            het Python raw strings zijn (m.a.w. in het algemeen gebruikt\n"
@@ -7926,7 +7930,7 @@ msgstr "Moet de onderwerpfilter aan of uit staan?"
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -7950,7 +7954,7 @@ msgid ""
 msgstr ""
 "De onderwerpfilter categoriseert elk binnengekomen e-mailbericht\n"
 "             volgens de <a\n"
-"             href=\"http://docs.python.org/library/re.html\">reguliere\n"
+"             href=\"https://docs.python.org/2/library/re.html\">reguliere\n"
 "             uitdrukkingsfilters</a> die u hieronder specificeert. Als de\n"
 "             <code>Subject:</code> (onderwerp) of <code>Keywords:</code>\n"
 "             (sleutelwoorden) headers van het bericht overeenkomen met\n"
@@ -8553,7 +8557,7 @@ msgstr "Bekijk de ledenlijst"
 msgid "Once a month, your password will be emailed to you as a reminder."
 msgstr "Maandelijks krijgt u uw wachtwoord toegemaild als herinnering."
 
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 msgid "The current archive"
 msgstr "Het huidige archief"
 
@@ -8920,7 +8924,7 @@ msgstr "Eind van "
 msgid "Posting of your message titled \"%(subject)s\""
 msgstr "Verzending van uw bericht met de titel \"%(subject)s\""
 
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "[Geen reden opgegeven]"
 
@@ -8932,28 +8936,28 @@ msgstr "Doorsturen van gemodereerd bericht"
 msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr "Nieuw aanmeldingsverzoek aan lijst %(realname)s van %(addr)s"
 
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "Aanmeldingsverzoek"
 
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "Continueer goedkeuring"
 
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr "Nieuw afmeldingsverzoek van %(realname)s door %(addr)s"
 
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr "Afmeldingsverzoek"
 
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr "Oorspronkelijk bericht"
 
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr "Verzoek aan maillijst %(realname)s geweigerd"
 
@@ -9045,56 +9049,56 @@ msgstr ""
 msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr "Uw bevestiging is vereist voor afmelding van de %(listname)s maillijst"
 
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr " van %(remote)s"
 
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr "aanmeldingen bij %(realname)s vereisen goedkeuring door moderator"
 
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "%(realname)s aanmeldingsbericht"
 
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr "afmeldingen vereisen goedkeuring door moderator"
 
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr "%(realname)s afmeldingsbericht"
 
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 #, fuzzy
 msgid "%(realname)s address change notification"
 msgstr "%(realname)s afmeldingsbericht"
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "Verkeerde bevestigingscode"
 
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "Verkeerde bevestigingscode"
 
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr "aanmeldingen bij %(name)s vereisen goedkeuring door beheerder"
 
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "Verkeerde bevestigingscode"
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "Voer de bevestigingscode in"
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr "Laatste automatisch bericht voor vandaag"
 
@@ -9187,15 +9191,15 @@ msgstr ""
 msgid "Original message suppressed by Mailman site configuration\n"
 msgstr ""
 
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr "Bezorgd door Mailman<br>versie %(version)s"
 
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr "Python Powered"
 
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr "Gnu's Not Unix"
 
@@ -10174,7 +10178,7 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
diff --git a/messages/no/LC_MESSAGES/mailman.po b/messages/no/LC_MESSAGES/mailman.po
index 583cbfa2..68445de8 100644
--- a/messages/no/LC_MESSAGES/mailman.po
+++ b/messages/no/LC_MESSAGES/mailman.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mailman 2.1.5\n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: 2005-05-07 23:27+0200\n"
 "Last-Translator: Daniel Buchmann <Daniel.Buchmann@bibsys.no>\n"
 "Language-Team: Norwegian <i18n-no@lister.ping.uio.no>\n"
@@ -205,7 +205,7 @@ msgstr "av deg"
 msgid "by the list administrator"
 msgstr "av listeadministratoren"
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "av ukjent grunn"
 
@@ -221,23 +221,23 @@ msgstr "stoppet"
 msgid "Bounce action notification"
 msgstr "Melding om behandling av returmeldinger"
 
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "stoppet"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr " Sist mottatte returmelding fra deg var datert %(date)s"
 
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
 msgid "(no subject)"
 msgstr "(uten tittel)"
 
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr "[Ingen returdetaljer tilgjengelig]"
 
@@ -251,7 +251,7 @@ msgstr "Administrator"
 
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -259,7 +259,7 @@ msgstr "Listen finnes ikke: <em>%(safelistname)s</em>"
 
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -269,8 +269,8 @@ msgstr "Feil"
 
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -282,7 +282,7 @@ msgid "Authorization failed."
 msgstr "Feil passord"
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr ""
 
@@ -298,7 +298,7 @@ msgstr ""
 "Dersom du ikke velger minst �n av dem, vil epostlisten bli helt ubrukelig!"
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "Advarsel: "
 
@@ -460,7 +460,7 @@ msgstr "Behandle foresp&oslash;rsler"
 msgid "Go to the general list information page"
 msgstr "G&aring; til listens webside"
 
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 msgid "Edit the public HTML pages and text files"
 msgstr "Redigere tekstfiler og HTML-kode for listens websider"
 
@@ -555,7 +555,7 @@ msgstr "Navn p&aring; emnet:"
 msgid "Regexp:"
 msgstr "Regexp-uttrykk:"
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "Beskrivelse:"
 
@@ -715,7 +715,7 @@ msgid "nodupes"
 msgstr "unng� duplikater"
 
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr "sammendrag-modus"
 
@@ -747,7 +747,7 @@ msgstr "R"
 msgid "notmetoo"
 msgstr "ikke-mine"
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr "stopp epost"
 
@@ -1077,152 +1077,152 @@ msgstr "Moderatorpassordet en gang til:"
 msgid "Submit Your Changes"
 msgstr "Lagre endringer"
 
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr "Moderatorpassordene er ikke like"
 
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 #, fuzzy
 msgid "Poster passwords did not match"
 msgstr "Passordene er ikke like."
 
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 msgid "Administrator passwords did not match"
 msgstr "Administratorpassordene er ikke like"
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "Allerede medlem"
 
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr "&lt;blank linje&gt;"
 
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "Feil/Ugyldig epostadresse"
 
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr "Farlig epostadresse (inneholder ugyldige tegn)"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "Invitasjon er sendt til:"
 
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "P&aring;melding utf&oslash;rt:"
 
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "Feil under invitasjon:"
 
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "Feil under p&aring;melding:"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "Utmelding utf&oslash;rt:"
 
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr "Kan ikke melde ut et ikke-eksisterende medlem:"
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 #, fuzzy
 msgid "You must provide both current and new addresses."
 msgstr "Du m� fixe de ugyldige adressene f�rst."
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 #, fuzzy
 msgid "%(schange_to)s is already a list member."
 msgstr " er allerede medlem"
 
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 #, fuzzy
 msgid "%(schange_to)s is not a valid email address."
 msgstr "Du m&aring; oppgi en gyldig epostadresse."
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 #, fuzzy
 msgid "%(schange_to)s is already a member"
 msgstr " er allerede medlem"
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 #, fuzzy
 msgid "%(list_name)s address change notice."
 msgstr "Melding om utmelding av epostlisten %(realname)s"
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 #, fuzzy
 msgid "Notification sent to %(schange_from)s."
 msgstr "Meldinger"
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 #, fuzzy
 msgid "Notification sent to %(schange_to)s."
 msgstr "Meldinger"
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr "Ugyldig verdi p&aring; moderasjonsflagget"
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 #, fuzzy
 msgid "member mgt page"
 msgstr "via medlemmets personlige side"
 
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "Ikke p&aring;meldt"
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr "Ser bort i fra endring av et medlem som er utmeldt: %(user)s"
 
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "Utmelding utf&oslash;rt:"
 
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "Feil under utmelding av:"
 
@@ -1796,8 +1796,8 @@ msgstr ""
 "<p>Eller klikk <em>Avbryt</em> for &aring; fortsatt v&aelig;re medlem av "
 "listen."
 
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "Meld meg ut"
 
@@ -2407,47 +2407,51 @@ msgstr "Sende p&aring;minnelse om passord en gang i m&aring;neden?"
 msgid "List name is required."
 msgstr "Listens navn er p&aring;krevd"
 
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr "%(realname)s -- Redigere html for %(template_info)s"
 
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr "Redigere HTML : Feil"
 
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr "%(safetemplatename)s: Ugyldig mal"
 
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr "%(realname)s -- Redigere HTML-kode for websider"
 
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr "Velg websiden du vil redigere:"
 
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "Tilbake til listens administrasjonsside"
 
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "N&aring;r du er ferdig med &aring; gj&oslash;re endringer..."
 
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "Lagre Endringer"
 
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr "HTML-siden kan ikke v&aelig;re tom!"
 
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr "Ingen endringer i HTML-koden."
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2456,20 +2460,20 @@ msgid ""
 "             "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 #, fuzzy
 msgid "Page Unchanged."
 msgstr "Ingen endringer i HTML-koden."
 
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr "HTML-koden er oppdatert."
 
@@ -2533,7 +2537,7 @@ msgstr ""
 msgid "Edit Options"
 msgstr "Endre Innstillinger"
 
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "Se denne siden p&aring;"
@@ -2542,34 +2546,34 @@ msgstr "Se denne siden p&aring;"
 msgid "This form requires JavaScript."
 msgstr ""
 
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "CGI skriptfeil"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "Ingen epostadresse angitt"
 
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "Feil/Ugyldig epostadresse: %(safeuser)s"
 
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr "Medlemmet finnes ikke: %(safeuser)s."
 
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 #, fuzzy
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr "En epost med bekreftelse er sendt."
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 #, fuzzy
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
@@ -2578,37 +2582,37 @@ msgstr ""
 "Din s�knad om � bli meldt ut av epostlisten m� godkjennes\n"
 "og er blitt videresendt til listeadministratoren."
 
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 #, fuzzy
 msgid ""
 "If you are a list member,\n"
 "            your password has been emailed to you."
 msgstr "En epost med passordet er sendt til deg."
 
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "Innlogging mislyktes."
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr "En epost med passordet er sendt til deg."
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
 msgstr ""
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr ""
 
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr "Vise listemedlemskap for %(safeuser)s p&aring; %(hostname)s"
 
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
@@ -2616,22 +2620,22 @@ msgstr ""
 "Klikk p&aring; en liste for &aring; g&aring; til dine personlige "
 "innstillinger for den."
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
 "            subscription for this mailing list has been changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "Adressene er ikke like!"
 
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr "Den epostadressen er du allerede p&aring;meldt listen med"
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 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 "
@@ -2643,32 +2647,32 @@ msgstr ""
 "men du har ogs� bedt om endring p� alle lister. Etter ditt samtykke vil\n"
 "alle andre epostlister som inneholder %(safeuser)s bli endret. "
 
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "Den nye adressen er allerede p�meldt: %(newaddr)s"
 
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "Adressene kan ikke v&aelig;re tomme"
 
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr ""
 "En foresp&oslash;rsel om bekreftelse er sendt i en epost til %(newaddr)s. "
 
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "Ugyldig epostadresse angitt"
 
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "Ulovlig epostadresse angitt"
 
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s er allerede medlem av listen."
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 #, fuzzy
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
@@ -2678,11 +2682,11 @@ msgstr ""
 "Epostadressen du har angitt er utestengt fra denne epostlisten.\n"
 "Dersom du tror dette kan v�re en feil, kontakt listens eier p� %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr "Navnet er endret. "
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 #, fuzzy
 msgid ""
 "The list administrator may not change the\n"
@@ -2694,15 +2698,15 @@ msgstr ""
 "gjennomf&oslash;rt, men alle andre endringer du gjorde, er gjennomf&oslash;"
 "rt."
 
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "Passordene kan ikke v&aelig;re tomme"
 
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "Passordene er ikke like!"
 
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 #, fuzzy
 msgid ""
 "The list administrator may not change the\n"
@@ -2715,12 +2719,12 @@ msgstr ""
 "gjennomf&oslash;rt, men alle andre endringer du gjorde, er gjennomf&oslash;"
 "rt."
 
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "Passordet ditt er endret."
 
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
@@ -2730,15 +2734,15 @@ msgstr ""
 "valget for dette.\n"
 "Du er IKKE fjernet fra listen!"
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 msgid "via the member options page"
 msgstr "via medlemmets personlige side"
 
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "Resultat av utmelding"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -2749,7 +2753,7 @@ msgstr ""
 "vurdert av listemoderatorene.\n"
 "Du vil motta en melding s&aring; snart de har tatt en avgj&oslash;relse."
 
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -2764,7 +2768,7 @@ msgstr ""
 "Har du sp&oslash;rsm&aring;l knyttet til din utmelding, kontakt listens eier "
 "p&aring; %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -2772,7 +2776,7 @@ msgid ""
 "                changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -2785,7 +2789,7 @@ msgstr ""
 "gjennomf&oslash;rt, men alle andre endringer du gjorde, er gjennomf&oslash;"
 "rt."
 
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -2798,63 +2802,63 @@ msgstr ""
 "gjennomf&oslash;rt, men alle andre endringer du gjorde, er gjennomf&oslash;"
 "rt."
 
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "Dine valg er n&aring; satt slik du &oslash;nsket."
 
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "Det kan v&aelig;re du vil motta en siste samle-epost."
 
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>Ja, jeg vil melde meg ut av listen</em>"
 
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "Endre Mitt Passord"
 
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "Vise andre lister jeg er medlem av"
 
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "Send Meg Passordet Mitt"
 
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "passord"
 
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "Logg ut"
 
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "Lagre Endringer"
 
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "dager"
 
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "dag"
 
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr "%(days)d %(units)s"
 
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "Endre Min Adresse og Mitt Navn"
 
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "</em>Ingen emner er definert</em>"
 
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
@@ -2863,19 +2867,19 @@ msgstr ""
 "\n"
 "Du er medlem av denne listen med epostadressen <em>%(cpuser)s</em>."
 
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "%(realname)s: innlogging til personlige innstillinger"
 
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "epostadressen og "
 
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr "%(realname)s: personlige innstillinger for %(safeuser)s"
 
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -2904,19 +2908,19 @@ msgstr ""
 "p&aring;sl&aring;tt i nettleseren din, ellers vil ingen endringer lagres.\n"
 " "
 
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "Epostadresse:"
 
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "Passord:"
 
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "Logg inn"
 
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -2931,11 +2935,11 @@ msgstr ""
 "(Du kan ogs&aring; bekrefte dette via epost; f&oslash;lg instruksjonene i "
 "epost du f&aring;r tilsendt.)"
 
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "P&aring;minnelse om passord"
 
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
@@ -2943,27 +2947,27 @@ msgstr ""
 "Trykker du p&aring; <em>Send P&aring;minnelse</em> knappen, vil du f&aring; "
 "tilsendt passordet ditt i en epost."
 
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "Send p&aring;minnelse"
 
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr "<mangler>"
 
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "Emnet er ikke gyldig: %(topicname)s"
 
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "Mer informasjon om emnefilteret"
 
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "Navn:"
 
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr "Filter (regexp-uttrykk):"
 
@@ -6910,7 +6914,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -6945,7 +6949,7 @@ msgstr ""
 "\">generelle regler for ikke-medlemmer</a> sier.\n"
 "\n"
 "<p>I tekstboksene nedenfor legger du inn en epostadresse per linje.\n"
-"Du kan ogs&aring; legge inn <a href=\"http://docs.python.org/library/re.html"
+"Du kan ogs&aring; legge inn <a href=\"https://docs.python.org/2/library/re.html"
 "\">Python regexp-uttrykk</a>.\n"
 "Begynn is&aring;fall linjen med tegnet ^ for &aring; markere at det er et "
 "slikt uttrykk.\n"
@@ -7710,7 +7714,7 @@ msgstr "Skal emnefilteret v&aelig;re tilgjengelig eller ikke tilgjengelig?"
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -7733,7 +7737,7 @@ msgid ""
 "             configuration variable."
 msgstr ""
 "Emnefilteret kategoriserer hver epost som kommer til listen,\n"
-"etter <a href=\"http://docs.python.org/library/re.html\">regexp-uttrykkene</"
+"etter <a href=\"https://docs.python.org/2/library/re.html\">regexp-uttrykkene</"
 "a>\n"
 "du skriver inn nedenfor. Hvis feltene <code>Subject:</code> eller "
 "<code>Keywords:</code>\n"
@@ -8307,7 +8311,7 @@ msgstr ""
 "En gang i m&aring;neden vil du som en p&aring;minnelse motta passordet ditt "
 "i en epost."
 
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 msgid "The current archive"
 msgstr "Arkivet"
 
@@ -8683,7 +8687,7 @@ msgstr "Slutt p
 msgid "Posting of your message titled \"%(subject)s\""
 msgstr "Din melding med tittel \"%(subject)s\""
 
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "[Ingen begrunnelse]"
 
@@ -8695,28 +8699,28 @@ msgstr "Videresending av moderert melding"
 msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr "Ny s�knad om medlemskap p� listen %(realname)s fra %(addr)s"
 
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "S�knad om medlemskap"
 
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "Fortsett &aring; vente p&aring; godkjenning av moderator"
 
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr "S�knad fra %(addr)s om utmelding fra listen %(realname)s"
 
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr "S�knad om utmelding"
 
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr "Opprinnelig melding"
 
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr "Foresp�rsel til epostlisten %(realname)s ikke godkjent"
 
@@ -8828,56 +8832,56 @@ msgstr "Din bekreftelse kreves for 
 msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr "Din bekreftelse kreves for � forlate epostlisten %(listname)s"
 
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr " fra %(remote)s"
 
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr "p�melding p� %(realname)s krever godkjenning av moderator"
 
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "Melding om p�melding p� epostlisten %(realname)s"
 
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr "utmelding krever godkjenning av moderator"
 
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr "Melding om utmelding av epostlisten %(realname)s"
 
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 #, fuzzy
 msgid "%(realname)s address change notification"
 msgstr "Melding om utmelding av epostlisten %(realname)s"
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "Ugyldig identifikator for bekreftelse!"
 
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "Ugyldig identifikator for bekreftelse!"
 
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr "p�melding p� %(name)s krever godkjenning av administrator"
 
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "Ugyldig identifikator for bekreftelse!"
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "etter ditt �nske"
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr "Siste automatiske svar idag"
 
@@ -8971,15 +8975,15 @@ msgstr ""
 msgid "Original message suppressed by Mailman site configuration\n"
 msgstr ""
 
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr "Levert av Mailman<br>versjon %(version)s"
 
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr "Programmert i Python"
 
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr "GNU er ikke UNiX"
 
@@ -10335,7 +10339,7 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
@@ -10375,7 +10379,7 @@ msgstr ""
 "benyttes.\n"
 "Komplett spesifikasjon finnes p�:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Adresser sammenlignes uten forskjell p� sm� og store bokstaver, men vises "
 "med\n"
@@ -13550,7 +13554,7 @@ msgstr ""
 
 #~ msgid ""
 #~ "<li>Find members by\n"
-#~ "                <a href=\"http://docs.python.org/library/re.html#regular-"
+#~ "                <a href=\"https://docs.python.org/2/library/re.html#regular-"
 #~ "expression-syntax\"\n"
 #~ "                >Python regular expression</a> (<em>regexp</em>)<br>"
 #~ msgstr ""
diff --git a/messages/pl/LC_MESSAGES/mailman.po b/messages/pl/LC_MESSAGES/mailman.po
index cc0e5698..0f0706f9 100644
--- a/messages/pl/LC_MESSAGES/mailman.po
+++ b/messages/pl/LC_MESSAGES/mailman.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mailman 2.1\n"
 "Report-Msgid-Bugs-To: https://github.com/aviarypl/mailman-l10n-pl/issues\n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: 2016-02-15 17:11+0100\n"
 "Last-Translator: Stefan Plewako <splewako@aviary.pl>\n"
 "Language-Team: Polish <community-poland@mozilla.org>\n"
@@ -206,7 +206,7 @@ msgstr "przez Ciebie samego"
 msgid "by the list administrator"
 msgstr "przez administratora listy"
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "z nieznanego powodu"
 
@@ -222,23 +222,23 @@ msgstr "zablokowana"
 msgid "Bounce action notification"
 msgstr "Powiadamianie o zwrotach"
 
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "zablokowana"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr " Ostatni zwrot otrzymano z Twojego adresu dnia %(date)s"
 
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
 msgid "(no subject)"
 msgstr "(brak tematu)"
 
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr "[brak opisu zwrotu]"
 
@@ -252,7 +252,7 @@ msgstr "Administrator"
 
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -260,7 +260,7 @@ msgstr "Nie znaleziono listy <em>%(safelistname)s</em>"
 
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -270,8 +270,8 @@ msgstr "B
 
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -283,7 +283,7 @@ msgid "Authorization failed."
 msgstr "B��d uwierzytelniania."
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr "Przekroczono limit czasu formularza. (ochrona ��da� przed oszustwami)"
 
@@ -301,7 +301,7 @@ msgstr ""
 "                lista b�dzie bezu�yteczna."
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "Uwaga: "
 
@@ -460,7 +460,7 @@ msgstr "Sprawd
 msgid "Go to the general list information page"
 msgstr "Przejd� do strony informacyjnej listy"
 
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 msgid "Edit the public HTML pages and text files"
 msgstr "Edytuj publiczne strony WWW i pliki tekstowe"
 
@@ -554,7 +554,7 @@ msgstr "Temat:"
 msgid "Regexp:"
 msgstr "Wyra�enie regularne:"
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "Opis:"
 
@@ -713,7 +713,7 @@ msgid "nodupes"
 msgstr "bez duplikatu"
 
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr "paczka"
 
@@ -745,7 +745,7 @@ msgstr "Z"
 msgid "notmetoo"
 msgstr "bez kopii"
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr "wy�."
 
@@ -1074,105 +1074,105 @@ msgstr "Potwierd
 msgid "Submit Your Changes"
 msgstr "Zatwierd�"
 
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr "Podane has�a moderatora nie s� identyczne"
 
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 msgid "Poster passwords did not match"
 msgstr "Podane has�a wst�pnego zatwierdzania nie s� identyczne"
 
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 msgid "Administrator passwords did not match"
 msgstr "Podane has�a administratora nie s� identyczne"
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "Ju� jest zapisany"
 
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr "&lt;pusta linia&gt;"
 
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "Nieprawid�owy adres e-mail"
 
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr "Nieprawid�owy adres (niedopuszczalne znaki)"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr "Adres na czarnej li�cie (pasuje do %(pattern)s)"
 
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "Pomy�lnie zaproszono:"
 
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "Pomy�lnie zapisano:"
 
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "B��dy przy zapraszaniu:"
 
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "B��dy przy zapisywaniu:"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "Pomy�lnie wypisano:"
 
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr "Nie mo�na wypisa� os�b nie zapisanych:"
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 msgid "You must provide both current and new addresses."
 msgstr "Konieczne jest podanie zar�wno obecnego jak i nowego adresu."
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr "Obecny adres i nowy musz� si� r�ni�."
 
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 msgid "%(schange_to)s is already a list member."
 msgstr "Adres \"%(schange_to)s\" jest ju� na li�cie subskrybent�w"
 
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 msgid "%(schange_to)s is not a valid email address."
 msgstr "\"%(schange_to)s\" nie jest prawid�owym adresem e-mail."
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr "Adres \"%(schange_from)s\" nie znajduje si� na li�cie subskrybent�w"
 
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 msgid "%(schange_to)s is already a member"
 msgstr "Adres \"%(schange_to)s\" jest ju� na li�cie subskrybent�w"
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr "\"%(schange_to)s\" pasuje do zabronionego wzoru \"%(spat)s\""
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr "Adres \"%(schange_from)s\" zosta� zmieniony na \"%(schange_to)s\""
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
@@ -1180,39 +1180,39 @@ msgstr ""
 "Adres \"%(change_from)s\" subskrybenta listy %(list_name)s\n"
 "zosta� zmieniony na \"%(change_to)s\".\n"
 
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 msgid "%(list_name)s address change notice."
 msgstr "Powiadamianie o zmianie adresu listy %(list_name)s."
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 msgid "Notification sent to %(schange_from)s."
 msgstr "Powiadamianie wys�ane na adres \"%(schange_from)s\"."
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 msgid "Notification sent to %(schange_to)s."
 msgstr "Powiadomienie wyst�ane na adres \"%(schange_to)s\"."
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr "B��dny znacznik moderowania"
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 msgid "member mgt page"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "Nie zapisano"
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr "Nie znaleziono prenumeratora: %(user)s."
 
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "Pomy�lnie usuni�to:"
 
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "B��dy przy wypisywaniu:"
 
@@ -1774,8 +1774,8 @@ msgstr ""
 "\n"
 "    <p>Naci�nij przycisk <em>Anuluj</em>, aby nie wypisywa� si� z tej listy."
 
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "Wypisz"
 
@@ -2373,47 +2373,51 @@ msgstr "Wysy
 msgid "List name is required."
 msgstr "Nazwa listy jest niezb�dna."
 
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr "%(realname)s -- Edytuj strony HTML dla szablonu %(template_info)s"
 
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr "Edycja HTML : B��d"
 
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr "%(safetemplatename)s: Nieprawid�owy szablon"
 
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr "%(realname)s -- Edycja stron HTML"
 
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr "Wybierz stron� do edycji:"
 
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "Poka� lub edytuj konfiguracj� listy."
 
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "Po dokonaniu zmian..."
 
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "Zapisz zmiany"
 
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr "Nie mo�na ustawi� pustej strony HTML."
 
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr "Strona HTML niezmieniona."
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2427,19 +2431,19 @@ msgstr ""
 "bezpo�redni dost�p do serwera, na kt�rym zainstalowany jest Mailman.\n"
 "             "
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr "Zobacz"
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr "FAQ 4.48."
 
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 msgid "Page Unchanged."
 msgstr "Strona nie zosta�a zmieniona."
 
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr "Strona HTML zosta�a zaktualizowana."
 
@@ -2502,7 +2506,7 @@ msgstr ""
 msgid "Edit Options"
 msgstr "Edytuj opcje"
 
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "Prze��cz j�zyk na"
@@ -2511,35 +2515,35 @@ msgstr "Prze
 msgid "This form requires JavaScript."
 msgstr ""
 
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "B��d skryptu CGI"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr "Nieprawid�owa metoda ��dania: %(method)s"
 
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "Nie podano adresu"
 
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "Nieprawid�owy adres: %(safeuser)s"
 
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr "Nie znaleziono prenumeratora: %(safeuser)s."
 
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr ""
 "Wiadomo�� potwierdzaj�ca zosta�a wys�ana (je�li nale�ysz do subskrybent�w "
 "listy)."
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
 "             forwarded to the list administrator for approval."
@@ -2547,38 +2551,38 @@ msgstr ""
 "Pro�ba o wypisanie z listy zosta�a skierowana do administratora listy w celu "
 "zatwierdzenia (je�li nale�ysz do subskrybent�w listy)."
 
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 msgid ""
 "If you are a list member,\n"
 "            your password has been emailed to you."
 msgstr "Has�o zosta�o wys�ane (je�li nale�ysz do subskrybent�w listy)."
 
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "B��d uwierzytelnienia."
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr "Email z przypomnieniem has�a zosta� wys�any."
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
 msgstr ""
 "Administrator listy nie mo�e zobaczy� innych subskrypcji tego u�ytkownika."
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr "Uwaga: "
 
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr ""
 "Listy zaprenumerowane przez u�ytkownika %(safeuser)s na serwerze %(hostname)s"
 
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
@@ -2586,7 +2590,7 @@ msgstr ""
 "Kliknij odno�nik, aby przej�� na stron� z opcjami dla wybranej\n"
 "        listy."
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
@@ -2596,15 +2600,15 @@ msgstr ""
 "u�ytkownika. \n"
 "Jednak�e, ustawienia subskrypcji tej listy zosta�y zmienione."
 
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "Adresy nie s� identyczne!"
 
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr "Ten adres jest ju� na li�cie"
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 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 "
@@ -2617,31 +2621,31 @@ msgstr ""
 "wyst�puj�cy \n"
 "we wszystkich innych listach zostanie zmieniony."
 
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "%(newaddr)s jest ju� zapisany na list�."
 
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "Pole adresu nie mo�e by� puste"
 
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr "Potwierdzenie zosta�o wys�ane do %(newaddr)s"
 
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "Wprowadzi�e� b��dny adres"
 
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "Nieprawid�owy adres"
 
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s jest ju� zapisany na list�."
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
 "                      think this restriction is erroneous, please contact\n"
@@ -2651,11 +2655,11 @@ msgstr ""
 "dosz�o do tego przez pomy�k�, skontaktuj si� z opiekunem listy \n"
 " - %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr "Imi� i nazwisko prenumeratora zmienione."
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 msgid ""
 "The list administrator may not change the\n"
 "                    password for a user."
@@ -2663,15 +2667,15 @@ msgstr ""
 "Administrator listy nie ma mo�liwo�ci \n"
 "zmiany has�a u�ytkownika."
 
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "Has�a nie mog� by� puste"
 
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "Has�a nie by�y identyczne!"
 
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 msgid ""
 "The list administrator may not change the\n"
 "            password for this user's other subscriptions.  However, the\n"
@@ -2681,12 +2685,12 @@ msgstr ""
 "            inne subskrypcje u�ytkownika. Has�o dla bie��cej listy\n"
 "            zosta�o zmienione."
 
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "Has�o zmienione."
 
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
@@ -2695,16 +2699,16 @@ msgstr ""
 "Musisz potwierdzi� pro�b� o wypisanie poprzez zaznaczenie opcji\n"
 "                <em>Wypisz</em> poni�ej. Nie zosta�e� wypisany!"
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 #, fuzzy
 msgid "via the member options page"
 msgstr "Lista %(realname)s: strona logowania dla prenumerator�w"
 
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "Raport z wypisywania"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -2715,7 +2719,7 @@ msgstr ""
 "             opiekunowi listy i czeka na jego decyzj�, o kt�rej \n"
 "             zostaniesz poinformowany emailem."
 
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -2730,7 +2734,7 @@ msgstr ""
 "        zwi�zane z wypisaniem, skontaktuj si� z administratorem listy\n"
 "        - %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -2741,7 +2745,7 @@ msgstr ""
 "u�ytkownika. \n"
 "Jednak�e, ustawienia subskrypcji tej listy zosta�y zmienione."
 
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -2751,7 +2755,7 @@ msgstr ""
 "Administrator listy wy��czy� dostarczanie list�w w postaci paczek.\n"
 "            Pozosta�e opcje zosta�y ustawione."
 
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -2762,63 +2766,63 @@ msgstr ""
 "            a zatem tej opcji nie wprowadzono. Pozosta�e opcje\n"
 "            zosta�y ustawione."
 
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "Opcje zosta�y ustawione."
 
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "By� mo�e otrzymasz jeszcze jedn� paczk�."
 
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>Tak, chc� si� wypisa�</em>"
 
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "Zmie� has�o"
 
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "Wy�wietl moje pozosta�e subskrypcje"
 
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "Wy�lij mi moje has�o"
 
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "has�o"
 
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "Wyloguj si�"
 
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "Zatwierd�"
 
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "dni"
 
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "dzie�"
 
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr "%(days)d %(units)s"
 
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "Zmie� m�j adres oraz imi� i nazwisko"
 
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "<em>Nie zdefiniowano temat�w</em>"
 
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
@@ -2828,19 +2832,19 @@ msgstr ""
 "Jeste� zapisany na list� z adresu\n"
 "<em>%(cpuser)s</em> (z zachowaniem wielko�ci liter)."
 
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "Lista %(realname)s: strona logowania dla prenumerator�w"
 
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "adres email oraz "
 
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr "Lista %(realname)s: opcje prenumeratora %(safeuser)s"
 
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -2869,19 +2873,19 @@ msgstr ""
 "    nie zadzia�aj�.\n"
 "    "
 
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "Adres email:"
 
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "Has�o:"
 
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "Zaloguj"
 
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -2897,11 +2901,11 @@ msgstr ""
 "przeczytaj\n"
 "        instrukcje w wys�anym potwierdzeniu)."
 
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "Przypomnienie has�a"
 
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
@@ -2909,27 +2913,27 @@ msgstr ""
 "Po klikni�ciu przycisku <em>Przypomnij</em>, Twoje\n"
 "        has�o zostanie przes�ane e-mailem."
 
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "Przypomnij"
 
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr "<brak>"
 
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "��dany temat jest nieprawid�owy: %(topicname)s"
 
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "Szczeg�y filtra tematycznego"
 
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "Nazwa:"
 
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr "Wzorzec (wyra�enie regularne)"
 
@@ -6641,7 +6645,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -6675,7 +6679,7 @@ msgstr ""
 "\">og�lnej\n"
 "            zasadzie stosowanej dla nie subskrybent�w</a>.<p>W polach nale�y "
 "wpisywa� po jednym adresie w linii. Znak ^ napocz�tku nowej linii oznacza <a "
-"href=\"http://docs.python.org/library/re.html\"> wyra�enie regularne w "
+"href=\"https://docs.python.org/2/library/re.html\"> wyra�enie regularne w "
 "Pythonie</a>. <p>Pami�taj, �e linie bez u�ycia wyra�e� regularnych s� "
 "dopasowywane wcze�niej."
 
@@ -7464,7 +7468,7 @@ msgstr "Czy filtrowanie tematyczne ma by
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -7488,7 +7492,7 @@ msgid ""
 msgstr ""
 "Filtr tematyczny dzieli wszystkie przychodz�ce wiadomo�ci \n"
 "             na kategorie wed�ug <a\n"
-"href=\"http://docs.python.org/library/re.html\">wyra�enia\n"
+"href=\"https://docs.python.org/2/library/re.html\">wyra�enia\n"
 "             regularnego </a>, kt�re okre�lisz. Je�eli pola nag��wka\n"
 "             <code>Subject:</code> lub <code>Keywords:</code> zostan�\n"
 "             dopasowane do tego wyra�enia, wiadomo�� jest umieszczana\n"
@@ -8033,7 +8037,7 @@ msgstr "Zobacz list
 msgid "Once a month, your password will be emailed to you as a reminder."
 msgstr "Raz w miesi�cu b�dziesz otrzymywa� email z has�em."
 
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 msgid "The current archive"
 msgstr "Bie��ce archiwum"
 
@@ -8401,7 +8405,7 @@ msgstr "Koniec "
 msgid "Posting of your message titled \"%(subject)s\""
 msgstr "Twoja wiadomo�� o tytule \"%(subject)s\""
 
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "[Nie podano powodu]"
 
@@ -8413,28 +8417,28 @@ msgstr "Przekazywanie wiadomo
 msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr "Nowa pro�ba o zapisanie na list� %(realname)s od %(addr)s"
 
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "Pro�ba o zapisanie"
 
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "Oczekiwanie na reakcj� moderatora"
 
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr "Nowa pro�ba wypisania z listy %(realname)s od %(addr)s"
 
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr "Pro�ba o wypisanie"
 
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr "Wiadomo�� oryginalna"
 
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr "Odrzucona pro�ba wys�ana na list� %(realname)s"
 
@@ -8550,55 +8554,55 @@ msgstr "Prosimy o potwierdzenie prenumeraty listy %(listname)s"
 msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr "Prosimy o potwierdzenie wypisania si� z listy %(listname)s"
 
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr " z adresu %(remote)s"
 
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr "prenumerata listy %(realname)s wymaga zgody administratora"
 
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "Powiadomienie o prenumeracie %(realname)s"
 
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr "wypisanie si� wymaga zgody administratora"
 
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr "Powiadomienie o wypisaniu si� %(realname)s"
 
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 msgid "%(realname)s address change notification"
 msgstr "%(realname)s - powiadomienie o zmianie adresu"
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "Nieprawid�owy kod potwierdzaj�cy"
 
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "Nieprawid�owy kod potwierdzaj�cy"
 
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr "%(name)s prosi o zatwierdzenie jego subskrypcji"
 
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "Nieprawid�owy kod potwierdzaj�cy"
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "Wprowad� kod potwierdzaj�cy"
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr "Dzisiaj nie otrzymasz ju� kolejnych automatycznych wiadomo�ci"
 
@@ -8690,15 +8694,15 @@ msgstr ""
 msgid "Original message suppressed by Mailman site configuration\n"
 msgstr ""
 
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr "Wys�ane przez program Mailman<br>, (wersja %(version)s)"
 
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr "Obs�ugiwane przez Pythona"
 
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr "GNU's Not Unix"
 
@@ -9692,7 +9696,7 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
diff --git a/messages/pt/LC_MESSAGES/mailman.po b/messages/pt/LC_MESSAGES/mailman.po
index 9fb25904..53df8d5d 100644
--- a/messages/pt/LC_MESSAGES/mailman.po
+++ b/messages/pt/LC_MESSAGES/mailman.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mailman\n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: 2003-02-19 10:14GMT\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -207,7 +207,7 @@ msgstr "por voc
 msgid "by the list administrator"
 msgstr "pelo administrador da lista"
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "por raz�es desconhecidas"
 
@@ -223,23 +223,23 @@ msgstr "desactivado"
 msgid "Bounce action notification"
 msgstr "Notifica��o de devolu��o de mensagem"
 
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "desactivado"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr " A �ltima devolu��o recebido de si tinha data de %(date)s"
 
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
 msgid "(no subject)"
 msgstr "(sem assunto)"
 
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr "[N�o h� detalhes dispon�veis sobre a devolu��o da mensagem]"
 
@@ -253,7 +253,7 @@ msgstr "Administrador"
 
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -261,7 +261,7 @@ msgstr "N
 
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -271,8 +271,8 @@ msgstr "Erro"
 
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -284,7 +284,7 @@ msgid "Authorization failed."
 msgstr "Falha na autoriza��o"
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr ""
 
@@ -302,7 +302,7 @@ msgstr ""
 "                discuss�o ficar�, basicamente, inutiliz�vel."
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "Aviso: "
 
@@ -459,7 +459,7 @@ msgstr "Tratar dos pedidos de modera
 msgid "Go to the general list information page"
 msgstr "Ir para a p�gina geral de informa��o da lista"
 
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 #, fuzzy
 msgid "Edit the public HTML pages and text files"
 msgstr "Editar as p�ginas HTML p�blicas"
@@ -553,7 +553,7 @@ msgstr "Nome do t
 msgid "Regexp:"
 msgstr "Express�o Regular (regexp):"
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "Descri��o:"
 
@@ -713,7 +713,7 @@ msgid "nodupes"
 msgstr "sem duplicados"
 
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr "digest"
 
@@ -745,7 +745,7 @@ msgstr "B"
 msgid "notmetoo"
 msgstr "menos eu"
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr "sem mensagens"
 
@@ -1072,151 +1072,151 @@ msgstr "Confirme a password do moderador:"
 msgid "Submit Your Changes"
 msgstr "Enviar as suas modifica��es"
 
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr "As passwords de moderador n�o conferem"
 
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 #, fuzzy
 msgid "Poster passwords did not match"
 msgstr "As suas passwords n�o conferem."
 
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 msgid "Administrator passwords did not match"
 msgstr "As passwords de administrador n�o conferem"
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "J� � um membro"
 
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr "&lt;linha em branco&gt;"
 
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "endere�o de email incorrecto/inv�lido"
 
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr "Endere�o hostil (caracteres ilegais)"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "Convidado com sucesso:"
 
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "Inscrito com sucesso:"
 
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "Erro convidando:"
 
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "Erro inscrevendo:"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "Inscri��o anulada com sucesso:"
 
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr "N�o � poss�vel cancelar a inscri��o de pessoas que n�o s�o membros:"
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 #, fuzzy
 msgid "You must provide both current and new addresses."
 msgstr "Primeiro tem de corrigir os precedentes endere�os inv�lidos."
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 #, fuzzy
 msgid "%(schange_to)s is already a list member."
 msgstr " j� � um membro"
 
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 #, fuzzy
 msgid "%(schange_to)s is not a valid email address."
 msgstr "Tem de fornecer um endere�o de email v�lido."
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 #, fuzzy
 msgid "%(schange_to)s is already a member"
 msgstr " j� � um membro"
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 #, fuzzy
 msgid "%(list_name)s address change notice."
 msgstr "notifica��o de anula��o de inscri��o de %(realname)s"
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 #, fuzzy
 msgid "Notification sent to %(schange_from)s."
 msgstr "Notifica��es"
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 #, fuzzy
 msgid "Notification sent to %(schange_to)s."
 msgstr "Notifica��es"
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr "Valor da op��o de modera��o incorrecta"
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 msgid "member mgt page"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "N�o inscrito"
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr "Ignorando modifica��es num membro removido: %(user)s"
 
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "Removido cm sucesso:"
 
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "Erro ao cancelar a inscri��o:"
 
@@ -1794,8 +1794,8 @@ msgstr ""
 "        <p>Ou clique em <em>Cancelar e ignorar</em> para cancelar\n"
 "        este pedido de anula��o da inscri��o."
 
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "Anular a inscri��o"
 
@@ -2400,47 +2400,51 @@ msgstr "Enviar notas mensais da password?"
 msgid "List name is required."
 msgstr "� necess�rio o nome da lista."
 
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr "<%(realname)s -- Editar html para %(template_info)s"
 
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr "Editar HTML : Erro"
 
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr "%(safetemplatename)s: Template inv�lida"
 
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr "%(realname)s -- Edi��o de P�gina HTML"
 
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr "Seleccione a p�gina a editar:"
 
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "Ver ou editar as informa��es de configura��o da lista."
 
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "Quando terminar as altera��es..."
 
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "Enviar Modifica��es"
 
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr "N�o � poss�vel ter uma p�gina HTML vazia"
 
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr "HTML n�o modificado"
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2449,20 +2453,20 @@ msgid ""
 "             "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 #, fuzzy
 msgid "Page Unchanged."
 msgstr "HTML n�o modificado"
 
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr "HTML actualizado com sucesso."
 
@@ -2525,7 +2529,7 @@ msgstr ""
 msgid "Edit Options"
 msgstr "Editar Op��es"
 
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "Ver esta p�gina em"
@@ -2534,35 +2538,35 @@ msgstr "Ver esta p
 msgid "This form requires JavaScript."
 msgstr ""
 
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "Erro no script CGI"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "N�o foi fornecido endere�o"
 
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 #, fuzzy
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "Endere�o de email incorrecto/inv�lido: %(safeuser)s"
 
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr "Membro inexistente: %(safeuser)s"
 
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 #, fuzzy
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr "A mensagem de confirma��o foi enviada."
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 #, fuzzy
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
@@ -2571,38 +2575,38 @@ msgstr ""
 "O seu pedido de inscri��o foi encaminhado para o administrador da lista\n"
 "para aprova��o."
 
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 #, fuzzy
 msgid ""
 "If you are a list member,\n"
 "            your password has been emailed to you."
 msgstr "Foi-lhe enviada uma nota com a sua password"
 
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "A autentica��o falhou."
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr "Foi-lhe enviada uma nota com a sua password"
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
 msgstr ""
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr ""
 
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 #, fuzzy
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr "Inscri��es em listas para o utilizador %(safeuser)s em %(hostname)s"
 
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
@@ -2610,22 +2614,22 @@ msgstr ""
 "Clique num link para visitar a sua p�gina de op��es para a\n"
 "          lista de discuss�o que indicar."
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
 "            subscription for this mailing list has been changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "Os endere�os n�o conferem!"
 
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr "J� est� a usar esse endere�o de email"
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 #, fuzzy
 msgid ""
 "The new address you requested %(newaddr)s is already a member of the\n"
@@ -2639,31 +2643,31 @@ msgstr ""
 "modifica��o global do endere�o. Ap�s confirma��o, qualquer outra lista de \n"
 "discuss�o contendo o endere�o %(safeuser)s ser� alterada."
 
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "O novo endere�o j� � membro: %(newaddr)s"
 
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "Os endere�os n�o podem estar em branco"
 
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr "Uma mensagem de confirma��o foi enviada para %(newaddr)s"
 
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "Foi fornecido um endere�o de email incorrecto"
 
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "Foi fornecido um endere�o de email ilegal"
 
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s j� � membro desta lista."
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 #, fuzzy
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
@@ -2674,11 +2678,11 @@ msgstr ""
 "Se voc� acha que esta restri��o est� incorrecta, por favor contacte os \n"
 "donos da lista em %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr "O nome do membro foi modificado com sucesso."
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 #, fuzzy
 msgid ""
 "The list administrator may not change the\n"
@@ -2690,15 +2694,15 @@ msgstr ""
 "            No entanto as outras op��es foram ajustadas \n"
 "            com sucesso. "
 
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "As passwords n�o podem estar vazias"
 
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "As passwords n�o conferem"
 
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 #, fuzzy
 msgid ""
 "The list administrator may not change the\n"
@@ -2711,12 +2715,12 @@ msgstr ""
 "            No entanto as outras op��es foram ajustadas \n"
 "            com sucesso. "
 
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "Password modificada com sucesso."
 
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
@@ -2726,16 +2730,16 @@ msgstr ""
 "                a caixa abaixo do bot�o <em>Anular inscri��o</em>.\n"
 "                N�o foi anulada a inscri��o!"
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 #, fuzzy
 msgid "via the member options page"
 msgstr "lista %(realname)s: p�gina de login das op��es de membro"
 
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "Resultados da anula��o da inscri��o"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -2747,7 +2751,7 @@ msgstr ""
 "             Receber� uma notifica��o logo que os moderadores da lista\n"
 "             tomem uma decis�o."
 
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -2762,7 +2766,7 @@ msgstr ""
 "           quaisquer quest�es sobre a anula��o da sua inscri��o,\n"
 "           contacte por favor os donos da lista em %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -2770,7 +2774,7 @@ msgid ""
 "                changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -2783,7 +2787,7 @@ msgstr ""
 "                No entanto as outras op��es foram ajustadas \n"
 "                com sucesso."
 
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -2796,63 +2800,63 @@ msgstr ""
 "            No entanto as outras op��es foram ajustadas \n"
 "            com sucesso. "
 
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "Ajustou com sucesso as suas op��es."
 
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "Poder� receber um �ltimo digest."
 
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>Sim, desejo realmente anular a minha inscri��o</em>"
 
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "Modificar a minha password"
 
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "Listar as minhas outras inscri��es"
 
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "Enviar-me a minha password"
 
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "password"
 
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "Sair"
 
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "Enviar as minhas modifica��es"
 
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "dias"
 
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "dia"
 
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr "%(days)d %(units)s"
 
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "Modificar o meu Nome e Endere�o"
 
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "<em>Nenhum t�pico definido</em>"
 
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
@@ -2862,20 +2866,20 @@ msgstr ""
 "Est� inscrito nesta lista com a capitaliza��o do endere�o preservada\n"
 "<em>%(cpuser)s</em>"
 
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "lista %(realname)s: p�gina de login das op��es de membro"
 
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "endere�o de email e "
 
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 #, fuzzy
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr "lista %(realname)s: op��es de membro para o utilizador %(safeuser)s"
 
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -2903,19 +2907,19 @@ msgstr ""
 "    browser tem de aceitar cookies, caso contr�rio\n"
 "    nenhuma das suas op��es ter� efeito."
 
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "Endere�o de email:"
 
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "Password:"
 
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "Entrar"
 
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -2929,11 +2933,11 @@ msgstr ""
 "     remo��o (tamb�m pode confirmar por email; veja as\n"
 "     instru��es na mensagem de confirma��o)."
 
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "Nota com a password"
 
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
@@ -2941,27 +2945,27 @@ msgstr ""
 "Ao clicar no bot�o <em>Lembrar</em>, a sua password\n"
 "     ser-lhe-� enviada por email."
 
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "Lembrar"
 
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr "<faltando>"
 
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "O t�pico pedido n�o � v�lido: %(topicname)s"
 
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "Detalhes do filtro do t�pico"
 
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "Nome:"
 
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr "Padr�o (como expr. regular):"
 
@@ -6879,7 +6883,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -6919,7 +6923,7 @@ msgstr ""
 "\n"
 "            <p>Nas caixas de texto abaixo, adicione um endere�o por linha;\n"
 "            inicie a linha com o caracter ^ para designar uma\n"
-"            <a href=\"http://docs.python.org/library/re.html\">Express�o "
+"            <a href=\"https://docs.python.org/2/library/re.html\">Express�o "
 "regular em Python</a>. Quando acrescentar contrabarras, fa�a como se \n"
 "            estivesse usando strings raw do Python (i.e. voc� geralmente \n"
 "            utilizaria apenas uma barra invertida).\n"
@@ -7683,7 +7687,7 @@ msgstr "O filtro de t
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -7707,7 +7711,7 @@ msgid ""
 msgstr ""
 "O filtro de t�pico categoriza cada mensagem de entrada de \n"
 "        acordo com \n"
-"            href=\"http://docs.python.org/library/re.html\">filtros\n"
+"            href=\"https://docs.python.org/2/library/re.html\">filtros\n"
 "        de express�es regulares</a> que poder� especificar abaixo. \n"
 "        caso o cabe�alho <code>Subject:</code> ou <code>Keywords:</code> "
 "da \n"
@@ -8304,7 +8308,7 @@ msgstr "Visitar a lista de inscritos"
 msgid "Once a month, your password will be emailed to you as a reminder."
 msgstr "Uma vez por m�s, a sua password ser-lhe-� enviada."
 
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 msgid "The current archive"
 msgstr "O arquivo actual"
 
@@ -8676,7 +8680,7 @@ msgstr "Fim da "
 msgid "Posting of your message titled \"%(subject)s\""
 msgstr "O seu envio de mensagem com o t�tulo \"%(subject)s\""
 
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "[N�o foi dada raz�o]"
 
@@ -8688,28 +8692,28 @@ msgstr "Encaminhamento de mensagem moderada"
 msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr "Novo pedido de inscri��o na lista %(realname)s por %(addr)s"
 
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "Pedido de inscri��o"
 
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "Continuar aguardando aprova��o"
 
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr "Novo pedido de anula��o de inscri��o de %(realname)s por %(addr)s"
 
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr "Pedido de anula��o de inscri��o"
 
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr "Mensagem Original"
 
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr "O pedido para a lista de discuss�o %(realname)s foi rejeitado."
 
@@ -8827,56 +8831,56 @@ msgstr "Voc
 msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr "Voc� n�o � membro da lista de discuss�o %(listname)s"
 
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr " de %(remote)s"
 
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr "as inscri��es em %(realname)s requerem aprova��o pelo moderador"
 
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "notifica��o de inscri��o de %(realname)s"
 
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr "as anula��es de inscri��o requerem aprova��o pelo moderador"
 
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr "notifica��o de anula��o de inscri��o de %(realname)s"
 
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 #, fuzzy
 msgid "%(realname)s address change notification"
 msgstr "notifica��o de anula��o de inscri��o de %(realname)s"
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "String de confirma��o incorrecta"
 
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "String de confirma��o incorrecta"
 
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr "as inscri��es em %(name)s requerem aprova��o pelo administrador."
 
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "String de confirma��o incorrecta"
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "Introduza a cookie de confirma��o"
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr "�ltima notifica��o de resposta autom�tica por hoje"
 
@@ -8965,15 +8969,15 @@ msgstr ""
 msgid "Original message suppressed by Mailman site configuration\n"
 msgstr ""
 
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr "Entregue pelo Mailman<br>vers�o %(version)s"
 
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr "Executado em Python"
 
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr "GNU n�o � Unix"
 
@@ -10364,7 +10368,7 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
@@ -10404,7 +10408,7 @@ msgstr ""
 "A sintaxe de express�es regulares � no estilo Perl5, usando o m�dulo\n"
 "Python. As especifica��es completas podem ser encontradas em:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Endere�os que conferem s�o case-insensitive, mas endere�os case-sensitive\n"
 "s�o mostrados.\n"
diff --git a/messages/pt_BR/LC_MESSAGES/mailman.po b/messages/pt_BR/LC_MESSAGES/mailman.po
index 518be022..9256dbc5 100644
--- a/messages/pt_BR/LC_MESSAGES/mailman.po
+++ b/messages/pt_BR/LC_MESSAGES/mailman.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mailman\n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: 2016-03-09 14:12+0000\n"
 "Last-Translator: Emerson Ribeiro de Mello <emerson_ml@yahoo.com.br>\n"
 "Language-Team: Portuguese <mailman-i18n@python.org>\n"
@@ -206,7 +206,7 @@ msgstr "por voc
 msgid "by the list administrator"
 msgstr "pelo administrador da lista"
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "por raz�es desconhecidas"
 
@@ -222,23 +222,23 @@ msgstr "desativado"
 msgid "Bounce action notification"
 msgstr "Notifica��o retorno de mensagem"
 
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "desativado"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr " O �ltimo retorno de mensagem recebido de voc� foi em %(date)s"
 
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
 msgid "(no subject)"
 msgstr "(sem assunto)"
 
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr "[Nenhum detalhe sobre o retorno de mensagem est� dispon�vel]"
 
@@ -252,7 +252,7 @@ msgstr "Administrador"
 
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -260,7 +260,7 @@ msgstr "A lista <em>%(safelistname)s</em> n
 
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -270,8 +270,8 @@ msgstr "Erro"
 
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -283,7 +283,7 @@ msgid "Authorization failed."
 msgstr "Falha na autoriza��o."
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr "O formul�rio expirou. (verificar falsifica��o de requisi��o)"
 
@@ -301,7 +301,7 @@ msgstr ""
 "                ou sua lista de discuss�o estar� basicamente inutiliz�vel."
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "Alerta: "
 
@@ -463,7 +463,7 @@ msgstr ""
 msgid "Go to the general list information page"
 msgstr "Ir para a p�gina de informa��es gerais da lista"
 
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 msgid "Edit the public HTML pages and text files"
 msgstr "Editar as p�ginas HTML p�blicas e arquivos de texto"
 
@@ -557,7 +557,7 @@ msgstr "Nome de t
 msgid "Regexp:"
 msgstr "Express�o Regular:"
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "Descri��o"
 
@@ -716,7 +716,7 @@ msgid "nodupes"
 msgstr "sem duplicados"
 
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr "digest"
 
@@ -748,7 +748,7 @@ msgstr "B"
 msgid "notmetoo"
 msgstr "menos eu"
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr "sem e-mail"
 
@@ -1089,105 +1089,105 @@ msgstr "Confirme a senha de publicador:"
 msgid "Submit Your Changes"
 msgstr "Enviar suas modifica��es"
 
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr "As senhas de moderador n�o conferem"
 
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 msgid "Poster passwords did not match"
 msgstr "As senhas de publicador n�o conferem."
 
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 msgid "Administrator passwords did not match"
 msgstr "As senhas de administrador n�o conferem"
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "J� � um membro"
 
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr "&lt;linha em branco&gt;"
 
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "Endere�o de email incorreto ou inv�lido"
 
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr "Endere�o hostil (caracteres ilegais)"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr "Endere�o banido (correspondeu %(pattern)s)"
 
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "Convidado com sucesso:"
 
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "Inscrito com sucesso:"
 
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "Erro ao convidar:"
 
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "Erro ao inscrever:"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "Descadastrado com Sucesso:"
 
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr "N�o � poss�vel desinscrever pessoas que n�o s�o membros:"
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 msgid "You must provide both current and new addresses."
 msgstr "Voc� deve fornecer o atual e o novo endere�o"
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr "O endere�o novo deve ser diferente do endere�o atual"
 
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 msgid "%(schange_to)s is already a list member."
 msgstr "%(schange_to)s j� � um membro da lista"
 
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 msgid "%(schange_to)s is not a valid email address."
 msgstr "%(schange_to)s n�o � um endere�o de email v�lido."
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr "%(schange_from)s n�o � um membro"
 
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 msgid "%(schange_to)s is already a member"
 msgstr "%(schange_to)s  j� � um membro"
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr "%(schange_to)s corresponde com o padr�o de banimento %(spat)s"
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr "Endere�o %(schange_from)s alterado para %(schange_to)s"
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
@@ -1195,39 +1195,39 @@ msgstr ""
 "O endere�o do membro %(change_from)s na\n"
 "lista %(list_name)s foi alterado para %(change_to)s.\n"
 
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 msgid "%(list_name)s address change notice."
 msgstr "notifica��o de altera��o de endere�o na lista %(list_name)s."
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 msgid "Notification sent to %(schange_from)s."
 msgstr "Notifica��o enviada para %(schange_from)s."
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 msgid "Notification sent to %(schange_to)s."
 msgstr "Notifica��o enviada para %(schange_to)s."
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr "Valor incorreto para a op��o de modera��o"
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 msgid "member mgt page"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "N�o inscrito"
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr "Ignorando modifica��es do membro removido: %(user)s"
 
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "Removido com sucesso:"
 
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "Erro ao desinscreve:"
 
@@ -1810,8 +1810,8 @@ msgstr ""
 "        <p>Ou clique em <em>Cancelar e descartar</em> para cancelar\n"
 "        este pedido de remo��o."
 
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "Desinscrever"
 
@@ -2417,47 +2417,51 @@ msgstr "Enviar mensalmente lembretes de senha?"
 msgid "List name is required."
 msgstr "� necess�rio o nome da lista."
 
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr "%(realname)s -- Editar html para %(template_info)s"
 
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr "Editar HTML : Erro"
 
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr "%(safetemplatename)s: Modelo inv�lido"
 
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr "%(realname)s -- Edi��o de P�gina HTML"
 
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr "Selecionar a p�gina para edi��o:"
 
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "Ver ou editar as informa��es de configura��o da lista."
 
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "Quando terminar de fazer as mudan�as..."
 
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "Enviar Modifica��es"
 
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr "N�o � poss�vel ter uma p�gina HTML vazia"
 
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr "HTML n�o modificado"
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2471,19 +2475,19 @@ msgstr ""
 "voc� dever� ter acesso ao terminal (shell) do servidor Mailman.\n"
 "             "
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr "Ver"
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr "FAQ 4.48."
 
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 msgid "Page Unchanged."
 msgstr "P�gina n�o modificada."
 
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr "HTML atualizado com sucesso."
 
@@ -2545,7 +2549,7 @@ msgstr ""
 msgid "Edit Options"
 msgstr "Editar Op��es"
 
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "Ver esta p�gina em"
@@ -2554,34 +2558,34 @@ msgstr "Ver esta p
 msgid "This form requires JavaScript."
 msgstr ""
 
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "Erro no script CGI"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr "M�todo de requisi��o inv�lido: %(method)s"
 
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "Nenhum endere�o foi fornecido"
 
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "Endere�o de email incorreto/inv�lido: %(safeuser)s"
 
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr "Membro inexistente: %(safeuser)s"
 
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr ""
 "Se voc� � um membro da lista, ent�o uma mensagem de confirma��o foi enviada."
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
 "             forwarded to the list administrator for approval."
@@ -2589,21 +2593,21 @@ msgstr ""
 "Se voc� � um membro da lista, seu pedido de cancelamento de inscri��o foi\n"
 "encaminhado para administrador da lista para aprova��o."
 
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 msgid ""
 "If you are a list member,\n"
 "            your password has been emailed to you."
 msgstr "Se voc� � um membro da lista, sua senha foi enviada para seu e-mail."
 
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "Falha na autentica��o."
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr "Um lembrete da sua senha foi enviado por e-mail para voc�."
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
@@ -2611,16 +2615,16 @@ msgstr ""
 "O administrador da lista pode n�o ver outros pedidos\n"
 "de inscri��o para este usu�rio."
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr "Nota:"
 
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr "Inscri��es na lista para o usu�rio %(safeuser)s em %(hostname)s"
 
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
@@ -2628,7 +2632,7 @@ msgstr ""
 "Clique em um link para visitar sua p�gina de op��es para a \n"
 "          lista de discuss�o."
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
@@ -2639,15 +2643,15 @@ msgstr ""
 "Por�m, a\n"
 "            inscri��o para essa lista de discuss�o foi modificada."
 
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "Os endere�os n�o conferem!"
 
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr "Voc� j� est� usando aquele endere�o de email"
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 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 "
@@ -2660,31 +2664,31 @@ msgstr ""
 "modifica��o global de endere�o. Ap�s a confirma��o, quaisquer lista de \n"
 "discuss�o contendo o endere�o %(safeuser)s ser� alterada."
 
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "O novo endere�o j� � um membro: %(newaddr)s"
 
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "Os endere�os n�o podem estar em branco"
 
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr "Uma mensagem de confirma��o foi enviada para %(newaddr)s"
 
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "Endere�o de email fornecido est� incorreto"
 
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "Endere�o de email fornecido � ilegal"
 
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s j� � um membro desta lista."
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
 "                      think this restriction is erroneous, please contact\n"
@@ -2694,11 +2698,11 @@ msgstr ""
 "                      acha que esta restri��o � incorreta, por favor\n"
 "                      contate os donos da lista em %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr "Nome do membro modificado com sucesso."
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 msgid ""
 "The list administrator may not change the\n"
 "                    password for a user."
@@ -2706,15 +2710,15 @@ msgstr ""
 "O administrador da lista n�o deve mudar a\n"
 "                    senha de um usu�rio."
 
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "As senhas n�o podem estar vazias"
 
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "As senhas n�o conferem"
 
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 msgid ""
 "The list administrator may not change the\n"
 "            password for this user's other subscriptions.  However, the\n"
@@ -2724,12 +2728,12 @@ msgstr ""
 "          senha para as outras inscri��es deste usu�rio. Por�m, a\n"
 "          senha para essa lista de discuss�o foi alterada."
 
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "Senha modificada com sucesso."
 
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
@@ -2739,16 +2743,16 @@ msgstr ""
 "                a caixa de sele��o abaixo do bot�o <em>Desinscrever</em>. \n"
 "                Voc� n�o foi desinscrito!"
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 #, fuzzy
 msgid "via the member options page"
 msgstr "lista %(realname)s: p�gina de login com as op��es do membro"
 
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "Resultados da Remo��o"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -2760,7 +2764,7 @@ msgstr ""
 "             receber� uma notifica��o assim que os moderadores da lista\n"
 "             fizeram sua decis�o."
 
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -2775,7 +2779,7 @@ msgstr ""
 "           quaisquer quest�es sobre sua remo��o, por favor\n"
 "           contate os donos da lista em %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -2787,7 +2791,7 @@ msgstr ""
 "                op��es sobre a inscri��o nesta lista de e-mail foram\n"
 "                alteradas."
 
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -2799,7 +2803,7 @@ msgstr ""
 "                No entanto suas outras op��es foram ajustadas \n"
 "                com sucesso."
 
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -2811,63 +2815,63 @@ msgstr ""
 "            No entanto suas outras op��es foram ajustadas com \n"
 "            sucesso."
 
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "Voc� ajustou com sucesso suas op��es."
 
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "Voc� poder� receber um �ltimo digest."
 
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>Sim, eu realmente desejo me descadastrar</em>"
 
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "Modificar minha senha"
 
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "Listar minhas outras inscri��es"
 
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "Enviar minha senha por e-mail para mim"
 
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "senha"
 
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "Sair"
 
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "Enviar minhas altera��es"
 
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "dias"
 
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "dia"
 
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr "%(days)d %(units)s"
 
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "Modificar meu Nome e Endere�o"
 
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "<em>Nenhum t�pico definido</em>"
 
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
@@ -2878,19 +2882,19 @@ msgstr ""
 "endere�o\n"
 "<em>%(cpuser)s</em>"
 
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "lista %(realname)s: p�gina de login com as op��es do membro"
 
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "endere�o de e-mail e "
 
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr "lista %(realname)s: op��es de membro para o usu�rio %(safeuser)s"
 
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -2921,19 +2925,19 @@ msgstr ""
 "    dever� ter os cookies ativados em seu navegador, caso contr�rio\n"
 "    nenhuma de suas altera��es ter� efeito."
 
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "Endere�o de email:"
 
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "Senha:"
 
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "Entrar"
 
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -2947,11 +2951,11 @@ msgstr ""
 "     remo��o (voc� poder� tamb�m confirmar respondendo o email; veja as \n"
 "     instru��es na mensagem de confirma��o que receber�)."
 
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "Lembrete de senha"
 
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
@@ -2959,27 +2963,27 @@ msgstr ""
 "Clicando no bot�o <em>Lembrar</em>, sua senha\n"
 "     ser� encaminhada por e-mail para voc�."
 
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "Lembrar"
 
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr "<faltando>"
 
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "O t�pico solicitado n�o � v�lido: %(topicname)s"
 
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "Detalhes do filtro de t�pico"
 
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "Nome:"
 
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr "Padr�o (como expr. regular):"
 
@@ -7086,7 +7090,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -7126,7 +7130,7 @@ msgstr ""
 "\n"
 "            <p>Nas caixas de texto abaixo, adicione um endere�o por linha;\n"
 "            inicie a linha com o caracter ^ para designar uma\n"
-"            <a href=\"http://docs.python.org/library/re.html\">Express�o "
+"            <a href=\"https://docs.python.org/2/library/re.html\">Express�o "
 "regular em Python</a>. Quando acrescentar contra-barras, fa�a como se \n"
 "            estivesse usando strings raw do Python (p.e. voc� geralmente \n"
 "            utilizaria apenas uma barra invertida).\n"
@@ -8040,7 +8044,7 @@ msgstr "O filtro de t
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -8064,7 +8068,7 @@ msgid ""
 msgstr ""
 "O filtro de t�pico categoriza cada mensagem de entrada de \n"
 "        acordo com \n"
-"            href=\"http://docs.python.org/library/re.html\">filtros\n"
+"            href=\"https://docs.python.org/2/library/re.html\">filtros\n"
 "        de express�es regulares</a> que poder� especificar abaixo. \n"
 "        Caso o cabe�alho <code>Subject:</code> ou <code>Keywords:</code> "
 "da \n"
@@ -8663,7 +8667,7 @@ msgstr "Ver a lista de inscritos"
 msgid "Once a month, your password will be emailed to you as a reminder."
 msgstr "Uma vez por m�s, sua senha lhe ser� enviada por e-mail como lembrete."
 
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 msgid "The current archive"
 msgstr "O arquivo atual"
 
@@ -9042,7 +9046,7 @@ msgstr "Fim da "
 msgid "Posting of your message titled \"%(subject)s\""
 msgstr "Envio da mensagem intitulada \"%(subject)s\""
 
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "[Nenhum motivo foi fornecido]"
 
@@ -9054,28 +9058,28 @@ msgstr "Encaminhamento de mensagem moderada"
 msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr "Nova pedido de inscri��o para a lista %(realname)s pelo %(addr)s"
 
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "Pedido de inscri��o"
 
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "Continuar aguardando pela aprova��o"
 
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr "Novo pedido de remo��o de %(realname)s por %(addr)s"
 
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr "Pedido de remo��o"
 
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr "Mensagem Original"
 
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr "Pedido rejeitado para a lista de discuss�o %(realname)s."
 
@@ -9190,55 +9194,55 @@ msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr ""
 "Sua confirma��o � necess�ria para deixar a lista de discuss�o %(listname)s"
 
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr " de %(remote)s"
 
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr "as inscri��es de %(realname)s requerem aprova��o pelo moderador"
 
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "notifica��o de inscri��o de %(realname)s"
 
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr "as desinscri��es requerem aprova��o pelo moderador"
 
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr "notifica��o de remo��o de %(realname)s"
 
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 msgid "%(realname)s address change notification"
 msgstr "notifica��o de altera��o de endere�o de %(realname)s"
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "Mensagem de confirma��o incorreta"
 
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "Mensagem de confirma��o incorreta"
 
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr "as inscri��es de %(name)s requerem aprova��o pelo administrador."
 
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "Mensagem de confirma��o incorreta"
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "Entre com o cookie de confirma��o"
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr "�ltima notifica��o de auto-resposta de hoje"
 
@@ -9329,15 +9333,15 @@ msgstr "Corpo da mensagem foi suprimido pela configura
 msgid "Original message suppressed by Mailman site configuration\n"
 msgstr "Mensagem original suprimida pela configura��o do Mailman\n"
 
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr "Entregue pelo Mailman<br>vers�o %(version)s"
 
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr "Executado pelo Python"
 
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr "GNU n�o � Unix"
 
@@ -10724,7 +10728,7 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
@@ -10764,7 +10768,7 @@ msgstr ""
 "A sintaxe de express�es regulares � no estilo Perl5, usando o m�dulo\n"
 "Python. As especifica��es completas podem ser encontradas em:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Endere�os que conferem n�o s�o sens�veis a caixa, mas ao exibir os endere�os "
 "a caixa (alta ou baixa) � preservada\n"
diff --git a/messages/ro/LC_MESSAGES/mailman.po b/messages/ro/LC_MESSAGES/mailman.po
index 70e8932c..89cafe0f 100644
--- a/messages/ro/LC_MESSAGES/mailman.po
+++ b/messages/ro/LC_MESSAGES/mailman.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mailman\n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: 2005-05-12 07:35+0300\n"
 "Last-Translator: Stefaniu Criste <gupi@hangar.ro>\n"
 "Language-Team: Romanian <en@li.org>\n"
@@ -209,7 +209,7 @@ msgstr "de către dumneavoastră"
 msgid "by the list administrator"
 msgstr "de către administratorul listei"
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "din motive necunoscute"
 
@@ -225,25 +225,25 @@ msgstr "dezactivat"
 msgid "Bounce action notification"
 msgstr "Notificare de eşec la livrare (bounce)"
 
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "dezactivat"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr ""
 "Ultimul eşec la livrarea mesajelor către adresa dumneavoastră este datat "
 "%(date)s"
 
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
 msgid "(no subject)"
 msgstr "(fără subiect)"
 
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr "[Nu sunt disponibile detalii despre eşec]"
 
@@ -257,7 +257,7 @@ msgstr "Administrator"
 
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -265,7 +265,7 @@ msgstr "Nu există lista <em>%(safelistname)s</em>"
 
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -275,8 +275,8 @@ msgstr "Eroare"
 
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -288,7 +288,7 @@ msgid "Authorization failed."
 msgstr "Autorizarea a eşuat."
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr "Sesiuna dumneavoastră a expirat."
 
@@ -306,7 +306,7 @@ msgstr ""
 "mesaje normale), altfel lista dumneavoastră devine practic inutilizabilă."
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "Atenţie: "
 
@@ -465,7 +465,7 @@ msgstr "Cereri în aşteptarea moderării"
 msgid "Go to the general list information page"
 msgstr "Spre pagina de informaţii generale a listei"
 
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 msgid "Edit the public HTML pages and text files"
 msgstr "Editează codul HTML al paginilor publice"
 
@@ -559,7 +559,7 @@ msgstr "Numele topicii:"
 msgid "Regexp:"
 msgstr "Regexp:"
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "Descriere:"
 
@@ -719,7 +719,7 @@ msgid "nodupes"
 msgstr "fără dubluri"
 
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr "rezumat"
 
@@ -751,7 +751,7 @@ msgstr "B"
 msgid "notmetoo"
 msgstr "eu nu"
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr "fără mail"
 
@@ -1088,152 +1088,152 @@ msgstr "Confirmaţi parola de contributor:"
 msgid "Submit Your Changes"
 msgstr "Salvează modificările"
 
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr "Parolele de moderator nu se potrivesc"
 
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 #, fuzzy
 msgid "Poster passwords did not match"
 msgstr "Parolele contributorului nu se potrivesc."
 
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 msgid "Administrator passwords did not match"
 msgstr "Parolele de administrator nu se potrivesc"
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "Este membru deja"
 
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr "&lt;linie goală&gt;"
 
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "Adresă de email greşită/invalidă"
 
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr "Adresă ostilă (caractere ilegale)"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr "Adresă blocată cu expresia %(pattern)s"
 
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "Au fost invitaţi cu succes:"
 
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "Au fost abonaţi cu succes:"
 
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "Eroare la invitare:"
 
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "Eroare la abonare:"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "Au fost dezabonaţi cu succes:"
 
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr "Nu pot dezabona non-membri:"
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 #, fuzzy
 msgid "You must provide both current and new addresses."
 msgstr "Trebuie să corectaţi mai întâi adresa invalidă precedentă."
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 #, fuzzy
 msgid "%(schange_to)s is already a list member."
 msgstr " este deja membru"
 
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 #, fuzzy
 msgid "%(schange_to)s is not a valid email address."
 msgstr "Trebuie să furnizaţi o adresă de email validă."
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 #, fuzzy
 msgid "%(schange_to)s is already a member"
 msgstr " este deja membru"
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 #, fuzzy
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr "%(addr)s este blocată (expresia %(patt)s"
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 #, fuzzy
 msgid "%(list_name)s address change notice."
 msgstr "notificare de părăsire a listei %(realname)s"
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 #, fuzzy
 msgid "Notification sent to %(schange_from)s."
 msgstr "Notificări"
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 #, fuzzy
 msgid "Notification sent to %(schange_to)s."
 msgstr "Notificări"
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr "Valoare eronată a flagului de moderare"
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 msgid "member mgt page"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "Nu sunt abonaţi"
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr "Ignor modificările în cazul membrului şters: %(user)s"
 
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "Au fost dezabonaţi cu succes:"
 
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "Eroare la dezabonare:"
 
@@ -1817,8 +1817,8 @@ msgstr ""
 "    <sau apăsaţi <em>Cancel and discard</em> pentru a anula această\n"
 "    cerere."
 
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "Dezabonare"
 
@@ -2427,47 +2427,51 @@ msgstr "Trimit mesaje lunare de reamintire a parolei?"
 msgid "List name is required."
 msgstr "Numele listei este obligatoriu."
 
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr "%(realname)s -- Editează codul HTML pentru %(template_info)s"
 
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr "Modificare HTML : Eroare"
 
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr "%(safetemplatename)s: Şablon (template) invalid"
 
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr "%(realname)s  -- Editare pagină HTML"
 
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr "Alegeţi pagina de editat:"
 
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "Afişează sau modifică informaţiile de configurare ale listei."
 
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "Când terminaţi de făcut modificările..."
 
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "Salvează modificările"
 
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr "Nu puteţi avea pagini HTML goale."
 
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr "Codul HTML este neschimbat."
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2481,19 +2485,19 @@ msgstr ""
 "a fost respinsă. Dacă totui vrei să facei aceste schimbări, trebuie să avei\n"
 "shell access la server-ul dumneavoastră Mailman."
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr "Vezi "
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 msgid "Page Unchanged."
 msgstr "Codul HTML este neschimbat."
 
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr "Codul HTML a fost actualizat cu succes."
 
@@ -2557,7 +2561,7 @@ msgstr ""
 msgid "Edit Options"
 msgstr "Opţiuni de editare"
 
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "Afişează această pagină în"
@@ -2566,34 +2570,34 @@ msgstr "Afişează această pagină în"
 msgid "This form requires JavaScript."
 msgstr ""
 
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "Eroare CGI"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "Nu aţi introdus nici o adresă"
 
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "Adresă de email ilegală: %(safeuser)s"
 
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr "Nu există un astfel de membru: %(safeuser)s."
 
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 #, fuzzy
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr "A fost trimis un mesaj de confirmare."
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 #, fuzzy
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
@@ -2602,7 +2606,7 @@ msgstr ""
 "Cererea dumneavoastră de dezabonare\n"
 "a fost înaintată administratorului listei pentru aprobare."
 
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 #, fuzzy
 msgid ""
 "If you are a list member,\n"
@@ -2612,30 +2616,30 @@ msgstr ""
 "                          un mesaj de reamintire a parolei v-a fost trimis "
 "prin email."
 
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "Autentificarea a eşuat."
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr "Un mesaj de reamintire a parolei v-a fost trimis prin email."
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
 msgstr ""
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr ""
 
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr "Abonamentele pentru %(safeuser)s la %(hostname)s"
 
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
@@ -2643,22 +2647,22 @@ msgstr ""
 "Apăsaţi pe un link pentru a vizita pagina de opţiuni personale\n"
 "        a listei alese."
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
 "            subscription for this mailing list has been changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "Adresele nu se potrivesc!"
 
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr "Folosiţi deja această adresă de email"
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 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 "
@@ -2671,31 +2675,31 @@ msgstr ""
 "a adresei.  Până la confirmare, toate celelalte liste de discuţii conţinând\n"
 "adresa %(safeuser)s vor fi modificate. "
 
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "Noua adresă este deja abonată: %(newaddr)s"
 
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "Adresele nu pot fi nule"
 
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr "Un mesaj de confirmare a fost trimis la %(newaddr)s. "
 
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "Adresă de email eronată"
 
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "Adresă de email ilegală"
 
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s este deja abonată pe listă."
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
 "                      think this restriction is erroneous, please contact\n"
@@ -2705,11 +2709,11 @@ msgstr ""
 "        Dacă credeţi că această restricţie este eronată, vă rugăm să\n"
 "        contactaţi proprietarii listei la %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr "Numele abonatului a fost modificat cu succes. "
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 msgid ""
 "The list administrator may not change the\n"
 "                    password for a user."
@@ -2717,15 +2721,15 @@ msgstr ""
 "Administratorul listei nu are voie să schimbe\n"
 "                    parola pentru un utilizator."
 
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "Parolele nu pot fi nule"
 
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "Parolele nu se potrivesc!"
 
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 msgid ""
 "The list administrator may not change the\n"
 "            password for this user's other subscriptions.  However, the\n"
@@ -2735,12 +2739,12 @@ msgstr ""
 "            parola pentru celelalte abonamente ale utilizatorului. Totuşi,\n"
 "            parola pentru această listă a fost schimbată\n"
 
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "Parola a fost modificată cu succes."
 
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
@@ -2750,16 +2754,16 @@ msgstr ""
 "                prin bifarea căsuţei de sub butonul <em>Dezabonare</em>.\n"
 "                Nu aţi fost scos de pe listă!"
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 #, fuzzy
 msgid "via the member options page"
 msgstr "Lista de discuţii %(realname)s: pagina de acces la opţiunile personale"
 
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "Rezultatele dezabonării"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -2770,7 +2774,7 @@ msgstr ""
 "            înaintată moderatorilor listei pentru aprobare.  Veţi primi\n"
 "            o notificare de îndată ce aceştia vor lua o decizie."
 
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -2787,7 +2791,7 @@ msgstr ""
 "            vă rugăm să contactaţi proprietarii listei la adresa "
 "%(owneraddr)s."
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -2795,7 +2799,7 @@ msgid ""
 "                changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -2807,7 +2811,7 @@ msgstr ""
 "            de livrare nu a fost setată.  Oricum, celelalte preferinţe\n"
 "            au fost setate cu succes."
 
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -2819,63 +2823,63 @@ msgstr ""
 "de livrare nu a fost salvată. Totuşi,\n"
 "            celelalte opţiuni v-au fost setate cu succes."
 
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "Aţi setat cu succes opţiunile personale."
 
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "S-ar putea să primiţi un ultim rezumat."
 
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>Da, sunt sigur că doresc să mă dezabonez</em>"
 
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "Modifică-mi parola"
 
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "Afişează-mi celelalte abonamente"
 
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "Trimite-mi parola"
 
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "parola"
 
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "Ieşire"
 
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "Salvează modificările"
 
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "zile"
 
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "zi"
 
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr "%(days)d %(units)s"
 
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "Modifică-mi adresa şi numele"
 
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "<em>Nu sunt topici definite</em>"
 
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
@@ -2885,20 +2889,20 @@ msgstr ""
 "Sunteţi abonat(ă) la această listă cu adresa\n"
 "<em>%(cpuser)s</em>."
 
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "Lista de discuţii %(realname)s: pagina de acces la opţiunile personale"
 
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "adresa de email şi "
 
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr ""
 "Lista de discuţii %(realname)s: opţiunile personale pentru %(safeuser)s"
 
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -2926,19 +2930,19 @@ msgstr ""
 "să aveţi activate cookie-urile în browser, altfel nici o modificare nu va fi "
 "aplicată."
 
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "Adresa de email:"
 
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "Parola:"
 
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "Autentificare"
 
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -2954,11 +2958,11 @@ msgstr ""
 "de confirmare\n"
 "    primit). "
 
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "Mesaj de reamintire a parolei"
 
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
@@ -2966,27 +2970,27 @@ msgstr ""
 "Apăsând pe butonul <em>Reamintire</em>,\n"
 "    parola vă va fi trimisă prin email."
 
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "Reamintire"
 
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr "<missing>"
 
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "Topica cerută nu este validă: %(topicname)s"
 
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "Detalii ale filtrului de topică"
 
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "Nume:"
 
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr "Model (ca şi regexp):"
 
@@ -6700,7 +6704,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -7450,7 +7454,7 @@ msgstr "Este filtrul de topici activat sau dezactivat?"
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -7473,7 +7477,7 @@ msgid ""
 "             configuration variable."
 msgstr ""
 "Filtrul de topici categorizează fiecare e-mail sosit pe baza <a href="
-"\"http://docs.python.org/library/re.html\">expresiilor regulate de filtrare</"
+"\"https://docs.python.org/2/library/re.html\">expresiilor regulate de filtrare</"
 "a> pe care le specificaţi mai jos.\n"
 "\n"
 "Dacă unul din headerele <code>Subject:</code>sau <code>Keywords:</code>\n"
@@ -8036,7 +8040,7 @@ msgstr "Afişaţi lista abobaţilor"
 msgid "Once a month, your password will be emailed to you as a reminder."
 msgstr "Lunar, parola de acces vă va fi trimisă ca un mesaj de reamintire."
 
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 msgid "The current archive"
 msgstr "Arhiva curentă"
 
@@ -8412,7 +8416,7 @@ msgstr "Sfârşitul "
 msgid "Posting of your message titled \"%(subject)s\""
 msgstr "Public mesajul dumneavoastră intitulat: \"%(subject)s\""
 
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "[Fără motiv]"
 
@@ -8424,28 +8428,28 @@ msgstr "Forwardez mesajul moderat"
 msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr "Cerere nouă de abonare la lista %(realname)s de la %(addr)s"
 
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "Cerere de abonare"
 
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "Continuă aprobarea în aşteptare"
 
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr "Cerere nouă de părăsire a listei %(realname)s de către %(addr)s"
 
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr "Cerere de părăsire"
 
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr "Mesaj original"
 
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr "Cerera către lista %(realname)s a fost respinsă"
 
@@ -8560,56 +8564,56 @@ msgstr ""
 "Este necesară confirmarea dumneavoastră pentru părăsirea listei de discuţii "
 "%(listname)s"
 
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr " de %(remote)s"
 
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr "abonamentele la %(realname)s necesită aprobarea moderatorului"
 
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "notificare de abonare la %(realname)s"
 
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr "părăsirea listei necesită aprobarea moderatorului"
 
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr "notificare de părăsire a listei %(realname)s"
 
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 #, fuzzy
 msgid "%(realname)s address change notification"
 msgstr "notificare de părăsire a listei %(realname)s"
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "Cod de confirmare eronat"
 
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "Cod de confirmare eronat"
 
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr "abonarea la %(name)s necesită aprobarea administratorului"
 
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "Cod de confirmare eronat"
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "Introduceţi codul de confirmare"
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr "Ultima notificare de răspuns automat de azi"
 
@@ -8701,15 +8705,15 @@ msgstr ""
 msgid "Original message suppressed by Mailman site configuration\n"
 msgstr ""
 
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr "Livrat de Mailman<br>versiunea %(version)s"
 
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr "Motorizat de Python"
 
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr "GNU nu este UNIX"
 
@@ -10020,7 +10024,7 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
@@ -10061,7 +10065,7 @@ msgstr ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
diff --git a/messages/ru/LC_MESSAGES/mailman.po b/messages/ru/LC_MESSAGES/mailman.po
index b088d49b..3c4892ad 100644
--- a/messages/ru/LC_MESSAGES/mailman.po
+++ b/messages/ru/LC_MESSAGES/mailman.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mailman v2.1\n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: 2018-03-18 13:49+0200\n"
 "Last-Translator: Danil Smirnov <danil@smirnov.la>\n"
 "Language-Team: Russian <danil@smirnov.la>\n"
@@ -213,7 +213,7 @@ msgstr "по вашему собственному указанию"
 msgid "by the list administrator"
 msgstr "по указанию администратора списка рассылки"
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "по неизвестной причине"
 
@@ -229,23 +229,23 @@ msgstr "заблокирована"
 msgid "Bounce action notification"
 msgstr "Извещение об ошибке"
 
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "заблокирована"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr " Последнее сообщение об ошибке, полученное от вас, датировано %(date)s"
 
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
 msgid "(no subject)"
 msgstr "(без темы)"
 
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr "[Дополнительная информация об ошибке отсутствует]"
 
@@ -259,7 +259,7 @@ msgstr "администратора"
 
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -267,7 +267,7 @@ msgstr "Список рассылки <em>%(safelistname)s</em> не сущес
 
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -277,8 +277,8 @@ msgstr "Ошибка"
 
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -290,7 +290,7 @@ msgid "Authorization failed."
 msgstr "Ошибка доступа."
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr "Форма устарела. (требуется проверка подлинности)"
 
@@ -308,7 +308,7 @@ msgstr ""
 "                В таком состоянии этот список рассылки использовать нельзя. "
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "Предупреждение: "
 
@@ -476,7 +476,7 @@ msgstr "Перейти к обработке задач модератора"
 msgid "Go to the general list information page"
 msgstr "Перейти к странице с краткой информацией о списке рассылки"
 
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 msgid "Edit the public HTML pages and text files"
 msgstr "Правка общедоступных HTML-страниц и текстовых файлов"
 
@@ -570,7 +570,7 @@ msgstr "Название раздела:"
 msgid "Regexp:"
 msgstr "Регулярные выражения:"
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "Описание:"
 
@@ -735,7 +735,7 @@ msgid "nodupes"
 msgstr "без копий"
 
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr "дайджест"
 
@@ -767,7 +767,7 @@ msgstr "О"
 msgid "notmetoo"
 msgstr "без копий<br>своих сообщений"
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr "без доставки"
 
@@ -1106,105 +1106,105 @@ msgstr "Подтвердите пароль для постинга:"
 msgid "Submit Your Changes"
 msgstr "Внести изменения"
 
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr "Введенные пароли модератора не совпадают"
 
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 msgid "Poster passwords did not match"
 msgstr "Введенные пароли постера не совпадают"
 
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 msgid "Administrator passwords did not match"
 msgstr "Введенные пароли администратора не совпадают"
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "Уже является подписчиком"
 
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr "&lt;пустая строка&gt;"
 
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "Недопустимый электронный адрес"
 
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr "Ошибочный адрес (встретились недопустимые символы)"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr "Заблокированный адрес (подходит под шаблон %(pattern)s)"
 
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "Успешно приглашены:"
 
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "Успешно подписаны:"
 
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "Приглашены НЕ были:"
 
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "Подписаны НЕ были:"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "Успешно удалена подписка для:"
 
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr "Не удалось удалить подписку у не-подписчиков:"
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 msgid "You must provide both current and new addresses."
 msgstr "Вы должны указать текущий и новый email-адреса."
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr "Текущий и новый адреса должны быть различными."
 
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 msgid "%(schange_to)s is already a list member."
 msgstr "%(schange_to)s уже является подписчиком."
 
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 msgid "%(schange_to)s is not a valid email address."
 msgstr "%(schange_to)s не является корректным адресом электронной почты."
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr "%(schange_from)s не является подписчиком"
 
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 msgid "%(schange_to)s is already a member"
 msgstr "%(schange_to)s уже является подписчиком"
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr "%(schange_to)s заблокирован (подходит под шаблон %(spat)s)"
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr "Адрес изменен с %(schange_from)s на %(schange_to)s"
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
@@ -1212,41 +1212,41 @@ msgstr ""
 "Адрес подписчика списка рассылки %(list_name)s\n"
 "был изменен с %(change_from)s на %(change_to)s.\n"
 
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 msgid "%(list_name)s address change notice."
 msgstr "Уведомление об изменении адреса подписчика %(list_name)s."
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 msgid "Notification sent to %(schange_from)s."
 msgstr "Уведомление отправлено на адрес %(schange_from)s."
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 msgid "Notification sent to %(schange_to)s."
 msgstr "Уведомление отправлено на адрес %(schange_to)s."
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr "Недопустимое значение флага модерирования"
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 msgid "member mgt page"
 msgstr ""
 
 # MSS: хмм?
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "Не подписан"
 
 # MSS: ??
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr "Игнорируются изменения для удалённого подписчика: %(user)s"
 
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "Успешно удалены:"
 
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "Ошибка удаления подписки:"
 
@@ -1834,8 +1834,8 @@ msgstr ""
 "<p>Чтобы отменить запрос на удаление своей подписки, нажмите <em>Отказаться "
 "и удалить запрос</em>."
 
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "Удалить подписку"
 
@@ -2415,47 +2415,51 @@ msgstr "Отправлять ежемесячные напоминания па
 msgid "List name is required."
 msgstr "Имя списка рассылки является обязательным."
 
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr "%(realname)s -- Правка HTML для %(template_info)s"
 
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr "Правка HTML: ошибка"
 
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr "%(safetemplatename)s: некорректный шаблон"
 
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr "%(realname)s -- Редактирование HTML страниц"
 
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr "Выберите страницу для правки:"
 
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "Просмотр или изменение настроек списка рассылки."
 
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "Если вы уже закончили&hellip;"
 
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "Внести изменения"
 
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr "Сохраняемая страница не должна быть пустой."
 
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr "HTML-код не был изменен."
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2469,19 +2473,19 @@ msgstr ""
 "все\n"
 "еще хотите сделать такие изменения, Вам понадобится shell-доступ к Mailman."
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr "Смотрите"
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr "FAQ 4.48."
 
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 msgid "Page Unchanged."
 msgstr "Страница не была изменена."
 
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr "HTML-код обновлен."
 
@@ -2548,7 +2552,7 @@ msgstr "Изменить параметры подписки"
 
 # MSS: важным является оставить английский текст для тех пользователей, которые не понимают
 # по-русски
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "Язык страницы (view this page in):"
@@ -2557,36 +2561,36 @@ msgstr "Язык страницы (view this page in):"
 msgid "This form requires JavaScript."
 msgstr ""
 
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "Ошибка CGI-сценария"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr "Неверный формат запроса: %(method)s"
 
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "Не указан адрес"
 
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "Неверный адрес: %(safeuser)s"
 
 # MSS: было "Подписчик отсутствует: %(safeuser)s."... надо думать.. слушать...
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr "Такого пользователя не существует: %(safeuser)s."
 
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr ""
 "Если Вы подписчик списка рассылки, Вам было отправлено сообщение с кодом "
 "подтверждения."
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
 "             forwarded to the list administrator for approval."
@@ -2594,7 +2598,7 @@ msgstr ""
 "Если Вы подписчик списка рассылки, Ваш запрос на удаление подписки\n"
 "был отправлен модератору для обработки."
 
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 msgid ""
 "If you are a list member,\n"
 "            your password has been emailed to you."
@@ -2602,15 +2606,15 @@ msgstr ""
 "Если Вы подписчик списка рассылки,\n"
 "            Вам было отправлено сообщение с Вашим паролем."
 
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "Ошибка аутентификации."
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr "Вам было отправлено сообщение с вашим паролем."
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
@@ -2618,16 +2622,16 @@ msgstr ""
 "Администратор списка рассылки не может видеть\n"
 "другие подписки этого пользователя."
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr "Учтите: "
 
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr "Подписки пользователя %(safeuser)s на %(hostname)s"
 
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
@@ -2635,7 +2639,7 @@ msgstr ""
 "Щелкните на ссылке для того, чтобы перейти к параметрам своей подписки на "
 "указанный список рассылки."
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
@@ -2645,15 +2649,15 @@ msgstr ""
 "или адрес этого пользователя в других его подписках. Однако,\n"
 "подписка для этого списка рассылки была изменена."
 
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "Указанные адреса не совпадают!"
 
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr "Вы уже пользуетесь тем адресом электронной почты"
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 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 "
@@ -2666,32 +2670,32 @@ msgstr ""
 "всех списках рассылки на этом сайте. Поэтому после получения подтверждения\n"
 "во всех остальных списках ваш адрес будет изменен."
 
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "Новый адрес уже есть в списке рассылки: %(newaddr)s"
 
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "Адрес не может быть пустым"
 
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr ""
 "Сообщение с кодом подтверждения было отправлено по адресу %(newaddr)s. "
 
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "Указан некорректный адрес"
 
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "Указан недопустимый адрес"
 
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s уже содержится в списке рассылки."
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
 "                      think this restriction is erroneous, please contact\n"
@@ -2701,11 +2705,11 @@ msgstr ""
 "Если Вы считаете это ошибкой, обратитесь к администратору\n"
 "по адресу %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr "Имя подписчика изменено. "
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 msgid ""
 "The list administrator may not change the\n"
 "                    password for a user."
@@ -2713,15 +2717,15 @@ msgstr ""
 "Администратор списка рассылки не может изменить\n"
 "пароль пользователя."
 
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "Пароль не может быть пустым"
 
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "Пароли не совпадают!"
 
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 msgid ""
 "The list administrator may not change the\n"
 "            password for this user's other subscriptions.  However, the\n"
@@ -2731,13 +2735,13 @@ msgstr ""
 "пароль этого пользователя в других подписках. Однако,\n"
 "пароль пользователя для этого списка рассылки был изменен."
 
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "Пароль был изменен."
 
 # MSS: "отписаны" -- жаргонизм
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
@@ -2747,16 +2751,16 @@ msgstr ""
 "флажком параметр под кнопкой <em>Удалить подписку</em>. Сейчас вы еще не "
 "отписаны!"
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 #, fuzzy
 msgid "via the member options page"
 msgstr "Список рассылки %(realname)s: вход в систему"
 
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "Удаление подписки"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -2767,7 +2771,7 @@ msgstr ""
 "списка рассылки для обработки. После принятия модератором какого-либо\n"
 "решения вы получите извещение."
 
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -2781,7 +2785,7 @@ msgstr ""
 "еще остались какие-либо вопросы об удалении подписки, обратитесь\n"
 "к владельцам списка по адресу %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -2792,7 +2796,7 @@ msgstr ""
 "параметры этого пользователя в других его подписках. Однако,\n"
 "параметры для этого списка рассылки были изменены."
 
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -2803,7 +2807,7 @@ msgstr ""
 "значение соответствующего параметра в ваших настройках не сохранено.\n"
 "Значения других параметров сохранены."
 
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -2816,65 +2820,65 @@ msgstr ""
 "сохранено.\n"
 "Значения других параметров сохранены"
 
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "Параметры были изменены."
 
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "Возможно, вы получите еще один дайджест."
 
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>Да, я действительно хочу удалить подписку</em>"
 
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "Изменить пароль"
 
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "Список моих подписок"
 
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "Пришлите мне мой пароль"
 
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "пароль"
 
 # fattie: should check shis out
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "Выйти"
 
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "Внести изменения"
 
 # MSS: this must be changed in the code :((
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "дн."
 
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "день"
 
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr "%(days)d %(units)s"
 
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "Изменить мои адрес и имя"
 
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "<em>Разделы не определены</em>"
 
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
@@ -2884,20 +2888,20 @@ msgstr ""
 "Вы подписаны на этот список с адресом (регистр букв сохранен)\n"
 "<em>%(cpuser)s</em>."
 
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "Список рассылки %(realname)s: вход в систему"
 
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "адрес электронной почты и "
 
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr ""
 "Список рассылки %(realname)s: пользовательские настройки для %(safeuser)s"
 
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -2925,19 +2929,19 @@ msgstr ""
 "<p><strong><em>Внимание:</em></strong> в вашем браузере должно быть\n"
 "разрешено сохранение cookies, иначе никакие настройки сохранены не будут."
 
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "Адрес эл. почты:"
 
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "Пароль:"
 
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "Войти"
 
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -2950,11 +2954,11 @@ msgstr ""
 "на которую, вы завершите процесс удаления своей учетной записи. Кроме того,\n"
 "завершить удаление можно и по электронной почте, см. инструкции в сообщении."
 
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "Напоминание пароля"
 
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
@@ -2962,27 +2966,27 @@ msgstr ""
 "После нажатия на кнопку <em>Напомнить</em> ваш пароль\n"
 "будет отправлен вам по электронной почте."
 
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "Напомнить"
 
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr "<отсутствует>"
 
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "Запрошенный раздел некорректен: %(topicname)s"
 
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "Параметры фильтрации сообщений по разделам"
 
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "Название:"
 
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr "Шаблон (рег. выражение):"
 
@@ -6976,7 +6980,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -7012,7 +7016,7 @@ msgstr ""
 "\n"
 "<p>В текстовых полях ниже добавляйте по одному адресу в строку, строки,\n"
 "начинающиеся с ^, будут считаться <a\n"
-"href=\"http://docs.python.org/library/re.html\">регулярными\n"
+"href=\"https://docs.python.org/2/library/re.html\">регулярными\n"
 "выражениями языка Python</a>. Обратные наклонные черты должны вводиться\n"
 "так же, как и в обычных строках Python (то есть, скорее всего, вам\n"
 "понадобится писать только один такой символ).\n"
@@ -7892,7 +7896,7 @@ msgstr "Использовать тематические разделы?"
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -7915,7 +7919,7 @@ msgid ""
 "             configuration variable."
 msgstr ""
 "Фильтр разделов сортирует все входящие сообщения в соответствии с\n"
-"<a href=\"http://docs.python.org/library/re.html\">\n"
+"<a href=\"https://docs.python.org/2/library/re.html\">\n"
 "регулярными выражениями</a>, указываемыми ниже. Если в заголовках\n"
 "<code>Subject:</code> или <code>Keywords:</code> сообщения\n"
 "содержится подстрока, соответствующая фильтру, сообщение помещается\n"
@@ -8495,7 +8499,7 @@ msgstr "Список подписчиков"
 msgid "Once a month, your password will be emailed to you as a reminder."
 msgstr "Раз в месяц вы будете получать извещение с напоминанием своего пароля."
 
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 msgid "The current archive"
 msgstr "Текущий архив"
 
@@ -8875,7 +8879,7 @@ msgstr "Конец "
 msgid "Posting of your message titled \"%(subject)s\""
 msgstr "Ваше сообщение с заголовком \"%(subject)s\""
 
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "[Причина не указана]"
 
@@ -8889,30 +8893,30 @@ msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr ""
 "Новый запрос на подписку в список рассылки %(realname)s с адреса %(addr)s"
 
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "Запрос на подписку"
 
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "Отложить до получения подтверждения"
 
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr ""
 "Новый запрос на удаление подписки на список рассылки %(realname)s с адреса "
 "%(addr)s"
 
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr "Запрос на удаление подписки"
 
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr "Исходное сообщение"
 
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr "Запрос в список рассылки %(realname)s отклонен"
 
@@ -9028,55 +9032,55 @@ msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr ""
 "Подтвердите запрос на удаление вашей подписки на список рассылки %(listname)s"
 
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr " с адреса %(remote)s"
 
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr "подписка на список %(realname)s требует подтверждения модератора"
 
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "уведомление о подписке на список %(realname)s"
 
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr "удаление подписки требует подтверждения модератора"
 
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr "уведомление об удалении подписки на список %(realname)s"
 
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 msgid "%(realname)s address change notification"
 msgstr "уведомление об изменении адреса подписчика %(realname)s"
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "Строка подтверждения неверна"
 
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "Строка подтверждения неверна"
 
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr "подписка на %(name)s требует подтверждения администратора"
 
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "Строка подтверждения неверна"
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "Укажите код подтверждения"
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr "Последнее автоматическое уведомление на сегодня"
 
@@ -9170,15 +9174,15 @@ msgstr "Тело исходного сообщения отключено нас
 msgid "Original message suppressed by Mailman site configuration\n"
 msgstr "Вложение исходного сообщения отключено настройками сервера\n"
 
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr "Mailman версии %(version)s"
 
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr "Работает под управлением Python"
 
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr "Gnu's Not Unix"
 
@@ -10581,7 +10585,7 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
@@ -10621,7 +10625,7 @@ msgstr ""
 "выражений в Perl5, используется модуль re. Полное описание синтаксиса\n"
 "находится по адресу:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "При сравнении адресов регистр не учитывается, но если в найденном адресе\n"
 "есть заглавные буквы, они печатаются вместо строчных.\n"
diff --git a/messages/sk/LC_MESSAGES/mailman.po b/messages/sk/LC_MESSAGES/mailman.po
index e8d321d6..4cdc9db3 100644
--- a/messages/sk/LC_MESSAGES/mailman.po
+++ b/messages/sk/LC_MESSAGES/mailman.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mailman\n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: 2007-11-26 12:21+0100\n"
 "Last-Translator: Martin Matuška <martin@matuska.org>\n"
 "Language-Team: Slovak\n"
@@ -208,7 +208,7 @@ msgstr "na žiadosť používateľa"
 msgid "by the list administrator"
 msgstr "správcom konferencie"
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "z neznámych dôvôdov"
 
@@ -224,25 +224,25 @@ msgstr "vypnuté"
 msgid "Bounce action notification"
 msgstr "Oznámenie o nedoručiteľnosti"
 
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "vypnuté"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr ""
 " Posledny príspevok, ktorý sa vrátil ako nedoručiteľný na vašu adresu má "
 "dátum: %(date)s"
 
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
 msgid "(no subject)"
 msgstr "(bez predmetu)"
 
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr "[Podrobnosti o doručiteľnosti nie sú dostupné.]"
 
@@ -256,7 +256,7 @@ msgstr "Správca"
 
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -264,7 +264,7 @@ msgstr "Neznáma konferencia <em>%(safelistname)s</em>."
 
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -274,8 +274,8 @@ msgstr "Chyba"
 
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -287,7 +287,7 @@ msgid "Authorization failed."
 msgstr "Autorizácia zlyhala."
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr ""
 
@@ -306,7 +306,7 @@ msgstr ""
 "           doručovania pošty do konferencie."
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "Pozor: "
 
@@ -461,7 +461,7 @@ msgstr "Prejsť na stránku čakajúcich požiadaviek moderácie."
 msgid "Go to the general list information page"
 msgstr "Prejsť na stránku so všeobecnými informáciami o konferencii."
 
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 msgid "Edit the public HTML pages and text files"
 msgstr "Upraviť HTML šablóny pro verejne prístupné stránky konferencie."
 
@@ -555,7 +555,7 @@ msgstr "Názov témy:"
 msgid "Regexp:"
 msgstr "Regulárny výraz (regexp):"
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "Popis:"
 
@@ -715,7 +715,7 @@ msgid "nodupes"
 msgstr "bez duplikátov"
 
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr "súhrnná správa"
 
@@ -747,7 +747,7 @@ msgstr "B"
 msgid "notmetoo"
 msgstr "bez kópie"
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr "nomail"
 
@@ -1070,152 +1070,152 @@ msgstr "Zopakujte moderátorské heslo:"
 msgid "Submit Your Changes"
 msgstr "Uložiť zmeny"
 
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr "Moderátorské heslá nie sú rovnaké."
 
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 #, fuzzy
 msgid "Poster passwords did not match"
 msgstr "Vaše heslá sa nezhodujú."
 
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 msgid "Administrator passwords did not match"
 msgstr "Správcovské heslá sa nezhodujú."
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "Je už účastníkom"
 
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr "&lt;prázdny riadok&gt;"
 
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "Neplatná e-mailová adresa"
 
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr "Neplatná adresa (obsahuje nepovolené znaky)"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr "Zakázaná adresa (vyhovuje vzoru %(pattern)s)"
 
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "Úspešne pozvaní:"
 
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "Úspešne prihlásení:"
 
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "Chyba pri pozvaní:"
 
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "Chyba pri prihlasovaní:"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "Úspešne odhlásení:"
 
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr "Nemôžem odhlásiť niekoho, kto nie je účastníkom:"
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 #, fuzzy
 msgid "You must provide both current and new addresses."
 msgstr "Je nutné najprv opraviť predchádzajúce chybné adresy."
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 #, fuzzy
 msgid "%(schange_to)s is already a list member."
 msgstr "už je účastníkom konferencie"
 
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 #, fuzzy
 msgid "%(schange_to)s is not a valid email address."
 msgstr "Musíte zadať platnú e-mailovú adresu."
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 #, fuzzy
 msgid "%(schange_to)s is already a member"
 msgstr "už je účastníkom konferencie"
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 #, fuzzy
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr "%(addr)s je zakázaná (vyhovuje vzoru: %(patt)s)"
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 #, fuzzy
 msgid "%(list_name)s address change notice."
 msgstr "%(realname)s upozornenie o odhlásení"
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 #, fuzzy
 msgid "Notification sent to %(schange_from)s."
 msgstr "Notifikácie"
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 #, fuzzy
 msgid "Notification sent to %(schange_to)s."
 msgstr "Notifikácie"
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr "Chybná hodnota nastavenia moderácie."
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 msgid "member mgt page"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "Nie je prihlásený"
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr "Ignorujem zmeny prevedené u odhláseného účastníka: %(user)s"
 
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "Úspešne zmazaní:"
 
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "Chyba pri odhlasovaní"
 
@@ -1782,8 +1782,8 @@ msgstr ""
 "\n"
 "    <p>Kliknutím na <em>Zrušiť</em> odhlásenie nebude uskutočnené."
 
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "Odhlásiť"
 
@@ -2371,47 +2371,51 @@ msgstr "Zasielať každý mesiac pripomienky na heslá?"
 msgid "List name is required."
 msgstr "Názov konferencie je vyžadovaný."
 
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr "Konferencia %(realname)s -- Upraviť HTML šablóny pre %(template_info)s"
 
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr "Chyba pri úprave HTML šablón"
 
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr "%(safetemplatename)s: chybná šablóna"
 
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr "Konferencia %(realname)s -- Úprava HTML stránok"
 
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr "Vyberte, ktorú šablónu chcete upraviť:"
 
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "Zobraziť alebo upraviť konfiguráciu konferencie."
 
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "Keď skončíte s úpravou...."
 
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "Uložiť zmeny"
 
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr "Nie je možné mať prázdnu šablónu pre generovanie HTML stránok."
 
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr "HTML šablóny neboli zmenené"
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2425,19 +2429,19 @@ msgstr ""
 "urobiť túto zmenu, potrebujete shell prístup na Váš Mailman server.\n"
 "             "
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr "Pozri "
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr "FAQ 4.48."
 
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 msgid "Page Unchanged."
 msgstr "Stránka nezmenená."
 
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr "HTML šablóny boly úspešne aktualizované."
 
@@ -2502,7 +2506,7 @@ msgstr ""
 msgid "Edit Options"
 msgstr "Úprava vlastností"
 
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "Zobraziť túto stránku po"
@@ -2511,34 +2515,34 @@ msgstr "Zobraziť túto stránku po"
 msgid "This form requires JavaScript."
 msgstr ""
 
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "Chyba v CGI skripte"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "Nebola uvedená adresa"
 
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "Neplatná e-mailová adresa: %(safeuser)s"
 
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr "Neznámy účastník: %(safeuser)s."
 
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 #, fuzzy
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr "Správa s potvrdením bola odoslaná."
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 #, fuzzy
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
@@ -2547,22 +2551,22 @@ msgstr ""
 "Vaša žiadosť o odhlásenie bola preposlaná\n"
 "                    správcovi konferencie na spracovanie."
 
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 #, fuzzy
 msgid ""
 "If you are a list member,\n"
 "            your password has been emailed to you."
 msgstr "Správa s vašim heslom vám bola zaslaná."
 
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "Autentifikácia zlyhala."
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr "Správa s vašim heslom vám bola zaslaná."
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
@@ -2570,24 +2574,24 @@ msgstr ""
 "Správca konferencie nemôže vidieť ostatné\n"
 "    konferencie, do ktorých je účastník prihlásený."
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr "Poznámka: "
 
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr ""
 "Zoznam konferencií, v ktorých je prihlásený používateľ %(safeuser)s na "
 "serveri %(hostname)s"
 
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
 msgstr "Pre zobrazenie nastavení konferencie kliknite na jej názov."
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
@@ -2597,15 +2601,15 @@ msgstr ""
 "            tohto účastníka v iných konfernciách, v ktorých je prihlásený.\n"
 "            Údaje pre túto konferenciu boli zmenené."
 
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "Adresy nesúhlasia!"
 
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr "Túto e-mailoú adresu už používate"
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 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 "
@@ -2618,31 +2622,31 @@ msgstr ""
 "budú po potvrdení zmenené adresy v ostatných konferenciách, kde je\n"
 "účastník %(safeuser)s prihlásený."
 
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "Nová adresa je v konferenci už prihlásená: %(newaddr)s"
 
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "Adresy nemôžu zostať prázdne"
 
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr "Správa s potvrdením bola zaslaná na adresu %(newaddr)s"
 
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "Chybná e-mailová adresa"
 
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "Neplatná emailová adresa"
 
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s je už prihlásený v konferencii."
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
 "                      think this restriction is erroneous, please contact\n"
@@ -2653,11 +2657,11 @@ msgstr ""
 "   že je to neprávom, kontaktujte správcu konferencie na adrese "
 "%(owneraddr)s."
 
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr "Meno bolo úspešne zmenené."
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 #, fuzzy
 msgid ""
 "The list administrator may not change the\n"
@@ -2666,15 +2670,15 @@ msgstr ""
 "Správca konferencie nemôže vidieť ostatné\n"
 "    konferencie, do ktorých je účastník prihlásený."
 
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "Heslá nemôžu byť prázdné."
 
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "Heslá nesúhlasia!"
 
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 msgid ""
 "The list administrator may not change the\n"
 "            password for this user's other subscriptions.  However, the\n"
@@ -2684,12 +2688,12 @@ msgstr ""
 "            v iných konferenciách. Heslo pre túto konferenciu\n"
 "            bolo zmenené."
 
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "Heslo bolo úspešne zmenené."
 
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
@@ -2699,16 +2703,16 @@ msgstr ""
 "                Zaškrtnite políčko pod tlačidlom <em>Odhlásiť</em>.\n"
 "                Momentálne ešte nie ste odhlásený!"
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 #, fuzzy
 msgid "via the member options page"
 msgstr "Konferencia %(realname)s: prihlásenie účastníka pre úpravu nastavení"
 
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "Výsledky odhlásenia"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -2719,7 +2723,7 @@ msgstr ""
 "schválenie\n"
 "            O výsledku budete informovaný."
 
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -2735,7 +2739,7 @@ msgstr ""
 "            odhlásenia kontaktujte správcu konferencie na adrese:\n"
 "            %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -2746,7 +2750,7 @@ msgstr ""
 "                v ostatných konferenciách. Nastavenia pre túto\n"
 "                konferenciu boli zmenené."
 
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -2758,7 +2762,7 @@ msgstr ""
 "            doručovania nebolo zmenené.\n"
 "            Zmeny ostatných nastavení boli akceptované."
 
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -2769,63 +2773,63 @@ msgstr ""
 "            takže nastavenie formy doručovania nebolo zmenené. Zmeny\n"
 "            ostatných nastavení boli akceptované."
 
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "Vaše nastavenia boli úspešne zmenené."
 
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "Ešte vám môže byť doručený jedna posledná súhrnná správa."
 
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>Áno, naozaj sa chcem odhlásiť</em>"
 
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "Zmeniť heslo"
 
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "Zobraziť moje ďalšie konferencie."
 
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "Zaslať heslo e-mailom"
 
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "heslo"
 
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "Odhlásiť"
 
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "Uskutočniť zmeny"
 
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "dni"
 
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "deň"
 
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr "%(days)d %(units)s"
 
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "Zmeniť adresu a meno"
 
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "<em>Žiadne témy nie sú definované</em>"
 
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
@@ -2837,19 +2841,19 @@ msgstr ""
 "písmen\n"
 "<em>%(cpuser)s</em>."
 
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "Konferencia %(realname)s: prihlásenie účastníka pre úpravu nastavení"
 
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "e-mailová adresa a "
 
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr "Konferencia  %(realname)s: používateľské nastavenia pre %(safeuser)s"
 
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -2877,19 +2881,19 @@ msgstr ""
 "    nebude uložená.\n"
 "    "
 
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "E-mailová adresa:"
 
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "Heslo:"
 
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "Prihlásiť"
 
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -2902,38 +2906,38 @@ msgstr ""
 "    sa definitívne odhlásite. Alternatívne sa môžete odhlásiť aj pomocou\n"
 "    e-mailu (návod nájdete v potvrdzujúcom e-maili)."
 
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "Pripomienka hesla"
 
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
 msgstr ""
 "Kliknutím na tlačidlo <em>Poslať heslo</em> vám bude zaslané vaše heslo."
 
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "Poslať heslo"
 
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr "<chýba>"
 
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "Požadovaná téma neexistuje: %(topicname)s"
 
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "Parametre filtra tém"
 
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "Meno:"
 
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr "Pravidlo (regulárny výraz):"
 
@@ -6798,7 +6802,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -6832,7 +6836,7 @@ msgstr ""
 "\n"
 "            <p>V nižšie uvedených textových poliach zadajte jednu adresu\n"
 "            na riadok. Ak chcete použiť <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >regulárny výraz Python</a>, začnite riadok znakom ^. Ak\n"
 "            vkladáte backslash, urobte ako pri reťazcoch Python (spravidla\n"
 "            použijete jeden backslash).\n"
@@ -7593,7 +7597,7 @@ msgstr "Má byť povolený tematický filter?"
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -7616,7 +7620,7 @@ msgid ""
 "             configuration variable."
 msgstr ""
 "Tematický filter zatriedi každú prijatú správu s použitím <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regulárnych\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regulárnych\n"
 "             výrazov</a>, ktoré uvediete nižšie. Ak správa obsahuje v "
 "hlavičke \n"
 "             <code>Subject:</code> alebo <code>Keywords:</code> výraz "
@@ -8193,7 +8197,7 @@ msgstr "Zobraziť zoznam účastníkov"
 msgid "Once a month, your password will be emailed to you as a reminder."
 msgstr "Raz mesačne Vám bude pripomenuté heslo e-mailom."
 
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 msgid "The current archive"
 msgstr "Aktuálny archív"
 
@@ -8559,7 +8563,7 @@ msgstr "Koniec: "
 msgid "Posting of your message titled \"%(subject)s\""
 msgstr "Vaša správa s predmetom „%(subject)s“"
 
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "[Bez udania dôvodu]"
 
@@ -8571,28 +8575,28 @@ msgstr "Preposlanie moderovanej správy"
 msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr "Nová žiadosť o prihlásenie do konferencie %(realname)s od %(addr)s"
 
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "Žiadosť o prihlásenie"
 
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "Pokračovať v čakaní na súhlas"
 
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr "Nová žiadosť o odhlásenie z konferencie %(realname)s od %(addr)s"
 
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr "Žiadosť o odhlásenie"
 
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr "Pôvodná správa"
 
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr "Požiadavka do konferencie %(realname)s bola zamietnutá"
 
@@ -8705,56 +8709,56 @@ msgstr "Pre prihlásenie do konferencie %(listname)s je potrebné overenie"
 msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr "Pro odhlásenie z konferencie %(listname)s je potrebné overenie."
 
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr "od %(remote)s"
 
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr "prihlásenia do konferencie %(realname)s vyžadjú súhlas moderátora"
 
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "%(realname)s upozornenie o prihlásení."
 
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr "odhlásenie z konferencie vyžaduje súhlas moderátora"
 
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr "%(realname)s upozornenie o odhlásení"
 
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 #, fuzzy
 msgid "%(realname)s address change notification"
 msgstr "%(realname)s upozornenie o odhlásení"
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "Nesprávný potvrdzovací reťazec"
 
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "Nesprávný potvrdzovací reťazec"
 
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr "prihlásenie do konferencie %(name)s vyžaduje súhlas moderátora"
 
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "Nesprávný potvrdzovací reťazec"
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "Zadajte potvrdzovací reťazec"
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr "Posledná automatická odpoveď pre dnešok"
 
@@ -8848,15 +8852,15 @@ msgstr ""
 msgid "Original message suppressed by Mailman site configuration\n"
 msgstr ""
 
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr "Doručené Mailmanom<br>verzia %(version)s"
 
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr "Python Powered"
 
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr "GNU Nie je Unix"
 
@@ -9941,7 +9945,7 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
diff --git a/messages/sl/LC_MESSAGES/mailman.po b/messages/sl/LC_MESSAGES/mailman.po
index 050ba81a..b36f29b8 100644
--- a/messages/sl/LC_MESSAGES/mailman.po
+++ b/messages/sl/LC_MESSAGES/mailman.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mailman_new_popr\n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: 2003-09-30 11:18+0200\n"
 "Last-Translator: Urska Colner <urska.colner@agenda.si>\n"
 "Language-Team: Sloven��ina <sl@li.org>\n"
@@ -232,7 +232,7 @@ msgstr "sami"
 msgid "by the list administrator"
 msgstr "skrbnik po�tnega seznama"
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "zaradi neznanega razloga"
 
@@ -251,19 +251,19 @@ msgid "Bounce action notification"
 msgstr "Obvestilo o zavrnitvi"
 
 # Mailman/Bouncer.py:158 Mailman/Bouncer.py:162
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "onemogo�eno"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr " Zadnja zavrnitev s tega naslova je z dne %(date)s"
 
 # Mailman/Handlers/CalcRecips.py:37 Mailman/Handlers/CookHeaders.py:55
 # Mailman/Handlers/Hold.py:240 Mailman/Handlers/Hold.py:274
 # Mailman/Handlers/ToDigest.py:213 Mailman/ListAdmin.py:202
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
@@ -271,7 +271,7 @@ msgid "(no subject)"
 msgstr "(brez zadeve)"
 
 # Mailman/Cgi/admin.py:273 Mailman/Cgi/listinfo.py:139 bin/list_lists:103
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr "[Ni razpolo�ljivih podrobnosti zavrnitve]"
 
@@ -292,7 +292,7 @@ msgstr "Skrbnik"
 # Mailman/Cgi/subscribe.py:57
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -302,7 +302,7 @@ msgstr "Seznam <em>%(safelistname)s</em> ne obstaja."
 # Mailman/Cgi/subscribe.py:47 Mailman/Cgi/subscribe.py:56
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -313,8 +313,8 @@ msgstr "Napaka"
 # Mailman/Cgi/options.py:52
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -328,7 +328,7 @@ msgid "Authorization failed."
 msgstr "Avtorizacija ni uspela."
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr ""
 
@@ -349,7 +349,7 @@ msgstr ""
 
 # Mailman/Cgi/admin.py:1337
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "Opozorilo: "
 
@@ -532,7 +532,7 @@ msgid "Go to the general list information page"
 msgstr "Pojdi na stran s splo�nimi informacijami o seznamu"
 
 # Mailman/Cgi/admin.py:371
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 #, fuzzy
 msgid "Edit the public HTML pages and text files"
 msgstr "Uredi javne HTML strani"
@@ -640,7 +640,7 @@ msgid "Regexp:"
 msgstr "Regularni izraz:"
 
 # Mailman/Cgi/admin.py:652 Mailman/Cgi/options.py:799
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "Opis:"
 
@@ -822,7 +822,7 @@ msgstr "nodupes"
 
 # Mailman/Cgi/admin.py:818
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr "digest"
 
@@ -858,7 +858,7 @@ msgid "notmetoo"
 msgstr "not metoo"
 
 # Mailman/Cgi/admin.py:816
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr "nomail"
 
@@ -1239,172 +1239,172 @@ msgid "Submit Your Changes"
 msgstr "Po�lji spremembe"
 
 # Mailman/Cgi/admin.py:1111
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr "Gesli za moderatorja se ne ujemata"
 
 # Mailman/Cgi/subscribe.py:140
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 #, fuzzy
 msgid "Poster passwords did not match"
 msgstr "Gesli se ne ujemata."
 
 # Mailman/Cgi/admin.py:1123
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 msgid "Administrator passwords did not match"
 msgstr "Gesli za skrbnika se ne ujemata"
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
 # Mailman/Cgi/admin.py:1228
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "Je �e �lan"
 
 # Mailman/Cgi/admin.py:1231
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr "&lt;prazna vrstica&gt;"
 
 # Mailman/Cgi/admin.py:1232 Mailman/Cgi/admin.py:1235
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "Neveljaven e-po�tni naslov"
 
 # Mailman/Cgi/admin.py:1238
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr "Nedopusten naslov (nedovoljeni znaki)"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr ""
 
 # Mailman/Cgi/admin.py:1242
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "Povabilo sprejeli:"
 
 # Mailman/Cgi/admin.py:1276
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "Uspe�no prijavljeni:"
 
 # Mailman/Cgi/admin.py:1328
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "Napaka pri povabilu:"
 
 # Mailman/Cgi/admin.py:1328
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "Napaka pri prijavljanju:"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
 # Mailman/Cgi/admin.py:1276
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "Uspe�no odjavljen:"
 
 # Mailman/Cgi/admin.py:1281
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr "Ni mogo�e odjaviti ne�lanov:"
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 #, fuzzy
 msgid "You must provide both current and new addresses."
 msgstr "Najprej morate popraviti prej�nje neveljavne naslove."
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr ""
 
 # Mailman/Cgi/admindb.py:364
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 #, fuzzy
 msgid "%(schange_to)s is already a list member."
 msgstr " je �e �lan"
 
 # Mailman/Cgi/subscribe.py:103
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 #, fuzzy
 msgid "%(schange_to)s is not a valid email address."
 msgstr "Navesti morate veljavni e-po�tni naslov."
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr ""
 
 # Mailman/Cgi/admindb.py:364
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 #, fuzzy
 msgid "%(schange_to)s is already a member"
 msgstr " je �e �lan"
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
 msgstr ""
 
 # Mailman/MailList.py:739
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 #, fuzzy
 msgid "%(list_name)s address change notice."
 msgstr "Obvestilo o odjavi s seznama %(realname)s"
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 #, fuzzy
 msgid "Notification sent to %(schange_from)s."
 msgstr "Obvestila"
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 #, fuzzy
 msgid "Notification sent to %(schange_to)s."
 msgstr "Obvestila"
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr "Nepravilna vrednost za moderatorsko zastavico"
 
 # Mailman/Cgi/options.py:338
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 #, fuzzy
 msgid "member mgt page"
 msgstr "preko spletne strani s �lanskimi mo�nostmi"
 
 # Mailman/Cgi/admin.py:1301
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "Ni prijavljen"
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr "Prezri spremembe za izbrisanega �lana: %(user)s"
 
 # Mailman/Cgi/admin.py:1242
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "Uspe�no odstranjeni:"
 
 # Mailman/Cgi/admin.py:1328
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "Napaka pri odjavi:"
 
@@ -2055,8 +2055,8 @@ msgstr ""
 
 # Mailman/Cgi/confirm.py:388 Mailman/Cgi/options.py:530
 # Mailman/Cgi/options.py:665 Mailman/Cgi/options.py:675
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "Odjavi"
 
@@ -2738,56 +2738,60 @@ msgid "List name is required."
 msgstr "Potrebno je ime seznama."
 
 # Mailman/Cgi/edithtml.py:95
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr "%(realname)s -- Uredi html za %(template_info)s"
 
 # Mailman/Cgi/edithtml.py:99
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr "Uredi HTML : Napaka"
 
 # Mailman/Cgi/edithtml.py:100
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr "%(safetemplatename)s: Neveljavna predloga"
 
 # Mailman/Cgi/edithtml.py:105 Mailman/Cgi/edithtml.py:106
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr "%(realname)s -- Urejanje HTML strani"
 
 # Mailman/Cgi/edithtml.py:107
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr "Izberite stran za urejanje:"
 
 # Mailman/Cgi/edithtml.py:133
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "Prika�ite ali uredite informacije o konfiguraciji seznama."
 
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
 # Mailman/Cgi/edithtml.py:142
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "Ko kon�ate s konfiguriranjem..."
 
 # Mailman/Cgi/edithtml.py:143
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "Po�lji spremembe"
 
 # Mailman/Cgi/edithtml.py:150
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr "Prazne html strani niso dovoljene."
 
 # Mailman/Cgi/edithtml.py:151
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr "HTML nespremenjen."
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2796,22 +2800,22 @@ msgid ""
 "             "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr ""
 
 # Mailman/Cgi/edithtml.py:151
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 #, fuzzy
 msgid "Page Unchanged."
 msgstr "HTML nespremenjen."
 
 # Mailman/Cgi/edithtml.py:159
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr "HTML uspe�no posodobljen."
 
@@ -2882,7 +2886,7 @@ msgid "Edit Options"
 msgstr "Uredi mo�nosti"
 
 # Mailman/Cgi/listinfo.py:183 Mailman/Cgi/roster.py:109
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "Poka�i to stran v"
@@ -2892,38 +2896,38 @@ msgid "This form requires JavaScript."
 msgstr ""
 
 # Mailman/Cgi/options.py:49 Mailman/Cgi/options.py:64
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "Napaka CGI skripta"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr ""
 
 # Mailman/Cgi/admindb.py:338 Mailman/ListAdmin.py:258
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "Manjka naslov"
 
 # Mailman/Cgi/admin.py:1232 Mailman/Cgi/admin.py:1235
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "Neveljavni e-po�tni naslov: %(safeuser)s"
 
 # Mailman/Cgi/options.py:93
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr "�lan ne obstaja: %(safeuser)s."
 
 # Mailman/Cgi/options.py:133
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 #, fuzzy
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr "Potrditveno sporo�ilo je bilo poslano."
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 #, fuzzy
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
@@ -2933,7 +2937,7 @@ msgstr ""
 "za obdelavo."
 
 # Mailman/Cgi/options.py:144 Mailman/Cgi/options.py:181
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 #, fuzzy
 msgid ""
 "If you are a list member,\n"
@@ -2941,33 +2945,33 @@ msgid ""
 msgstr "Opomnik z va�im geslom je bil poslan na va� naslov."
 
 # Mailman/Cgi/options.py:161
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "Avtentikacija ni uspela."
 
 # Mailman/Cgi/options.py:144 Mailman/Cgi/options.py:181
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr "Opomnik z va�im geslom je bil poslan na va� naslov."
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
 msgstr ""
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr ""
 
 # Mailman/Cgi/options.py:187
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr "Vsa �lanstva uporabnika %(safeuser)s na %(hostname)s"
 
 # Mailman/Cgi/options.py:190
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
@@ -2975,7 +2979,7 @@ msgstr ""
 "Kliknite na povezavo, da odprete stran z mo�nostmi\n"
 "        za �eleni po�tni seznam."
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
@@ -2983,16 +2987,16 @@ msgid ""
 msgstr ""
 
 # Mailman/Cgi/options.py:231
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "Naslovi se ne ujemajo!"
 
 # Mailman/Cgi/options.py:236
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr "Ta e-po�tni naslov je �e uporabljen."
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 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 "
@@ -3006,36 +3010,36 @@ msgstr ""
 "naslov %(safeuser)s. "
 
 # Mailman/Cgi/admindb.py:364
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "Novi naslov je �e uprabljen: %(newaddr)s"
 
 # Mailman/Cgi/options.py:242
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "Naslovi ne smejo biti prazni"
 
 # Mailman/Cgi/options.py:258
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr "Na naslov %(newaddr)s je bilo poslano potrditveno sporo�ilo. "
 
 # Mailman/Cgi/options.py:267
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "Navedli ste neveljaven e-po�tni naslov"
 
 # Mailman/Cgi/options.py:269
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "Navedli ste nedovoljen e-po�tni naslov"
 
 # Mailman/Cgi/options.py:271
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s je �e �lan tega seznama."
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 #, fuzzy
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
@@ -3047,12 +3051,12 @@ msgstr ""
 "na naslov %(owneraddr)s."
 
 # Mailman/Cgi/options.py:280
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr "Ime �lana je bilo uspe�no spremenjeno. "
 
 # Mailman/Cgi/options.py:462
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 #, fuzzy
 msgid ""
 "The list administrator may not change the\n"
@@ -3064,17 +3068,17 @@ msgstr ""
 "spremenjene."
 
 # Mailman/Cgi/options.py:291
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "Gesla ne smejo biti prazna"
 
 # Mailman/Cgi/options.py:296
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "Gesli se ne ujemata!"
 
 # Mailman/Cgi/options.py:462
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 #, fuzzy
 msgid ""
 "The list administrator may not change the\n"
@@ -3087,13 +3091,13 @@ msgstr ""
 "spremenjene."
 
 # Mailman/Cgi/options.py:312
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "Geslo je bilo uspe�no spremenjeno."
 
 # Mailman/Cgi/options.py:321
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
@@ -3104,16 +3108,16 @@ msgstr ""
 "                �e odjavljeni!"
 
 # Mailman/Cgi/options.py:338
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 msgid "via the member options page"
 msgstr "preko spletne strani s �lanskimi mo�nostmi"
 
 # Mailman/Cgi/options.py:349
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "Rezultati odjave"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -3125,7 +3129,7 @@ msgstr ""
 "            boste po e-po�ti prejeli obvestilo."
 
 # Mailman/Cgi/options.py:352
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -3140,7 +3144,7 @@ msgstr ""
 "            odjavi, se obrnite na lastnike seznama na naslov\n"
 "            %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -3149,7 +3153,7 @@ msgid ""
 msgstr ""
 
 # Mailman/Cgi/options.py:458
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -3161,7 +3165,7 @@ msgstr ""
 "            nastavljena, ostale mo�nosti pa so uspe�no spremenjene."
 
 # Mailman/Cgi/options.py:462
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -3174,77 +3178,77 @@ msgstr ""
 "spremenjene."
 
 # Mailman/Cgi/options.py:466
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "Uspe�no ste nastavili mo�nosti."
 
 # Mailman/Cgi/options.py:469
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "Prejeli boste �e zadnji izvle�ek."
 
 # Mailman/Cgi/options.py:532
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>Da, resni�no se �elim odjaviti</em>"
 
 # Mailman/Cgi/options.py:536
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "Spremeni moje geslo"
 
 # Mailman/Cgi/options.py:539
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "Prika�i moje ostale prijave"
 
 # Mailman/Cgi/options.py:545
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "Po�lji sporo�ilo z mojim geslom"
 
 # Mailman/Cgi/options.py:547
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "geslo"
 
 # Mailman/Cgi/options.py:549
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "Odjava"
 
 # Mailman/Cgi/options.py:551
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "Po�lji moje spremembe"
 
 # Mailman/Cgi/options.py:561
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "dni"
 
 # Mailman/Cgi/options.py:563
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "dan"
 
 # Mailman/Cgi/options.py:564
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr "%(days)d %(units)s"
 
 # Mailman/Cgi/options.py:570
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "Spremeni moj naslov in ime"
 
 # Mailman/Cgi/options.py:598
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "<em>Ni definiranih tem</em>"
 
 # Mailman/Cgi/options.py:606
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
@@ -3255,22 +3259,22 @@ msgstr ""
 "<em>%(cpuser)s</em>."
 
 # Mailman/Cgi/options.py:619
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "Seznam %(realname)s: stran za prijavo v uporabni�ke mo�nosti"
 
 # Mailman/Cgi/options.py:621
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "e-po�tni naslov in "
 
 # Mailman/Cgi/options.py:623
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr "Seznam %(realname)s: mo�nosti �lanstva za uporabnika %(safeuser)s"
 
 # Mailman/Cgi/options.py:636
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -3301,22 +3305,22 @@ msgstr ""
 "    "
 
 # Mailman/Cgi/options.py:656
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "E-po�tni naslov:"
 
 # Mailman/Cgi/confirm.py:203 Mailman/Cgi/options.py:658
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "Geslo:"
 
 # Mailman/Cgi/options.py:660
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "Prijava"
 
 # Mailman/Cgi/options.py:669
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -3331,12 +3335,12 @@ msgstr ""
 "    sporo�ilu)."
 
 # Mailman/Cgi/options.py:679
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "Opomnik za geslo"
 
 # Mailman/Cgi/options.py:683
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
@@ -3345,32 +3349,32 @@ msgstr ""
 "    e-po�ti prejeli sporo�ilo z va�im geslom."
 
 # Mailman/Cgi/options.py:686
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "Opomni"
 
 # Mailman/Cgi/options.py:776
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr "<missing>"
 
 # Mailman/Cgi/options.py:787
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "Zahtevana tema ni veljavna: %(topicname)s"
 
 # Mailman/Cgi/options.py:792
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "Podrobnosti tematskega filtra"
 
 # Mailman/Cgi/options.py:795
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "Ime:"
 
 # Mailman/Cgi/options.py:797
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr "Vzorec (kot regexp):"
 
@@ -7546,7 +7550,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -7584,7 +7588,7 @@ msgstr ""
 "\n"
 "            <p>V spodnja polja vnesite naslove, vsakega v svojo vrstico,\n"
 "            ki jo za�nete z znakom ^, ki bo predstavljal <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regularni izraz</a>.  Pri vna�anju po�evnic nazaj, jih\n"
 "            uporabljajte kot grobe Python nize (ponavadi se uporablja\n"
 "            enojna po�evnico nazaj).\n"
@@ -8364,7 +8368,7 @@ msgstr "Ali naj bo filter za teme omogo
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -8388,7 +8392,7 @@ msgid ""
 msgstr ""
 "Filter za teme razvrsti vsako prejeto sporo�ilo glede na\n"
 "             <a\n"
-"            href=\"http://docs.python.org/library/re.html\">filtre\n"
+"            href=\"https://docs.python.org/2/library/re.html\">filtre\n"
 "             regularnih izrazov</a>, ki jih izberete spodaj.  �e polje\n"
 "             <code>Zadeva:</code> ali <code>Klju�ne besede:</code> vsebuje\n"
 "             regularni izraz iz tematskega filtra, bo sporo�ilo samodejno\n"
@@ -9033,7 +9037,7 @@ msgid "Once a month, your password will be emailed to you as a reminder."
 msgstr "Enkrat mese�no vam bo geslo poslano v obliki opomnika."
 
 # Mailman/HTMLFormatter.py:358
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 msgid "The current archive"
 msgstr "Trenutni arhiv"
 
@@ -9425,7 +9429,7 @@ msgid "Posting of your message titled \"%(subject)s\""
 msgstr "Objava va�ega sporo�ila \"%(subject)s\""
 
 # Mailman/Cgi/admindb.py:338 Mailman/ListAdmin.py:258
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "[razlog ni podan]"
 
@@ -9439,33 +9443,33 @@ msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr "Nova zahteva za prijavo na seznam %(realname)s od %(addr)s"
 
 # Mailman/ListAdmin.py:367
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "Zahteva za prijavo"
 
 # Mailman/Cgi/confirm.py:490 Mailman/Cgi/confirm.py:588
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "Nadaljuj in po�akaj odobritev"
 
 # Mailman/Cgi/confirm.py:345
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr "Nova zahteva za odjavo s seznama %(realname)s od %(addr)s"
 
 # Mailman/Cgi/options.py:349
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr "Zahteva za odjavo"
 
 # Mailman/ListAdmin.py:399
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr "Izvirno sporo�ilo"
 
 # Mailman/ListAdmin.py:402
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr "Zahteva za po�tni seznam %(realname)s zavrnjena"
 
@@ -9596,66 +9600,66 @@ msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr "Niste prijavljeni na po�tni seznam %(listname)s"
 
 # Mailman/MailList.py:614 Mailman/MailList.py:886
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr " od %(remote)s"
 
 # Mailman/MailList.py:649
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr "prijave na %(realname)s zahtevajo odobritev moderatorja"
 
 # Mailman/MailList.py:711 bin/add_members:258
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "Obvestilo o prijavi na %(realname)s"
 
 # Mailman/Cgi/confirm.py:268
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr "odjave zahtevajo odobritev moderatorja"
 
 # Mailman/MailList.py:739
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr "Obvestilo o odjavi s seznama %(realname)s"
 
 # Mailman/MailList.py:739
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 #, fuzzy
 msgid "%(realname)s address change notification"
 msgstr "Obvestilo o odjavi s seznama %(realname)s"
 
 # Mailman/Cgi/confirm.py:140
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "Neveljaven potrditveni niz"
 
 # Mailman/Cgi/confirm.py:140
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "Neveljaven potrditveni niz"
 
 # Mailman/MailList.py:860
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr "prijave na %(name)s zahtevajo odobritev skrbnika"
 
 # Mailman/Cgi/confirm.py:140
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "Neveljaven potrditveni niz"
 
 # Mailman/Cgi/confirm.py:148
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "Vnesite potrditveni pi�kotek"
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr "Zadnje samodejno oblikovano obvestilo danes"
 
@@ -9750,17 +9754,17 @@ msgid "Original message suppressed by Mailman site configuration\n"
 msgstr ""
 
 # Mailman/htmlformat.py:611
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr "Po�ilja Mailman<br>razli�ica %(version)s"
 
 # Mailman/htmlformat.py:612
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr "Python Powered"
 
 # Mailman/htmlformat.py:613
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr "Gnu's Not Unix (Gnu, ne Unix)"
 
@@ -11185,7 +11189,7 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
@@ -11225,7 +11229,7 @@ msgstr ""
 "modul.\n"
 "Celotne specifikacije najdete na:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Iskanje naslovov razlikuje velike in male �rke, prikazani pa so naslovi v\n"
 "originalni obliki.\n"
@@ -15674,12 +15678,12 @@ msgstr ""
 # Mailman/Cgi/admin.py:460
 #~ msgid ""
 #~ "<li>Find members by\n"
-#~ "                <a href=\"http://docs.python.org/library/re.html#regular-"
+#~ "                <a href=\"https://docs.python.org/2/library/re.html#regular-"
 #~ "expression-syntax\"\n"
 #~ "                >Python regular expression</a> (<em>regexp</em>)<br>"
 #~ msgstr ""
 #~ "<li>Najdi �lane s pomo�jo\n"
-#~ "                <a href=\"http://docs.python.org/library/re.html#regular-"
+#~ "                <a href=\"https://docs.python.org/2/library/re.html#regular-"
 #~ "expression-syntax\"\n"
 #~ "                >regularnih izrazov Python</a> (<em>regexp</em>)<br>"
 
diff --git a/messages/sr/LC_MESSAGES/mailman.po b/messages/sr/LC_MESSAGES/mailman.po
index 537c6499..a237ccc3 100644
--- a/messages/sr/LC_MESSAGES/mailman.po
+++ b/messages/sr/LC_MESSAGES/mailman.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mailman 2.1\n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: 2003-07-02 14:50+0100\n"
 "Last-Translator: Bojan Suzic <bojans@teol.net>\n"
 "Language-Team: Trust-b [Serbian] <kontakt@trust-b.com>\n"
@@ -209,7 +209,7 @@ msgstr "од вас"
 msgid "by the list administrator"
 msgstr "од администратора листе"
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "због непознатих разлога"
 
@@ -225,23 +225,23 @@ msgstr "искључено"
 msgid "Bounce action notification"
 msgstr "Обавештење о прекомерном слању"
 
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "искључено"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr ""
 
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
 msgid "(no subject)"
 msgstr "(нема теме)"
 
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr ""
 
@@ -255,7 +255,7 @@ msgstr "Администратор"
 
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -263,7 +263,7 @@ msgstr "Нема листе <em>%(safelistname)s</em>"
 
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -273,8 +273,8 @@ msgstr "Грешка"
 
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -286,7 +286,7 @@ msgid "Authorization failed."
 msgstr "Пријава није успела."
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr ""
 
@@ -304,7 +304,7 @@ msgstr ""
 "неупотребљива."
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "Упозорење:"
 
@@ -461,7 +461,7 @@ msgstr "Модераторски захтјеви на чекању"
 msgid "Go to the general list information page"
 msgstr "Повратак на страну са основним информацијама о листи"
 
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 #, fuzzy
 msgid "Edit the public HTML pages and text files"
 msgstr "Уређивање јавних HTML страница"
@@ -556,7 +556,7 @@ msgstr "Назив теме: "
 msgid "Regexp:"
 msgstr "Regexp:"
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "Опис: "
 
@@ -716,7 +716,7 @@ msgid "nodupes"
 msgstr "без дупл."
 
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr "преглед"
 
@@ -748,7 +748,7 @@ msgstr "С"
 msgid "notmetoo"
 msgstr "без повр."
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr "без поште"
 
@@ -1071,150 +1071,150 @@ msgstr "Потврдите модераторску лозинку:"
 msgid "Submit Your Changes"
 msgstr "Слање промјена"
 
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr "Модераторске лозинке се не слажу"
 
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 #, fuzzy
 msgid "Poster passwords did not match"
 msgstr "Ваше лозинке се не поклапају."
 
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 #, fuzzy
 msgid "Administrator passwords did not match"
 msgstr "Администраторске лозинке се не слажу"
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "Корисник је већ учлањен."
 
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "Погрешна/неправилна е-адреса"
 
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr "Неправилна адреса (недозвољени знакови)"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "Успјешно позвани:"
 
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "Успјешно уписани:"
 
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "Грешка при позивању:"
 
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "Грешка при упису:"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "Успјешно исписани:"
 
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr "Немогуће је исписати неучлањене:"
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 msgid "You must provide both current and new addresses."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 #, fuzzy
 msgid "%(schange_to)s is already a list member."
 msgstr " је већ члан"
 
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 #, fuzzy
 msgid "%(schange_to)s is not a valid email address."
 msgstr "Морате доставити исправну е-адресу"
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 #, fuzzy
 msgid "%(schange_to)s is already a member"
 msgstr " је већ члан"
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 msgid "%(list_name)s address change notice."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 #, fuzzy
 msgid "Notification sent to %(schange_from)s."
 msgstr "Обавјештења"
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 #, fuzzy
 msgid "Notification sent to %(schange_to)s."
 msgstr "Обавјештења"
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr "Погрешна вриједност модераторске ознаке"
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 msgid "member mgt page"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "Није-су уписан-и"
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr "Игнорисање промјена за искљученог члана: %(user)s"
 
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "Успјешно уклоњени:"
 
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "Грешка при испису:"
 
@@ -1705,8 +1705,8 @@ msgid ""
 "    request."
 msgstr ""
 
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "Исписивање"
 
@@ -2219,47 +2219,51 @@ msgstr "Слање мјесечних подсјетника са лозинка
 msgid "List name is required."
 msgstr "Име листе је обавезно."
 
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr "Уређивање HTML-а: грешка"
 
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr "Изаберите страну за уређивање:"
 
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "Преглед или уређивање подешавања за листу."
 
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "Када завршите снимите промјене..."
 
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "Слање промјена"
 
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr "Не можете имати празну html страну."
 
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr "HTML није промјењен."
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2268,20 +2272,20 @@ msgid ""
 "             "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 #, fuzzy
 msgid "Page Unchanged."
 msgstr "HTML није промјењен."
 
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr "HTML је успјешно освјежен."
 
@@ -2335,7 +2339,7 @@ msgstr ""
 msgid "Edit Options"
 msgstr "Уређивање опција"
 
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "Читајте ову страницу на:"
@@ -2344,92 +2348,92 @@ msgstr "Читајте ову страницу на:"
 msgid "This form requires JavaScript."
 msgstr ""
 
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "грешка са CGI скриптом"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "Није дата адреса."
 
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 #, fuzzy
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "Лоша е-адреса: %(safeuser)s"
 
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr "Нема корисника %(safeuser)s."
 
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 #, fuzzy
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr "Ел. пошта са потврдом је послана."
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
 "             forwarded to the list administrator for approval."
 msgstr ""
 
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 #, fuzzy
 msgid ""
 "If you are a list member,\n"
 "            your password has been emailed to you."
 msgstr "Порука са вашом лозинком вам је послана."
 
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "Пријављивање није успјело."
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr "Порука са вашом лозинком вам је послана."
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
 msgstr ""
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr ""
 
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
 msgstr ""
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
 "            subscription for this mailing list has been changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "Адресе се не слажу!"
 
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr "Већ користите ту е-адресу"
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 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 "
@@ -2438,84 +2442,84 @@ msgid ""
 "%(safeuser)s will be changed. "
 msgstr ""
 
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "Адресе не могу бити празне"
 
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr "Порука за потврду је послана на %(newaddr)s. "
 
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "Унесена је погрешна/неисправна е-адреса"
 
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "Унесена је недозвољена адреса"
 
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s већ је члан листе."
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
 "                      think this restriction is erroneous, please contact\n"
 "                      the list owners at %(owneraddr)s."
 msgstr ""
 
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr "Име члана је успјешно промјењено."
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 msgid ""
 "The list administrator may not change the\n"
 "                    password for a user."
 msgstr ""
 
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "Лозинке не могу да буду празне"
 
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "Лозинке се не слажу!"
 
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 msgid ""
 "The list administrator may not change the\n"
 "            password for this user's other subscriptions.  However, the\n"
 "            password for this mailing list has been changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "Лозинка је успјешно промјењена."
 
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
 "                have not been unsubscribed!"
 msgstr ""
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 #, fuzzy
 msgid "via the member options page"
 msgstr "Страна за уређивање корисничких опција"
 
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "Резултати исписа"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -2523,7 +2527,7 @@ msgid ""
 "            decision."
 msgstr ""
 
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -2533,7 +2537,7 @@ msgid ""
 "            %(owneraddr)s."
 msgstr ""
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -2541,7 +2545,7 @@ msgid ""
 "                changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -2549,7 +2553,7 @@ msgid ""
 "            other options have been set successfully."
 msgstr ""
 
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -2557,82 +2561,82 @@ msgid ""
 "            your other options have been set successfully."
 msgstr ""
 
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "Успјешно сте сачували ваша подешавања."
 
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "Можете добити један најновији преглед."
 
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>Да, желим да се испишем</em>"
 
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "Промјена моје лозинке"
 
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "Листа других мојих чланстава"
 
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "Пошаљи ми лозинку"
 
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "лозинка"
 
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "Одјављивање"
 
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "Сачувај промјене"
 
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "дана"
 
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "дан"
 
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "Промјени моју адресу и име"
 
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "<em>Нема дефинисаних тема</em>"
 
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
 "<em>%(cpuser)s</em>."
 msgstr ""
 
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr ""
 
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "е-адреса и"
 
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -2650,19 +2654,19 @@ msgid ""
 "    "
 msgstr ""
 
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "Е-адреса:"
 
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "Улаз"
 
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -2671,37 +2675,37 @@ msgid ""
 "    message)."
 msgstr ""
 
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "Подсјетник лозинке"
 
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
 msgstr ""
 
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "Подсјећање"
 
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr "<недостаје>"
 
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "Тема:  %(topicname)s не постоји"
 
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "Детаљи филтера тема"
 
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "Име:"
 
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr ""
 
@@ -5685,7 +5689,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -6267,7 +6271,7 @@ msgstr ""
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -6721,7 +6725,7 @@ msgstr "Преглед листе чланова"
 msgid "Once a month, your password will be emailed to you as a reminder."
 msgstr "Једном мјесечно добићете подсјетник са лозинком."
 
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 msgid "The current archive"
 msgstr "Тренутна архива"
 
@@ -7039,7 +7043,7 @@ msgstr "Крај "
 msgid "Posting of your message titled \"%(subject)s\""
 msgstr ""
 
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "[Није дат разлог]"
 
@@ -7051,28 +7055,28 @@ msgstr "Прослијеђивање модерисане поруке"
 msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr ""
 
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "Захтјев за упис"
 
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "Настави са чекањем одобрења"
 
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr ""
 
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr "Захтјев за испис"
 
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr "Изворна порука"
 
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr ""
 
@@ -7166,55 +7170,55 @@ msgstr "Успјешно сте се учланили на листу %(realname
 msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr "Успјешно сте се учланили на листу %(realname)s."
 
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr ""
 
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr ""
 
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr ""
 
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr ""
 
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr ""
 
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 msgid "%(realname)s address change notification"
 msgstr ""
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "Погрешна ниска за потврду"
 
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "Погрешна ниска за потврду"
 
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr ""
 
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "Погрешна ниска за потврду"
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "Унесите \"колачић\" за потврду"
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr ""
 
@@ -7287,15 +7291,15 @@ msgstr ""
 msgid "Original message suppressed by Mailman site configuration\n"
 msgstr ""
 
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr ""
 
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr ""
 
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr "ГНУ није Јуникс"
 
@@ -8278,7 +8282,7 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
diff --git a/messages/sv/LC_MESSAGES/mailman.po b/messages/sv/LC_MESSAGES/mailman.po
index 14b5af75..de7a9bc7 100644
--- a/messages/sv/LC_MESSAGES/mailman.po
+++ b/messages/sv/LC_MESSAGES/mailman.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mailman 2.1b1\n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: 2002-12-24 14:35+0100\n"
 "Last-Translator: Eva �sterlind <eva.osterlind@arvika.se>\n"
 "Language-Team: Swedish <information@arvika.se>\n"
@@ -294,7 +294,7 @@ msgstr "av listadministrat
 # Mailman/Commands/cmd_set.py:182
 # Mailman/Bouncer.py:47 Mailman/Bouncer.py:232
 # Mailman/Commands/cmd_set.py:182
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "av ok�nd anledning"
 
@@ -316,13 +316,13 @@ msgstr "Meddelande om behandling av returmeddelanden"
 
 # Mailman/Bouncer.py:168
 # Mailman/Bouncer.py:179
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "stoppad"
 
 # Mailman/Bouncer.py:239
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr " Det sist mottagna returmeddelandet fr�n dig var daterat %(date)s"
 
@@ -334,7 +334,7 @@ msgstr " Det sist mottagna returmeddelandet fr
 # Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:211
 # Mailman/Handlers/Hold.py:214 Mailman/Handlers/Hold.py:249
 # Mailman/Handlers/ToDigest.py:211 Mailman/ListAdmin.py:235
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
@@ -343,7 +343,7 @@ msgstr "(utan titel)"
 
 # Mailman/Bouncer.py:233
 # Mailman/Bouncer.py:266
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr "[Inga returdetaljer �r tillg�ngliga]"
 
@@ -371,7 +371,7 @@ msgstr "Administrat
 # Mailman/Cgi/subscribe.py:61
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -383,7 +383,7 @@ msgstr "Listan finns inte: <em>%(safelistname)s</em>"
 # Mailman/Cgi/subscribe.py:49 Mailman/Cgi/subscribe.py:60
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -395,8 +395,8 @@ msgstr "Fel"
 # Mailman/Cgi/options.py:53
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -412,7 +412,7 @@ msgid "Authorization failed."
 msgstr "Felaktigt l�senord"
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr ""
 
@@ -435,7 +435,7 @@ msgstr ""
 # Mailman/Cgi/admin.py:179 Mailman/Cgi/admin.py:185 Mailman/Cgi/admin.py:190
 # Mailman/Cgi/admin.py:1360 Mailman/Gui/GUIBase.py:184
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "Varning: "
 
@@ -649,7 +649,7 @@ msgstr "G
 
 # Mailman/Cgi/admin.py:408
 # Mailman/Cgi/admin.py:409
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 #, fuzzy
 msgid "Edit the public HTML pages and text files"
 msgstr "Redigera HTML-koden p� listans webbsida"
@@ -785,7 +785,7 @@ msgstr "Regexp-uttryck:"
 
 # Mailman/Cgi/admin.py:702 Mailman/Cgi/options.py:918
 # Mailman/Cgi/admin.py:705 Mailman/Cgi/options.py:942
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "Beskrivning:"
 
@@ -1019,7 +1019,7 @@ msgstr "inga kopior"
 # Mailman/Cgi/admin.py:886
 # Mailman/Cgi/admin.py:892
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr "sammandragsversion"
 
@@ -1065,7 +1065,7 @@ msgstr "R"
 msgid "notmetoo"
 msgstr "inte mina"
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr "stoppa e-postbrev"
 
@@ -1558,143 +1558,143 @@ msgstr "Spara 
 
 # Mailman/Cgi/admin.py:1192
 # Mailman/Cgi/admin.py:1206
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr "Moderatorl�senorden �r inte lika"
 
 # Mailman/Cgi/subscribe.py:133
 # Mailman/Cgi/subscribe.py:133
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 #, fuzzy
 msgid "Poster passwords did not match"
 msgstr "L�senorden �r inte lika."
 
 # Mailman/Cgi/admin.py:1202
 # Mailman/Cgi/admin.py:1216
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 #, fuzzy
 msgid "Administrator passwords did not match"
 msgstr "Administrat�rsl�senorden �r inte lika"
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
 # Mailman/Cgi/admin.py:1245
 # Mailman/Cgi/admin.py:1265
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "Redan medlem"
 
 # Mailman/Cgi/admin.py:1248
 # Mailman/Cgi/admin.py:1268
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr "&lt;tom rad&gt;"
 
 # Mailman/Cgi/admin.py:1249 Mailman/Cgi/admin.py:1252
 # Mailman/Cgi/admin.py:1269 Mailman/Cgi/admin.py:1272
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "Fel/Ogiltig e-postadress"
 
 # Mailman/Cgi/admin.py:1255
 # Mailman/Cgi/admin.py:1275
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr "Farlig e-postadress (inneh�ller ogiltiga tecken)"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr ""
 
 # Mailman/Cgi/admin.py:1260
 # Mailman/Cgi/admin.py:1280
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "Inbjudan �r skickad till:"
 
 # Mailman/Cgi/admin.py:1262
 # Mailman/Cgi/admin.py:1282
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "Anm�lan gjord:"
 
 # Mailman/Cgi/admin.py:1267
 # Mailman/Cgi/admin.py:1287
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "Fel under inbjudan:"
 
 # Mailman/Cgi/admin.py:1269
 # Mailman/Cgi/admin.py:1289
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "Fel under anm�lan:"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
 # Mailman/Cgi/admin.py:1298
 # Mailman/Cgi/admin.py:1318
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "Avanm�lan gjord:"
 
 # Mailman/Cgi/admin.py:1303
 # Mailman/Cgi/admin.py:1323
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr "Kan inte avanm�la en icke-existerande medlem:"
 
 # bin/sync_members:211
 # bin/sync_members:215
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 #, fuzzy
 msgid "You must provide both current and new addresses."
 msgstr "Du m�ste fixa de ogiltiga adresserna f�rst."
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr ""
 
 # Mailman/Cgi/admindb.py:732
 # Mailman/Cgi/admindb.py:746
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 #, fuzzy
 msgid "%(schange_to)s is already a list member."
 msgstr " �r redan medlem"
 
 # Mailman/Cgi/subscribe.py:109
 # Mailman/Cgi/subscribe.py:109
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 #, fuzzy
 msgid "%(schange_to)s is not a valid email address."
 msgstr "Du m�ste uppge en giltig e-postadress."
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr ""
 
 # Mailman/Cgi/admindb.py:732
 # Mailman/Cgi/admindb.py:746
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 #, fuzzy
 msgid "%(schange_to)s is already a member"
 msgstr " �r redan medlem"
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
@@ -1702,57 +1702,57 @@ msgstr ""
 
 # Mailman/MailList.py:900
 # Mailman/MailList.py:945
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 #, fuzzy
 msgid "%(list_name)s address change notice."
 msgstr "Meddelande om avanm�lan fr�n e-postlistan %(realname)s"
 
 # Mailman/Gui/Bounce.py:105 Mailman/Gui/General.py:253
 # Mailman/Gui/Bounce.py:105 Mailman/Gui/General.py:257
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 #, fuzzy
 msgid "Notification sent to %(schange_from)s."
 msgstr "Meddelanden"
 
 # Mailman/Gui/Bounce.py:105 Mailman/Gui/General.py:253
 # Mailman/Gui/Bounce.py:105 Mailman/Gui/General.py:257
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 #, fuzzy
 msgid "Notification sent to %(schange_to)s."
 msgstr "Meddelanden"
 
 # Mailman/Cgi/admin.py:1315
 # Mailman/Cgi/admin.py:1335
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr "Ogiltigt v�rde p� moderationsflaggan"
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 #, fuzzy
 msgid "member mgt page"
 msgstr "via medlemmens personliga sida"
 
 # Mailman/Cgi/admin.py:1336
 # Mailman/Cgi/admin.py:1356
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "Inte anm�ld"
 
 # Mailman/Cgi/admin.py:1339
 # Mailman/Cgi/admin.py:1359
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr "Bortser fr�n �ndring av en medlem som �r avanm�ld: %(user)s"
 
 # Mailman/Cgi/admin.py:1378
 # Mailman/Cgi/admin.py:1399
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "Avanm�lan gjord av:"
 
 # Mailman/Cgi/admin.py:1382
 # Mailman/Cgi/admin.py:1403
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "Fel under avanm�lan av:"
 
@@ -2511,8 +2511,8 @@ msgstr ""
 # Mailman/Cgi/options.py:776 Mailman/Cgi/options.py:786
 # Mailman/Cgi/confirm.py:442 Mailman/Cgi/options.py:659
 # Mailman/Cgi/options.py:800 Mailman/Cgi/options.py:810
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "Avanm�l mig"
 
@@ -3290,65 +3290,69 @@ msgstr "Listans namn kr
 
 # Mailman/Cgi/edithtml.py:97
 # Mailman/Cgi/edithtml.py:97
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr "%(realname)s -- Redigera html f�r %(template_info)s"
 
 # Mailman/Cgi/edithtml.py:103
 # Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr "Redigera HTML : Fel"
 
 # Mailman/Cgi/edithtml.py:104
 # Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr "%(safetemplatename)s: Ogiltig mall"
 
 # Mailman/Cgi/edithtml.py:109 Mailman/Cgi/edithtml.py:110
 # Mailman/Cgi/edithtml.py:109 Mailman/Cgi/edithtml.py:110
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr "%(realname)s -- Redigera HTML-kod f�r webbsidor"
 
 # Mailman/Cgi/edithtml.py:111
 # Mailman/Cgi/edithtml.py:111
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr "V�lj webbsidan som du vill redigera:"
 
 # Mailman/Cgi/edithtml.py:137
 # Mailman/Cgi/edithtml.py:137
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "Titta eller redigera avseende listans konfigurationsinformation."
 
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
 # Mailman/Cgi/edithtml.py:146
 # Mailman/Cgi/edithtml.py:145
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "N�r du �r f�rdig med att g�ra �ndringar..."
 
 # Mailman/Cgi/edithtml.py:147
 # Mailman/Cgi/edithtml.py:146
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "Spara �ndringar"
 
 # Mailman/Cgi/edithtml.py:154
 # Mailman/Cgi/edithtml.py:153
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr "HTML-sidan kan inte vara tom."
 
 # Mailman/Cgi/edithtml.py:155
 # Mailman/Cgi/edithtml.py:154
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr "Inga �ndringar i HTML-koden."
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -3357,24 +3361,24 @@ msgid ""
 "             "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr ""
 
 # Mailman/Cgi/edithtml.py:155
 # Mailman/Cgi/edithtml.py:154
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 #, fuzzy
 msgid "Page Unchanged."
 msgstr "Inga �ndringar i HTML-koden."
 
 # Mailman/Cgi/edithtml.py:170
 # Mailman/Cgi/edithtml.py:169
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr "HTML-koden �r uppdaterad."
 
@@ -3459,7 +3463,7 @@ msgstr "
 # Mailman/Cgi/roster.py:111
 # Mailman/Cgi/listinfo.py:190 Mailman/Cgi/options.py:766
 # Mailman/Cgi/roster.py:111
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "Se denna sida p�"
@@ -3470,24 +3474,24 @@ msgstr ""
 
 # Mailman/Cgi/options.py:50 Mailman/Cgi/options.py:67
 # Mailman/Cgi/options.py:50 Mailman/Cgi/options.py:67
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "CGI skriptfel"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr ""
 
 # Mailman/Cgi/options.py:95
 # Mailman/Cgi/options.py:95
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "Ingen e-postadress angiven"
 
 # bin/add_members:168
 # bin/add_members:172
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 #, fuzzy
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "Fel/Ogiltig e-postadress: %(safeuser)s"
@@ -3496,21 +3500,21 @@ msgstr "Fel/Ogiltig e-postadress: %(safeuser)s"
 # Mailman/Cgi/options.py:176
 # Mailman/Cgi/options.py:107 Mailman/Cgi/options.py:154
 # Mailman/Cgi/options.py:176
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr "Medlemmen finns inte: %(safeuser)s."
 
 # Mailman/Cgi/options.py:149 Mailman/Cgi/options.py:159
 # Mailman/Cgi/options.py:149 Mailman/Cgi/options.py:159
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 #, fuzzy
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr "Ett e-postbrev med bekr�ftelse har skickats."
 
 # Mailman/Commands/cmd_unsubscribe.py:69
 # Mailman/Commands/cmd_unsubscribe.py:69
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 #, fuzzy
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
@@ -3523,7 +3527,7 @@ msgstr ""
 # Mailman/Cgi/options.py:225
 # Mailman/Cgi/options.py:170 Mailman/Cgi/options.py:182
 # Mailman/Cgi/options.py:225
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 #, fuzzy
 msgid ""
 "If you are a list member,\n"
@@ -3532,7 +3536,7 @@ msgstr "Ett e-postbrev med l
 
 # Mailman/Cgi/options.py:199
 # Mailman/Cgi/options.py:199
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "Inloggningen misslyckades."
 
@@ -3540,38 +3544,38 @@ msgstr "Inloggningen misslyckades."
 # Mailman/Cgi/options.py:225
 # Mailman/Cgi/options.py:170 Mailman/Cgi/options.py:182
 # Mailman/Cgi/options.py:225
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr "Ett e-postbrev med l�senordet har skickats till dig."
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
 msgstr ""
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr ""
 
 # Mailman/Cgi/options.py:231
 # Mailman/Cgi/options.py:231
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 #, fuzzy
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr "Visa listmedlemskap f�r %(safeuser)s p� %(hostname)s"
 
 # Mailman/Cgi/options.py:234
 # Mailman/Cgi/options.py:234
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
 msgstr ""
 "Klicka p� en lista f�r att g� till dina personliga inst�llningar f�r den."
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
@@ -3580,18 +3584,18 @@ msgstr ""
 
 # Mailman/Cgi/options.py:275
 # Mailman/Cgi/options.py:283
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "Adresserna �r inte lika!"
 
 # Mailman/Cgi/options.py:280
 # Mailman/Cgi/options.py:288
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr "Den e-postadressen �r du redan anm�ld med p� listan "
 
 # Mailman/Cgi/options.py:300
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 #, fuzzy
 msgid ""
 "The new address you requested %(newaddr)s is already a member of the\n"
@@ -3607,45 +3611,45 @@ msgstr ""
 
 # bin/clone_member:138
 # Mailman/Cgi/options.py:309
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 #, fuzzy
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "Den nya adressen �r redan medlem: %(newaddr)s"
 
 # Mailman/Cgi/options.py:286
 # Mailman/Cgi/options.py:315
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "Adresserna kan inte vara tomma"
 
 # Mailman/Cgi/options.py:302
 # Mailman/Cgi/options.py:327
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr ""
 "Ett bekr�ftelsemeddelande har skickats i ett e-postbrev till %(newaddr)s."
 
 # Mailman/Cgi/options.py:311
 # Mailman/Cgi/options.py:336
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "Ogiltig e-postadress har angivits"
 
 # Mailman/Cgi/options.py:313
 # Mailman/Cgi/options.py:338
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "Ogiltig e-postadress har angivits"
 
 # Mailman/Cgi/options.py:315
 # Mailman/Cgi/options.py:340
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s �r redan medlem av listan."
 
 # Mailman/Commands/cmd_subscribe.py:92
 # Mailman/Commands/cmd_subscribe.py:102
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 #, fuzzy
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
@@ -3658,13 +3662,13 @@ msgstr ""
 
 # Mailman/Cgi/options.py:324
 # Mailman/Cgi/options.py:349
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr "Namnet har �ndrats. "
 
 # Mailman/Cgi/options.py:557
 # Mailman/Cgi/options.py:585
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 #, fuzzy
 msgid ""
 "The list administrator may not change the\n"
@@ -3677,19 +3681,19 @@ msgstr ""
 
 # Mailman/Cgi/options.py:335
 # Mailman/Cgi/options.py:360
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "L�senorden kan inte vara tomma"
 
 # Mailman/Cgi/options.py:340
 # Mailman/Cgi/options.py:365
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "L�senorden �r inte lika!"
 
 # Mailman/Cgi/options.py:557
 # Mailman/Cgi/options.py:585
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 #, fuzzy
 msgid ""
 "The list administrator may not change the\n"
@@ -3705,14 +3709,14 @@ msgstr ""
 # Mailman/Commands/cmd_password.py:105
 # Mailman/Cgi/options.py:380 Mailman/Commands/cmd_password.py:79
 # Mailman/Commands/cmd_password.py:105
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "Ditt l�senord har �ndrats."
 
 # Mailman/Cgi/options.py:364
 # Mailman/Cgi/options.py:389
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
@@ -3722,19 +3726,19 @@ msgstr ""
 "detta val.\n"
 "Du �r INTE borttagen fr�n listan!"
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 msgid "via the member options page"
 msgstr "via medlemmens personliga sida"
 
 # Mailman/Cgi/options.py:396
 # Mailman/Cgi/options.py:421
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "Resultat av avanm�lan"
 
 # Mailman/Cgi/options.py:400
 # Mailman/Cgi/options.py:425
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -3747,7 +3751,7 @@ msgstr ""
 
 # Mailman/Cgi/options.py:405
 # Mailman/Cgi/options.py:430
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -3762,7 +3766,7 @@ msgstr ""
 "Har du fr�gor i samband med din avanm�lan, kontakta listans �gare p� "
 "%(owneraddr)s."
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -3772,7 +3776,7 @@ msgstr ""
 
 # Mailman/Cgi/options.py:553
 # Mailman/Cgi/options.py:581
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -3786,7 +3790,7 @@ msgstr ""
 
 # Mailman/Cgi/options.py:557
 # Mailman/Cgi/options.py:585
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -3800,91 +3804,91 @@ msgstr ""
 
 # Mailman/Cgi/options.py:561
 # Mailman/Cgi/options.py:589
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "Dina val �r nu satta."
 
 # Mailman/Cgi/options.py:564
 # Mailman/Cgi/options.py:592
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "Det kan vara s� att du kommer att f� ta emot ett sista e-postbrev."
 
 # Mailman/Cgi/options.py:633
 # Mailman/Cgi/options.py:661
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>Ja, jag vill avanm�la mig fr�n listan</em>"
 
 # Mailman/Cgi/options.py:637
 # Mailman/Cgi/options.py:665
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "�ndra mitt l�senord"
 
 # Mailman/Cgi/options.py:640
 # Mailman/Cgi/options.py:668
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "Visa andra listor som jag �r medlem av"
 
 # Mailman/Cgi/options.py:646
 # Mailman/Cgi/options.py:674
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "Skicka mig mitt l�senord"
 
 # Mailman/Cgi/options.py:648
 # Mailman/Cgi/options.py:676
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "l�senord"
 
 # Mailman/Cgi/options.py:650
 # Mailman/Cgi/options.py:678
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "Logga ut"
 
 # Mailman/Cgi/options.py:652
 # Mailman/Cgi/options.py:680
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "Spara �ndringar"
 
 # Mailman/Cgi/options.py:664
 # Mailman/Cgi/options.py:692
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "dagar"
 
 # Mailman/Cgi/options.py:666
 # Mailman/Cgi/options.py:694
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "dag"
 
 # Mailman/Cgi/options.py:667
 # Mailman/Cgi/options.py:695
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr "%(days)d %(units)s"
 
 # Mailman/Cgi/options.py:673
 # Mailman/Cgi/options.py:701
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "�ndra min adress och mitt namn"
 
 # Mailman/Cgi/options.py:701
 # Mailman/Cgi/options.py:725
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "</em>Inget �mne har definierats</em>"
 
 # Mailman/Cgi/options.py:709
 # Mailman/Cgi/options.py:733
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
@@ -3895,26 +3899,26 @@ msgstr ""
 
 # Mailman/Cgi/options.py:723
 # Mailman/Cgi/options.py:747
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "%(realname)s: inloggning till personliga inst�llningar"
 
 # Mailman/Cgi/options.py:724
 # Mailman/Cgi/options.py:748
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "din e-postadress och "
 
 # Mailman/Cgi/options.py:726
 # Mailman/Cgi/options.py:750
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 #, fuzzy
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr "%(realname)s: personliga inst�llningar f�r %(safeuser)s"
 
 # Mailman/Cgi/options.py:752
 # Mailman/Cgi/options.py:776
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -3946,25 +3950,25 @@ msgstr ""
 
 # Mailman/Cgi/options.py:766
 # Mailman/Cgi/options.py:790
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "E-postadress:"
 
 # Mailman/Cgi/options.py:770
 # Mailman/Cgi/options.py:794
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "L�senord:"
 
 # Mailman/Cgi/options.py:772
 # Mailman/Cgi/options.py:796
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "Logga in"
 
 # Mailman/Cgi/options.py:780
 # Mailman/Cgi/options.py:804
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -3981,13 +3985,13 @@ msgstr ""
 
 # Mailman/Cgi/options.py:788
 # Mailman/Cgi/options.py:812
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "P�minnelse om l�senord"
 
 # Mailman/Cgi/options.py:792
 # Mailman/Cgi/options.py:816
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
@@ -3997,37 +4001,37 @@ msgstr ""
 
 # Mailman/Cgi/options.py:795
 # Mailman/Cgi/options.py:819
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "Skicka p�minnelse"
 
 # Mailman/Cgi/options.py:895
 # Mailman/Cgi/options.py:919
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr "<saknas>"
 
 # Mailman/Cgi/options.py:906
 # Mailman/Cgi/options.py:930
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "Det valda �mnet �r inte giltigt: %(topicname)s"
 
 # Mailman/Cgi/options.py:911
 # Mailman/Cgi/options.py:935
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "Mer information om �mnesfiltret"
 
 # Mailman/Cgi/options.py:914
 # Mailman/Cgi/options.py:938
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "Namn:"
 
 # Mailman/Cgi/options.py:916
 # Mailman/Cgi/options.py:940
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr "Filter (regexp-uttryck):"
 
@@ -8689,7 +8693,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -8724,7 +8728,7 @@ msgstr ""
 "\">de allm�nna reglerna f�r icke-medlemmar</a> s�ger.\n"
 "\n"
 "<p>I textrutorna nedan l�gger du in en e-postadress per rad.\n"
-"Du kan ocks� l�gga in <a href=\"http://docs.python.org/library/re.html"
+"Du kan ocks� l�gga in <a href=\"https://docs.python.org/2/library/re.html"
 "\">Python regexp-uttryck</a>.\n"
 "B�rja i s� fall raden med tecknet ^ f�r att markera att det �r ett s�dant "
 "uttryck.\n"
@@ -9567,7 +9571,7 @@ msgstr "Ska 
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -9590,7 +9594,7 @@ msgid ""
 "             configuration variable."
 msgstr ""
 "�mnesfiltret kategoriserar varje e-postbrev som kommer till listan,\n"
-"efter <a href=\"http://docs.python.org/library/re.html\">regexp-uttrycken</"
+"efter <a href=\"https://docs.python.org/2/library/re.html\">regexp-uttrycken</"
 "a>\n"
 "du skriver in nedan. Om f�lten <code>Subject:</code> eller <code>Keywords:</"
 "code>\n"
@@ -10307,7 +10311,7 @@ msgstr ""
 
 # Mailman/HTMLFormatter.py:377
 # Mailman/HTMLFormatter.py:390
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 #, fuzzy
 msgid "The current archive"
 msgstr "nuvarande arkiv"
@@ -10794,7 +10798,7 @@ msgstr "Ditt meddelande med titel \"%(subject)s\""
 # Mailman/ListAdmin.py:417
 # Mailman/Cgi/admindb.py:714 Mailman/ListAdmin.py:308
 # Mailman/ListAdmin.py:429
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "[Ingen orsak given]"
 
@@ -10812,38 +10816,38 @@ msgstr "Ny ans
 
 # Mailman/ListAdmin.py:416
 # Mailman/ListAdmin.py:428
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "Ans�kan om medlemskap"
 
 # Mailman/Cgi/confirm.py:537 Mailman/Cgi/confirm.py:640
 # Mailman/Cgi/confirm.py:550 Mailman/Cgi/confirm.py:663
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "Forts�tt att v�nta p� godk�nnande av moderator"
 
 # Mailman/ListAdmin.py:446
 # Mailman/ListAdmin.py:458
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr "Ans�kan fr�n %(addr)s om avanm�lan fr�n listan %(realname)s"
 
 # Mailman/ListAdmin.py:469
 # Mailman/ListAdmin.py:481
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr "Ans�kan om avanm�lan"
 
 # Mailman/ListAdmin.py:500
 # Mailman/ListAdmin.py:512
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr "Ursprungligt meddelande"
 
 # Mailman/ListAdmin.py:503
 # Mailman/ListAdmin.py:515
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr "Fr�ga till e-postlistan %(realname)s inte godk�nd"
 
@@ -11012,75 +11016,75 @@ msgstr "Du 
 
 # Mailman/MailList.py:766 Mailman/MailList.py:1120
 # Mailman/MailList.py:813 Mailman/MailList.py:1174
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr " fr�n %(remote)s"
 
 # Mailman/MailList.py:803
 # Mailman/MailList.py:850
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr "anm�lan till %(realname)s kr�ver godk�nnande av moderator"
 
 # Mailman/MailList.py:861 bin/add_members:277
 # Mailman/MailList.py:909 bin/add_members:281
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "Meddelande om anm�lan till e-postlistan %(realname)s"
 
 # Mailman/MailList.py:879
 # Mailman/MailList.py:924
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr "avanm�lan kr�ver godk�nnande av moderator"
 
 # Mailman/MailList.py:900
 # Mailman/MailList.py:945
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr "Meddelande om avanm�lan fr�n e-postlistan %(realname)s"
 
 # Mailman/MailList.py:900
 # Mailman/MailList.py:945
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 #, fuzzy
 msgid "%(realname)s address change notification"
 msgstr "Meddelande om avanm�lan fr�n e-postlistan %(realname)s"
 
 # Mailman/Cgi/confirm.py:160
 # Mailman/Cgi/confirm.py:160
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "Ogiltig identifikation f�r bekr�ftelse"
 
 # Mailman/Cgi/confirm.py:160
 # Mailman/Cgi/confirm.py:160
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "Ogiltig identifikation f�r bekr�ftelse"
 
 # Mailman/MailList.py:1040
 # Mailman/MailList.py:1089
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr "Anm�lan till %(name)s kr�ver godk�nnande av administrat�r"
 
 # Mailman/Cgi/confirm.py:160
 # Mailman/Cgi/confirm.py:160
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "Ogiltig identifikation f�r bekr�ftelse"
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "efter din �nskan"
 
 # Mailman/MailList.py:1343
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr "Dagens sista automatiska svarsmeddelande"
 
@@ -11192,19 +11196,19 @@ msgstr ""
 
 # Mailman/htmlformat.py:627
 # Mailman/htmlformat.py:627
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr "Levererat av Mailman<br>version %(version)s"
 
 # Mailman/htmlformat.py:628
 # Mailman/htmlformat.py:628
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr "Programmerat i Python"
 
 # Mailman/htmlformat.py:629
 # Mailman/htmlformat.py:629
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr "GNU �r inte Unix"
 
@@ -12809,7 +12813,7 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
@@ -12849,7 +12853,7 @@ msgstr ""
 "Syntax f�r regexp-uttryck �r som Perl5, n�r Pythons \"re\" modul anv�nds.\n"
 "Komplett specifikation finns p�:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Adresser j�mf�rs utan skillnad p� sm� och stora bokst�ver, men visas med\n"
 "stora/sm� bokst�ver som de stavas.\n"
@@ -16306,12 +16310,12 @@ msgstr ""
 
 #~ msgid ""
 #~ "<li>Find members by\n"
-#~ "                <a href=\"http://docs.python.org/library/re.html#regular-"
+#~ "                <a href=\"https://docs.python.org/2/library/re.html#regular-"
 #~ "expression-syntax\"\n"
 #~ "                >Python regular expression</a> (<em>regexp</em>)<br>"
 #~ msgstr ""
-#~ "<li>Hitta medlemmar genom att s�ka med en <a href=\"http://docs.python."
-#~ "org/library/re.html#regular-expression-syntax\">Python regular "
+#~ "<li>Hitta medlemmar genom att s�ka med en <a href=\"https://docs.python."
+#~ "org/2/library/re.html#regular-expression-syntax\">Python regular "
 #~ "expression</a> (<em>regexp</em>)<br>"
 
 #~ msgid "Send welcome message to this batch?"
diff --git a/messages/tr/LC_MESSAGES/mailman.po b/messages/tr/LC_MESSAGES/mailman.po
index b0e18284..66de8227 100644
--- a/messages/tr/LC_MESSAGES/mailman.po
+++ b/messages/tr/LC_MESSAGES/mailman.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kerem Erkan <kerem.erkan@hacettepe.edu.tr>\n"
 "Language-Team: Turkish <LL@li.org>\n"
@@ -205,7 +205,7 @@ msgstr "sizin taraf
 msgid "by the list administrator"
 msgstr "liste y�neticisi taraf�ndan"
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "bilinmeyen nedenlerle"
 
@@ -221,23 +221,23 @@ msgstr "etkin de
 msgid "Bounce action notification"
 msgstr "Geri d�nme eylem bildirimi"
 
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "etkin de�il"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr " Sizden gelen son geri d�n�� %(date)s tarihindeydi"
 
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
 msgid "(no subject)"
 msgstr "(konu yok)"
 
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr "[Geri d�nme ayr�nt�lar� yok]"
 
@@ -251,7 +251,7 @@ msgstr "Y
 
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -259,7 +259,7 @@ msgstr "<em>%(safelistname)s</em> ad
 
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -269,8 +269,8 @@ msgstr "Hata"
 
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -282,7 +282,7 @@ msgid "Authorization failed."
 msgstr "Yetkilendirme ba�ar�s�z."
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr ""
 
@@ -300,7 +300,7 @@ msgstr ""
 "                mesaj listeniz kullan�lamaz hale gelecektir."
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "Uyar�: "
 
@@ -460,7 +460,7 @@ msgstr "Bekleyen moderat
 msgid "Go to the general list information page"
 msgstr "Genel liste bilgi sayfas�na git"
 
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 #, fuzzy
 msgid "Edit the public HTML pages and text files"
 msgstr "Genel HTML sayfalar�n� d�zenle"
@@ -554,7 +554,7 @@ msgstr "Konu ismi:"
 msgid "Regexp:"
 msgstr "Regexp:"
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "Tan�m:"
 
@@ -714,7 +714,7 @@ msgid "nodupes"
 msgstr "kopya<br>g�nderme"
 
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr "toplu"
 
@@ -746,7 +746,7 @@ msgstr "G"
 msgid "notmetoo"
 msgstr "mesaj�m� bana<br>g�nderme"
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr "mesaj yok"
 
@@ -1082,150 +1082,150 @@ msgstr "Moderat
 msgid "Submit Your Changes"
 msgstr "De�i�iklikleri Kaydet"
 
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr "Moderat�r �ifreleri birbiriyle e�le�medi"
 
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 #, fuzzy
 msgid "Poster passwords did not match"
 msgstr "�ifreleriniz birbiriyle e�le�medi!"
 
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 msgid "Administrator passwords did not match"
 msgstr "Y�netici �ifreleri birbiriyle e�le�medi"
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "Zaten listeye �ye"
 
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr "&lt;bo� sat�r&gt;"
 
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "K�t�/Ge�ersiz e-posta adresi"
 
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr "Sald�rgan adres (ge�ersiz karakterler i�eriyor)"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "Ba�ar�yla davet edildi:"
 
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "Ba�ar�yla �ye yap�ld�:"
 
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "Davet ederken hata oldu:"
 
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "�ye yaparken hata oldu:"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "Ba�ar�yla �yelikten ��kar�ld�:"
 
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr "Zaten �ye olmayanlar ��kar�lam�yor:"
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 msgid "You must provide both current and new addresses."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 #, fuzzy
 msgid "%(schange_to)s is already a list member."
 msgstr " zaten �ye"
 
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 #, fuzzy
 msgid "%(schange_to)s is not a valid email address."
 msgstr "Ge�erli bir e-posta adresi vermelisiniz."
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 #, fuzzy
 msgid "%(schange_to)s is already a member"
 msgstr " zaten �ye"
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 #, fuzzy
 msgid "%(list_name)s address change notice."
 msgstr "%(realname)s �yelikten ��kma bildirimi"
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 #, fuzzy
 msgid "Notification sent to %(schange_from)s."
 msgstr "Bildirimler"
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 #, fuzzy
 msgid "Notification sent to %(schange_to)s."
 msgstr "Bildirimler"
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr "K�t� moderat�r onay de�eri"
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 msgid "member mgt page"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "�ye de�il"
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr "Silinmi� �ye �zerindeki de�i�iklikler g�zard� ediliyor: %(user)s"
 
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "Ba�ar�yla Silindi:"
 
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "�yelikten ��kar�l�rken hata oldu:"
 
@@ -1807,8 +1807,8 @@ msgstr ""
 "    <p>Veya <em>Vazge� ve g�zard� et</em> d��mesine t�klayarak bu listeden\n"
 "    ��kma iste�inizi iptal edin."
 
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "�yelikten ��k"
 
@@ -2415,47 +2415,51 @@ msgstr "Ayl
 msgid "List name is required."
 msgstr "Liste ismi gerekiyor."
 
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr "%(realname)s -- %(template_info)s i�in html d�zenle"
 
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr "HTML d�zenle: Hata"
 
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr "%(safetemplatename)s: Ge�ersiz �ablon"
 
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr "%(realname)s -- HTML Sayfa D�zenleme"
 
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr "D�zenlenecek sayfay� se�in:"
 
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "Liste yap�land�rma bilgisini g�r�nt�le veya d�zenle"
 
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "De�i�ikliklerinizi tamamlad���n�zda..."
 
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "De�i�iklikleri Kaydet"
 
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr "Bo� html sayfas� olamaz."
 
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr "HTML De�i�tirilmedi."
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2464,20 +2468,20 @@ msgid ""
 "             "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 #, fuzzy
 msgid "Page Unchanged."
 msgstr "HTML De�i�tirilmedi."
 
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr "HTML ba�ar�yla g�ncellendi."
 
@@ -2542,7 +2546,7 @@ msgstr ""
 msgid "Edit Options"
 msgstr "Se�enekleri D�zenle"
 
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "Bu sayfay� �u dilde g�ster"
@@ -2551,34 +2555,34 @@ msgstr "Bu sayfay
 msgid "This form requires JavaScript."
 msgstr ""
 
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "CGI dil hatas�"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "Adres verilmedi"
 
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "Ge�ersiz e-posta adresi: %(safeuser)s"
 
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr "B�yle bir �ye yok: %(safeuser)s."
 
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 #, fuzzy
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr "Onay e-postas� g�nderildi."
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 #, fuzzy
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
@@ -2587,37 +2591,37 @@ msgstr ""
 "Listeden ��kma iste�iniz onay i�in\n"
 "                    liste y�neticisine iletildi."
 
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 #, fuzzy
 msgid ""
 "If you are a list member,\n"
 "            your password has been emailed to you."
 msgstr "�ifreniz i�in bir hat�rlat�c� e-posta adresinize g�nderildi"
 
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "Kimlik do�rulamas� ba�ar�s�z oldu."
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr "�ifreniz i�in bir hat�rlat�c� e-posta adresinize g�nderildi"
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
 msgstr ""
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr ""
 
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr "%(safeuser)s i�in %(hostname)s �zerindeki liste �yelikleri"
 
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
@@ -2625,22 +2629,22 @@ msgstr ""
 "�stedi�iniz mesaj listesi i�in se�enekler sayfan�z� ziyaret etmek\n"
 "        i�in bir linke t�klay�n."
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
 "            subscription for this mailing list has been changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "Adresler birbirine e�le�medi!"
 
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr "Zaten o e-posta adresini kullan�yorsunuz"
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 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 "
@@ -2654,31 +2658,31 @@ msgstr ""
 "%(safeuser)s\n"
 "adresini i�eren t�m di�er mesaj listeleri de�i�tirilecek. "
 
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "Yeni adres zaten bir �ye: %(newaddr)s"
 
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "Adresler bo� olamaz"
 
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr "%(newaddr)s adresine bir onay mesaj� g�nderildi. "
 
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "K�t� e-posta adresi verildi"
 
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "Ge�ersiz e-posta adresi verildi"
 
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s zaten listenin bir �yesi."
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 #, fuzzy
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
@@ -2689,11 +2693,11 @@ msgstr ""
 "yasaklanm��. E�er bu k�s�tlaman�n hatal� oldu�unu d���n�yorsan�z,\n"
 "%(owneraddr)s adresinden liste y�neticileriyle ba�lant� kurabilirsiniz."
 
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr "�ye ismi ba�ar�yla de�i�tirildi. "
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 #, fuzzy
 msgid ""
 "The list administrator may not change the\n"
@@ -2704,15 +2708,15 @@ msgstr ""
 "se�enekleriniz\n"
 "            ba�ar�yla ayarland�."
 
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "�ifreler bo� olamaz"
 
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "�ifreler birbiriyle e�le�medi!"
 
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 #, fuzzy
 msgid ""
 "The list administrator may not change the\n"
@@ -2724,12 +2728,12 @@ msgstr ""
 "se�enekleriniz\n"
 "            ba�ar�yla ayarland�."
 
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "�ifre ba�ar�yla de�i�tirildi."
 
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
@@ -2739,16 +2743,16 @@ msgstr ""
 "                alt�ndaki onay kutusunu se�meniz gerekir. Listeden "
 "��kar�lmad�n�z!"
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 #, fuzzy
 msgid "via the member options page"
 msgstr "%(realname)s listesi: �yelik se�enekleri giri� sayfas�"
 
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "Listeden ��kma sonu�lar�"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -2759,7 +2763,7 @@ msgstr ""
 "liste moderat�rlerine iletildi. Liste moderat�rleri karar verdi�i zaman\n"
 "            bir bildirim alacaks�n�z."
 
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -2776,7 +2780,7 @@ msgstr ""
 "            varsa %(owneraddr)s adresinden liste sahipleri ile ba�lant�ya\n"
 "            ge�ebilirsiniz."
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -2784,7 +2788,7 @@ msgid ""
 "                changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -2796,7 +2800,7 @@ msgstr ""
 "se�enekleriniz\n"
 "            ba�ar�yla ayarland�."
 
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -2808,63 +2812,63 @@ msgstr ""
 "se�enekleriniz\n"
 "            ba�ar�yla ayarland�."
 
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "Se�eneklerinizi ba�ar�yla ayarlad�n�z."
 
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "Son bir toplu mesaj alabilirsiniz."
 
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>Evet, �yelikten ��kmak istiyorum</em>"
 
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "�ifremi De�i�tir"
 
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "Di�er �yeliklerimi listele"
 
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "�ifremi Bana E-Postayla Yolla"
 
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "�ifre"
 
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "��k��"
 
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "De�i�ikliklerimi G�nder"
 
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "g�n"
 
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "g�n"
 
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr "%(days)d %(units)s"
 
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "Adresimi ve �smimi De�i�tir"
 
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "<em>Herhangi bir konu tan�mlanmad�</em>"
 
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
@@ -2874,19 +2878,19 @@ msgstr ""
 "Bu listeye b�y�k-k���k harf ayar� korunmu� �ekilde <em>%(cpuser)s</"
 "em>adresiyle �yesiniz."
 
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "%(realname)s listesi: �yelik se�enekleri giri� sayfas�"
 
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "e-posta adresi ve "
 
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr "%(realname)s listesi: %(safeuser)s kullan�c�s� i�in �yelik se�enekleri"
 
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -2918,19 +2922,19 @@ msgstr ""
 "hi�biri yap�lmayacakt�r.\n"
 "    "
 
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "E-posta adresi:"
 
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "�ifre:"
 
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "Giri�"
 
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -2944,11 +2948,11 @@ msgstr ""
 "onaylayabilirsiniz,\n"
 "    onay mesaj�ndaki a��klamalar� inceleyin)."
 
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "�ifre hat�rlat"
 
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
@@ -2956,27 +2960,27 @@ msgstr ""
 "A�a��da <em>Hat�rlat</em> d��mesine t�klad���n�zda\n"
 "    �ifreniz size e-postayla g�nderilecektir."
 
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "Hat�rlat"
 
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr "<eksik>"
 
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "�stenen konu ge�erli de�il: %(topicname)s"
 
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "Konu filtre ayr�nt�lar�"
 
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "�sim:"
 
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr "Desen (regexp olarak):"
 
@@ -6916,7 +6920,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -6960,7 +6964,7 @@ msgstr ""
 "�ekilde\n"
 "            adres ekleyebilirsiniz; sat�ra bir ^ karakteri ile ba�layarak "
 "bir\n"
-"            <a href=\"http://docs.python.org/library/re.html\">Python\n"
+"            <a href=\"https://docs.python.org/2/library/re.html\">Python\n"
 "            regular expression</a> belirtebilirsiniz. Ters geri �izgi "
 "girerken\n"
 "            Python ham dizgisi gibi girin (yani genel olarak tek bir ters "
@@ -7759,7 +7763,7 @@ msgstr "Konu filtresi etkin mi yoksa devre d
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -7782,7 +7786,7 @@ msgid ""
 "             configuration variable."
 msgstr ""
 "Konu filtresi gelen her mesaj� a�a��da belirleyece�iniz <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filtrelerine</a> g�re kategorilere ay�r�r. E�er "
 "mesaj�n\n"
 "             <code>Konu:</code> veya <code>Keywords:</code> ba�l��� bir "
@@ -8395,7 +8399,7 @@ msgstr "
 msgid "Once a month, your password will be emailed to you as a reminder."
 msgstr "Ayda bir, �ifreniz size e-posta yoluyla hat�rlat�lacakt�r."
 
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 msgid "The current archive"
 msgstr "�u andaki ar�iv"
 
@@ -8767,7 +8771,7 @@ msgstr "Son: "
 msgid "Posting of your message titled \"%(subject)s\""
 msgstr "\"%(subject)s\" ba�l�kl� mesaj�n�z�n g�nderimi"
 
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "[Neden belirtilmedi]"
 
@@ -8779,28 +8783,28 @@ msgstr "Moderasyon onayl
 msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr "%(addr)s adresinden, %(realname)s listesine yeni �yelik iste�i"
 
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "�yelik iste�i"
 
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "Onay beklemeye devam et"
 
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr "%(addr)s adresinden, %(realname)s listesinden ��kma iste�i"
 
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr "�yelikten ��kma iste�i"
 
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr "�zg�n Mesaj"
 
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr "%(realname)s mesaj listesine istek reddedildi"
 
@@ -8916,56 +8920,56 @@ msgstr "%(listname)s mesaj listesine 
 msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr "%(listname)s mesaj listesine �ye de�ilsiniz"
 
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr " %(remote)s adresinden "
 
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr "%(realname)s listesine �yelikler moderat�r onay� gerektirir"
 
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "%(realname)s �yelik bildirimi"
 
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr "�yelikten ��kmak moderat�r onay� gerektirir"
 
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr "%(realname)s �yelikten ��kma bildirimi"
 
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 #, fuzzy
 msgid "%(realname)s address change notification"
 msgstr "%(realname)s �yelikten ��kma bildirimi"
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "Hatal� onay dizgisi"
 
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "Hatal� onay dizgisi"
 
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr "%(name)s listesine �yelikler moderat�r onay� gerektirir"
 
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "Hatal� onay dizgisi"
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "Onay tan�mlama bilgisini (cookie) girin"
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr "Bug�n i�in son otomatik yan�t bildirimi"
 
@@ -9057,15 +9061,15 @@ msgstr ""
 msgid "Original message suppressed by Mailman site configuration\n"
 msgstr ""
 
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr "Mailman ile g�nderildi<br>s�r�m %(version)s"
 
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr "Python ile G��lendirilmi�"
 
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr "Gnu Unix De�ildir"
 
@@ -10045,7 +10049,7 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
diff --git a/messages/uk/LC_MESSAGES/mailman.po b/messages/uk/LC_MESSAGES/mailman.po
index 0546887b..f96f51e2 100644
--- a/messages/uk/LC_MESSAGES/mailman.po
+++ b/messages/uk/LC_MESSAGES/mailman.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mailman v2.1.5\n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: 2005-02-24 17:37+0200\n"
 "Last-Translator: Maxim Dzumanenko <mvd@mylinux.com.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -206,7 +206,7 @@ msgstr "за вашою вказівкою"
 msgid "by the list administrator"
 msgstr "за вказівкою керівника списку"
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "з невідомої причини"
 
@@ -222,23 +222,23 @@ msgstr "заблоковано"
 msgid "Bounce action notification"
 msgstr "Повідомлення про помилку доставки"
 
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "заблоковано"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr " Останнє повідомлення про помилку доставки до вас датовано %(date)s"
 
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
 msgid "(no subject)"
 msgstr "(тема відсутня)"
 
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr "[Додаткова інформація про помилку відсутня]"
 
@@ -252,7 +252,7 @@ msgstr "адміністратор"
 
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -260,7 +260,7 @@ msgstr "Список розсилки <em>%(safelistname)s</em> не існує"
 
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -270,8 +270,8 @@ msgstr "Помилка"
 
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -283,7 +283,7 @@ msgid "Authorization failed."
 msgstr "Помилка доступу."
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr ""
 
@@ -301,7 +301,7 @@ msgstr ""
 "                випадку список буде неможливо використовувати."
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "Попередження: "
 
@@ -459,7 +459,7 @@ msgstr "Перейти до обробки завдань керівника"
 msgid "Go to the general list information page"
 msgstr "Перейти на сторінку з інформацією про список"
 
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 msgid "Edit the public HTML pages and text files"
 msgstr "Редагувати публічні HTML сторінки та текстові файли"
 
@@ -552,7 +552,7 @@ msgstr "Назва теми:"
 msgid "Regexp:"
 msgstr "Регулярний вираз:"
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "Опис:"
 
@@ -712,7 +712,7 @@ msgid "nodupes"
 msgstr "без копій"
 
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr "збірки"
 
@@ -744,7 +744,7 @@ msgstr "П"
 msgid "notmetoo"
 msgstr "без власних"
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr "блоковано"
 
@@ -1067,151 +1067,151 @@ msgstr "Підтвердьте пароль керівника:"
 msgid "Submit Your Changes"
 msgstr "Внести зміни"
 
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr "Введені паролі керівника не співпадають"
 
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 #, fuzzy
 msgid "Poster passwords did not match"
 msgstr "Ваші паролі не співпадають."
 
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 msgid "Administrator passwords did not match"
 msgstr "Введені паролі адміністратора не співпадають"
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "Вже є учасником"
 
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr "&lt;порожній рядок&gt;"
 
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "Неправильна поштова адреса"
 
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr "Помилкова адреса (недопустимі символи)"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "Успішно запрошено:"
 
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "Успішно підписано:"
 
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "Помилка при спробі запрошення до підписки:"
 
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "Помилка при спробі підписки:"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "Успішно видалено підписку:"
 
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr "Не вдалось видалити підписку з адрес, які не підписані:"
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 #, fuzzy
 msgid "You must provide both current and new addresses."
 msgstr "Спочатку необхідно виправити наведені вище адреси."
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 #, fuzzy
 msgid "%(schange_to)s is already a list member."
 msgstr " вже є учасником"
 
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 #, fuzzy
 msgid "%(schange_to)s is not a valid email address."
 msgstr "Необхідно вказати правильну електронну адресу."
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 #, fuzzy
 msgid "%(schange_to)s is already a member"
 msgstr " вже є учасником"
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 #, fuzzy
 msgid "%(list_name)s address change notice."
 msgstr "%(realname)s сповіщення про припинення підписки"
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 #, fuzzy
 msgid "Notification sent to %(schange_from)s."
 msgstr "Сповіщення"
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 #, fuzzy
 msgid "Notification sent to %(schange_to)s."
 msgstr "Сповіщення"
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr "Неправильне значення ознаки перевірки повідомлень"
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 msgid "member mgt page"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "Не підписаний"
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr "Ігноруються зміни для видаленого учасника: %(user)s"
 
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "Успішно видалено:"
 
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "Помилка видалення підписки:"
 
@@ -1786,8 +1786,8 @@ msgstr ""
 "    <p>Або натисніть <em>Скасувати та видалити запит</em>, щоб відмовитись\n"
 "    від припинення підписки."
 
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "Припинити підписку"
 
@@ -2385,47 +2385,51 @@ msgstr "Надсилати щомісяця нагадування паролю?
 msgid "List name is required."
 msgstr "Вимагається ім'я списку розсилки."
 
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr "%(realname)s - Редагувати HTML сторінки для %(template_info)s"
 
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr "Редагування HTML : Помилка"
 
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr "%(safetemplatename)s: Неправильний шаблон"
 
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr "%(realname)s - Редагування HTML"
 
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr "Виберіть сторінку для редагування:"
 
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "Переглянути або відредагувати налаштовування списку розсилки."
 
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "Якщо ви завершили внесення змін..."
 
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "Підтвердити зміни"
 
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr "Не можна використовувати порожню HTML сторінку."
 
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr "HTML не змінився."
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2434,20 +2438,20 @@ msgid ""
 "             "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 #, fuzzy
 msgid "Page Unchanged."
 msgstr "HTML не змінився."
 
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr "HTML успішно оновлено."
 
@@ -2510,7 +2514,7 @@ msgstr ""
 msgid "Edit Options"
 msgstr "Редагувати параметри"
 
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "Мова перегляду (view this page in):"
@@ -2519,34 +2523,34 @@ msgstr "Мова перегляду (view this page in):"
 msgid "This form requires JavaScript."
 msgstr ""
 
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "Помилка виконання CGI-програми"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "Відсутня адреса"
 
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "Неправильна адреса: %(safeuser)s"
 
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr "Такий користувач відсутній: %(safeuser)s."
 
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 #, fuzzy
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr "Лист підтвердження відіслано."
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 #, fuzzy
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
@@ -2555,37 +2559,37 @@ msgstr ""
 "Ваш запит на припинення підписки\n"
 "                    пересланий керівнику списку для обробки."
 
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 #, fuzzy
 msgid ""
 "If you are a list member,\n"
 "            your password has been emailed to you."
 msgstr "Лист з нагадуванням паролю успішно вам відіслано."
 
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "Помилка аутентифікації."
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr "Лист з нагадуванням паролю успішно вам відіслано."
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
 msgstr ""
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr ""
 
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr "Перелік отримувачів %(safeuser)s на %(hostname)s"
 
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
@@ -2593,22 +2597,22 @@ msgstr ""
 "Щоб перейти до налаштовування вашої підписки на список,\n"
 "        натисніть на посиланні."
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
 "            subscription for this mailing list has been changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "Адреси не співпадають!"
 
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr "Ви вже використовуєте цю адресу"
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 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 "
@@ -2621,31 +2625,31 @@ msgstr ""
 "адресу %(safeuser)s буде замінено у будь-яких інших списках розсилки,\n"
 "в яких вона зустрічається."
 
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "Ця адреса вже використовується користувачем: %(newaddr)s"
 
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "Поле адреси не може бути порожнім"
 
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr "Лист підтвердження відіслано до %(newaddr)s."
 
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "Неправильна електронна адреса"
 
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "Недопустима електронна адреса"
 
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s вже є користувачем цього списку розсилки."
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 #, fuzzy
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
@@ -2656,11 +2660,11 @@ msgstr ""
 "розсилки. Якщо ви вважаєте, що це обмеження помилкове,\n"
 "зверніться до власника списку за адресою %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr "Ім'я користувача успішно змінено."
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 #, fuzzy
 msgid ""
 "The list administrator may not change the\n"
@@ -2670,15 +2674,15 @@ msgstr ""
 "          списку розсилки, і зміни у параметри доставки не внесено.\n"
 "          Усі інші зміни у параметри успішно внесено."
 
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "Поле паролю не може бути порожнім"
 
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "Поля паролів не співпадають!"
 
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 #, fuzzy
 msgid ""
 "The list administrator may not change the\n"
@@ -2689,12 +2693,12 @@ msgstr ""
 "          списку розсилки, і зміни у параметри доставки не внесено.\n"
 "          Усі інші зміни у параметри успішно внесено."
 
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "Пароль успішно змінено."
 
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
@@ -2704,16 +2708,16 @@ msgstr ""
 "                ознаку під кнопкою <em>Припинити підписку</em>. У іншому\n"
 "                випадку її не буде припинено!"
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 #, fuzzy
 msgid "via the member options page"
 msgstr "Список %(realname)s: реєстраційна сторінка параметрів учасника"
 
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "Результати припинення підписки"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -2725,7 +2729,7 @@ msgstr ""
 "            прийняття рішення керівником списку розсилки, ви отримаєте\n"
 "            повідомлення."
 
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -2740,7 +2744,7 @@ msgstr ""
 "            зверніться до власника списку розсилки\n"
 "            %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -2748,7 +2752,7 @@ msgid ""
 "                changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -2759,7 +2763,7 @@ msgstr ""
 "           цього списку, тому зміни у параметри доставки не внесено.\n"
 "           Усі інші зміни у параметри успішно внесено."
 
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -2770,63 +2774,63 @@ msgstr ""
 "          списку розсилки, і зміни у параметри доставки не внесено.\n"
 "          Усі інші зміни у параметри успішно внесено."
 
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "Параметри успішно збережено."
 
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "Ви можете отримати ще одну, останню, збірку."
 
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>Так, я дійсно бажаю відмовитись від підписки<em>"
 
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "Змінити пароль"
 
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "Перелік інших списків, на які я підписаний"
 
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "Надіслати мені мій пароль"
 
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "пароль"
 
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "Завершити роботу"
 
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "Внести зміни"
 
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "днів"
 
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "день"
 
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr "%(days)d %(units)s"
 
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "Змінити мою адресу та ім'я"
 
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "<em>Теми не визначені</em>"
 
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
@@ -2836,19 +2840,19 @@ msgstr ""
 "Адреса (із збереженням регістру) за якою ви підписні на цей список\n"
 "<em>%(cpuser)s</em>."
 
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "Список %(realname)s: реєстраційна сторінка параметрів учасника"
 
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "електронну адресу та "
 
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr "Список %(realname)s: сторінка параметрів учасника %(safeuser)s"
 
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -2876,19 +2880,19 @@ msgstr ""
 "    дозволити cookies, у іншому випадку жодні зміни не буде внесено.\n"
 "    "
 
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "Електронна адреса:"
 
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "Пароль:"
 
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "Увійти"
 
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -2902,11 +2906,11 @@ msgstr ""
 "    (також можливо підтвердити поштою; інструкції дивіться у повідомленні\n"
 "    з підтвердженням)."
 
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "Нагадування паролю"
 
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
@@ -2914,27 +2918,27 @@ msgstr ""
 "Ваш пароль буде надіслано ваш після натиснення\n"
 "    на кнопку <em>Нагадати</em>."
 
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "Нагадати"
 
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr "<відсутня>"
 
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "Запитана тема не є правильною: %(topicname)s"
 
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "Подробиці фільтру тем"
 
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "Назва:"
 
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr "Шаблон (регулярний вираз):"
 
@@ -6799,7 +6803,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -6834,7 +6838,7 @@ msgstr ""
 "\n"
 "            <p>Нижче у текстових полях, додайте, по одній в рядку, адреси.\n"
 "            Якщо рядок починається з символу ^ - це означає <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >регулярний вираз мови Python</a>.  Якщо ви вводите зворотній\n"
 "            слеш, робіть це так, як у символьних рядках Python (тобто\n"
 "            просто використовуйте один символ зворотного слешу).\n"
@@ -7594,7 +7598,7 @@ msgstr "Чи потрібно вмикати фільтр тем?"
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -7617,7 +7621,7 @@ msgid ""
 "             configuration variable."
 msgstr ""
 "Фільтр тем виділяє категорії повідомлень відповідно до наведених нижче\n"
-"   <a href=\"http://docs.python.org/library/re.html\">фільтрів\n"
+"   <a href=\"https://docs.python.org/2/library/re.html\">фільтрів\n"
 "             регулярних виразів</a>.  Якщо заголовки повідомлення \n"
 "             <code>Subject:</code> чи <code>Keywords:</code> відповідають\n"
 "             фільтру тем, повідомлення логічно розміщуються у\n"
@@ -8189,7 +8193,7 @@ msgstr "Відвідати перелік учасників"
 msgid "Once a month, your password will be emailed to you as a reminder."
 msgstr "Щомісяця, ваш пароль надсилатиметься вам з нагадуванням."
 
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 msgid "The current archive"
 msgstr "Поточний архів"
 
@@ -8561,7 +8565,7 @@ msgstr "Кінець "
 msgid "Posting of your message titled \"%(subject)s\""
 msgstr "Надсилання вашого повідомлення з темою \"%(subject)s\""
 
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "[Причину не вказано]"
 
@@ -8573,28 +8577,28 @@ msgstr "Переправлене переглянуте повідомлення
 msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr "Новий запит на підписку на список %(realname)s від %(addr)s"
 
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "Запит на підписку"
 
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "Продовжувати очікувати підтвердження"
 
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr "Запит на видалення підписки на %(realname)s від %(addr)s"
 
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr "Запит на видалення підписки"
 
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr "Оригінальне повідомлення"
 
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr "Запит на список розсилки %(realname)s відкинуто"
 
@@ -8708,56 +8712,56 @@ msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr ""
 "Для виключення зі списку розсилки %(listname)s потрібне ваше підтвердження"
 
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr " з %(remote)s"
 
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr "підписка на %(realname)s вимагає схвалення керівником"
 
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "%(realname)s сповіщення про підписку"
 
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr "видалення підписки вимагає схвалення керівником"
 
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr "%(realname)s сповіщення про припинення підписки"
 
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 #, fuzzy
 msgid "%(realname)s address change notification"
 msgstr "%(realname)s сповіщення про припинення підписки"
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "Неправильний рядок підтвердження"
 
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "Неправильний рядок підтвердження"
 
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr "підписка на %(name)s вимагає схвалення керівником"
 
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "Неправильний рядок підтвердження"
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "Вкажіть код підтвердження"
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr "Автоматична відповідь сповіщення на сьогодні"
 
@@ -8850,15 +8854,15 @@ msgstr ""
 msgid "Original message suppressed by Mailman site configuration\n"
 msgstr ""
 
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr "Доставлено Mailman<br>версії %(version)s"
 
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr "Працює під керуванням Python"
 
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr "Gnu's Not Unix"
 
@@ -10215,7 +10219,7 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
@@ -10254,7 +10258,7 @@ msgstr ""
 "Синтаксис регулярних виразів схожий на Perl5, використовується модуль re\n"
 "мови Python.  Повна специфікація на:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Пошук ведеться без урахування регістру літер, але адреси виводяться із\n"
 "збереженням регістру.\n"
diff --git a/messages/vi/LC_MESSAGES/mailman.po b/messages/vi/LC_MESSAGES/mailman.po
index aa589b53..5a1f7eee 100644
--- a/messages/vi/LC_MESSAGES/mailman.po
+++ b/messages/vi/LC_MESSAGES/mailman.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mailman-2.1.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: 2008-01-03 22:05+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -208,7 +208,7 @@ msgstr "do mình"
 msgid "by the list administrator"
 msgstr "do quản trị hộp thư chung"
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "vì lý do không rõ"
 
@@ -224,23 +224,23 @@ msgstr "bị tắt"
 msgid "Bounce action notification"
 msgstr "Thông báo hành động nảy về"
 
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "bị tắt"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr " Thư đã nảy về được nhận từ bạn có ngày %(date)s"
 
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
 msgid "(no subject)"
 msgstr "(không có chủ đề)"
 
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr "[Không có chi tiết nảy về]"
 
@@ -254,7 +254,7 @@ msgstr "Quản trị"
 
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -262,7 +262,7 @@ msgstr "Không có hộp thư chung <em>%(safelistname)s</em> như vậy."
 
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -272,8 +272,8 @@ msgstr "Lỗi"
 
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -285,7 +285,7 @@ msgid "Authorization failed."
 msgstr "Việc cho quyền bị lỗi."
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr ""
 
@@ -303,7 +303,7 @@ msgstr ""
 "\tnếu không thì hộp thư chung này là vô ích cho bạn."
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "Cảnh báo : "
 
@@ -463,7 +463,7 @@ msgstr "Quản lý các yêu cầu điều tiết bị hoãn"
 msgid "Go to the general list information page"
 msgstr "Tới trang thông tin hộp thư chung chính"
 
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 msgid "Edit the public HTML pages and text files"
 msgstr "Hiệu chỉnh những trang HTML công và tập tin văn bản"
 
@@ -556,7 +556,7 @@ msgstr "Tên chủ đề:"
 msgid "Regexp:"
 msgstr "Biểu thức c.q.:"
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "Mô tả:"
 
@@ -716,7 +716,7 @@ msgid "nodupes"
 msgstr "k0 bản<br>sao"
 
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr "bó thư"
 
@@ -748,7 +748,7 @@ msgstr "B"
 msgid "notmetoo"
 msgstr "k0 mình"
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr "k0 thư"
 
@@ -1075,152 +1075,152 @@ msgstr "Xác nhận mật khẩu điều tiết mới:"
 msgid "Submit Your Changes"
 msgstr "Ghi nhận thay đổi"
 
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr "Hai mật khẩu điều tiết không trùng nhau."
 
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 #, fuzzy
 msgid "Poster passwords did not match"
 msgstr "Hai mật khẩu không trùng nhau."
 
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 msgid "Administrator passwords did not match"
 msgstr "Hai mật khẩu quản trị không trùng nhau."
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "Đã thành viên"
 
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr "&lt;dòng trống&gt;"
 
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "Địa chỉ thư điện tử không hợp lệ"
 
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr "Địa chỉ đối nghịch (có ký tự cấm)"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr "Địa chỉ cấm (khớp mẫu %(pattern)s)"
 
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "Đã mời được:"
 
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "Đã đăng ký được:"
 
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "Lỗi mời:"
 
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "Lỗi đăng ký:"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "Đã bỏ đăng ký được:"
 
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr "Không thể bỏ đăng ký người không thành viên:"
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 #, fuzzy
 msgid "You must provide both current and new addresses."
 msgstr "Đầu tiên bạn phải sửa những địa chỉ không hợp lệ đi trước."
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 #, fuzzy
 msgid "%(schange_to)s is already a list member."
 msgstr " đã thành viên"
 
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 #, fuzzy
 msgid "%(schange_to)s is not a valid email address."
 msgstr "Bạn phải cung cấp một địa chỉ thư điện tử hợp lệ."
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 #, fuzzy
 msgid "%(schange_to)s is already a member"
 msgstr " đã thành viên"
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 #, fuzzy
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr "%(addr)s bị cấm (khớp: %(patt)s)"
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 #, fuzzy
 msgid "%(list_name)s address change notice."
 msgstr "thông báo bỏ đăng ký với hộp thư chung %(realname)s"
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 #, fuzzy
 msgid "Notification sent to %(schange_from)s."
 msgstr "Thông báo"
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 #, fuzzy
 msgid "Notification sent to %(schange_to)s."
 msgstr "Thông báo"
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr "Giá trị cờ điều tiết sai"
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 msgid "member mgt page"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "Chưa đăng ký"
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr "Đang bỏ qua thay đổi về thành viên bị xoá bỏ: %(user)s"
 
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "Đã gỡ bỏ được:"
 
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "Lỗi bỏ đăng ký:"
 
@@ -1782,8 +1782,8 @@ msgstr ""
 "\n"
 "Hoặc bấm <em>Thôi và hủy</em> để thôi yêu cầu bỏ đăng ký này."
 
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "Bỏ đăng ký"
 
@@ -2380,47 +2380,51 @@ msgstr "Gởi lời nhắc nhở mật khẩu hàng tháng không?"
 msgid "List name is required."
 msgstr "Cần thiết tên hộp thư."
 
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr "%(realname)s &mdash; Hiệu chỉnh mã HTML cho %(template_info)s"
 
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr "Sửa HTML: lỗi"
 
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr "%(safetemplatename)s: biểu mẫu không hợp lệ"
 
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr "%(realname)s &mdash; sửa đổi trang HTML"
 
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr "Chọn trang cần sửa:"
 
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "Xem hay sửa đổi thông tin cấu hình hộp thư."
 
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "Khi bạn đã thay đổi xong..."
 
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "Ghi nhận thay đổi"
 
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr "Không cho phép có trang HTML rỗng."
 
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr "Chưa thay đổi mã HTML."
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2435,19 +2439,19 @@ msgstr ""
 "bạn phải có khả năng truy cập qua trình bao\n"
 "đến máy phục vụ Mailman của bạn."
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr "Xem"
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr "Hỏi Đáp 4.48"
 
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 msgid "Page Unchanged."
 msgstr "Trang chưa thay đổi."
 
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr "Mã HTML đã được cập nhật."
 
@@ -2510,7 +2514,7 @@ msgstr ""
 msgid "Edit Options"
 msgstr "Tùy chọn hiệu chỉnh"
 
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "Xem trang này bằng"
@@ -2519,34 +2523,34 @@ msgstr "Xem trang này bằng"
 msgid "This form requires JavaScript."
 msgstr ""
 
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "Lỗi tập lệnh CGI"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "Chưa nhập địa chỉ"
 
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "Không cho phép địa chỉ : %(safeuser)s"
 
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr "Không có thành viên như vậy: %(safeuser)s."
 
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 #, fuzzy
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr "Thư xác nhận đã được gởi."
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 #, fuzzy
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
@@ -2555,22 +2559,22 @@ msgstr ""
 "Yêu cầu bỏ đăng ký của bạn đã được chuyển tiếp\n"
 "\ttới quản trị hộp thư để tán thành."
 
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 #, fuzzy
 msgid ""
 "If you are a list member,\n"
 "            your password has been emailed to you."
 msgstr "Lời nhắc nhở mật khẩu đã được gởi cho bạn trong thư."
 
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "Xác thực thất bại."
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr "Lời nhắc nhở mật khẩu đã được gởi cho bạn trong thư."
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
@@ -2578,16 +2582,16 @@ msgstr ""
 "Quản trị hộp thư có lẽ sẽ không xem\n"
 "\tnhững sự đăng ký khác cho người dùng này."
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr "Ghi chú : "
 
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr "Các sự đăng ký hộp thư cho %(safeuser)s trên máy %(hostname)s"
 
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
@@ -2595,7 +2599,7 @@ msgstr ""
 "Nhắp vào liên kết nào để thăm trang tùy chọn\n"
 "\tcho hộp thư đó."
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
@@ -2605,15 +2609,15 @@ msgstr ""
 "\tcho các sự đăng ký khác của người dùng này.\n"
 "\tTuy nhiên, tư cách đăng ký cho hộp thư này đã được thay đổi."
 
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "• Các địa chỉ không khớp. •"
 
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr "Bạn đang sử dụng địa chỉ thư đó."
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 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 "
@@ -2626,31 +2630,31 @@ msgstr ""
 "\ttoàn cục địa chỉ thư. Một khi bạn xác nhận, hộp thư khác nào\n"
 "\tchứa địa chỉ thư %(safeuser)s sẽ cũng được thay đổi."
 
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "Địa chỉ mới đã đăng ký trước: %(newaddr)s"
 
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "Không cho phép địa chỉ rỗng"
 
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr "Thư xác nhận đã được gởi cho %(newaddr)s. "
 
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "Bạn đã nhập một địa chỉ thư sai."
 
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "Bạn đã nhập một địa chỉ không được phép."
 
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s đã đăng ký trước này với hộp thư này."
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
 "                      think this restriction is erroneous, please contact\n"
@@ -2659,11 +2663,11 @@ msgstr ""
 "%(newaddr)s bị cấm ra hộp thư này.\tNếu bạn xem là hạn chế này không đúng,\n"
 "\tvui lòng liên lạc với quản trị hộp thư tại %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr "Tên thành viên đã được thay đổi. "
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 #, fuzzy
 msgid ""
 "The list administrator may not change the\n"
@@ -2672,15 +2676,15 @@ msgstr ""
 "Quản trị hộp thư có lẽ sẽ không xem\n"
 "\tnhững sự đăng ký khác cho người dùng này."
 
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "Không cho phép mật khẩu rỗng."
 
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "Mật khẩu không khớp."
 
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 msgid ""
 "The list administrator may not change the\n"
 "            password for this user's other subscriptions.  However, the\n"
@@ -2690,12 +2694,12 @@ msgstr ""
 "\tcho các sự đăng ký khác của người dùng này.\n"
 "\tTuy nhiên, mật khẩu cho hộp thư này đã được thay đổi."
 
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "Mật khẩu đã được thay đổi."
 
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
@@ -2705,16 +2709,16 @@ msgstr ""
 "\ttrong hộp chọn bên dưới nút <em>Bỏ đang ký</em>.\n"
 "\t• Bạn chưa được bỏ đăng ký. •"
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 #, fuzzy
 msgid "via the member options page"
 msgstr "Hộp thư chung %(realname)s: trang đăng nhập tùy chọn thành viên"
 
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "Kết quả bỏ đăng ký"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -2725,7 +2729,7 @@ msgstr ""
 "\ttới những điều tiết viên của hộp thư để tán thành.\n"
 "\tBạn sẽ nhận thông báo về cách quyết định."
 
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -2739,7 +2743,7 @@ msgstr ""
 "\tMỗi câu hỏi về cách bỏ đăng ký, vui lòng liên lạc với\n"
 "\tquản trị hộp thư tại %(owneraddr)s."
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -2750,7 +2754,7 @@ msgstr ""
 "\tcho các sự đăng ký khác của người dùng này.\n"
 "\tTuy nhiên, các tùy chọn cho hộp thư này đã được thay đổi."
 
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -2761,7 +2765,7 @@ msgstr ""
 "\tnên không thể đặt tùy chọn phát đó của bạn.\n"
 "\tTuy nhiên, các tùy chọn khác của bạn đã được đặt."
 
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -2772,64 +2776,64 @@ msgstr ""
 "\tnên không thể đặt tùy chọn phát đó của bạn.\n"
 "\tTuy nhiên, các tùy chọn khác của bạn đã được đặt."
 
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "Bạn đã đặt các tùy chọn mình."
 
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "Có lẽ bạn sẽ nhận một bó thư nữa."
 
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>Có phải, tôi thật muốn bỏ đăng ký</em>"
 
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "Đổi mật khẩu mình"
 
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "Liệt kê các sự đăng ký khác của tôi"
 
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "Gởi thư chứa mật khẩu mình cho tôi"
 
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "mật khẩu"
 
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "Đăng xuất"
 
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "Ghi nhận thay đổi"
 
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "ngày"
 
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "ngày"
 
 # Variable: don't translate / Biến: đừng dịch
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr "%(days)d %(units)s"
 
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "Đổi địa chỉ và tên mình"
 
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "<em>Chưa ghi rõ chủ đề</em>"
 
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
@@ -2839,21 +2843,21 @@ msgstr ""
 "Bạn đã được đăng ký với hộp thư chung này với địa chỉ\n"
 "\tđã bảo tồn chữ hoa/thường <em>%(cpuser)s</em>."
 
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "Hộp thư chung %(realname)s: trang đăng nhập tùy chọn thành viên"
 
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "địa chỉ thư và "
 
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr ""
 "Hộp thư chung %(realname)s: các tùy chọn thành viên cho người dùng "
 "%(safeuser)s"
 
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -2883,19 +2887,19 @@ msgstr ""
 "\ttrong bộ duyệt Web mình; nếu không thì không có thay đổi của bạn sẽ có tác "
 "động."
 
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "Địa chỉ thư :"
 
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "Mật khẩu :"
 
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "Đăng nhập"
 
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -2908,11 +2912,11 @@ msgstr ""
 "\tHoặc bạn có thể xác nhận bằng thư điện tử :\n"
 "\txem những hướng dẫn trong thư xác nhận đó."
 
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "Nhắc nhở mật khẩu"
 
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
@@ -2920,27 +2924,27 @@ msgstr ""
 "Sau khi bạn nhắp vào nút <em>Nhắc nhở</em>,\n"
 "\tbận sẽ nhận mật khẩu mình trong thư."
 
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "Nhắc nhở"
 
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr "<còn thiếu>"
 
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "Bạn đã yêu cầu một chủ đề không hợp lệ: %(topicname)s"
 
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "Chi tiết về bộ lọc chủ đề"
 
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "Tên:"
 
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr "Mẫu (biểu thức c.q.):"
 
@@ -6836,7 +6840,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -6870,7 +6874,7 @@ msgstr ""
 "\n"
 "            <p>Trong những trường bên dưới, hãy thêm\n"
 "một địa chỉ thư trên mỗi dòng; bắt đầu dòng với dấu mũ ^\n"
-"để ngụ ý cần thiết khớp với <a href=\"http://docs.python.org/library/re.html"
+"để ngụ ý cần thiết khớp với <a href=\"https://docs.python.org/2/library/re.html"
 "\">biểu thức chính quy Python</a>.\n"
 "Khi gõ sổ chéo ngược, hãy dùng chỉ một sổ chéo ngược đơn,\n"
 "như là dùng chuỗi thô Python.\n"
@@ -7641,7 +7645,7 @@ msgstr "Bộ lọc chủ đề nên được bật hoặc tắt?"
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -7664,7 +7668,7 @@ msgid ""
 "             configuration variable."
 msgstr ""
 "Bộ lọc chủ đề phân loại mỗi thư mới đến tùy theo những\n"
-"<a href=\"http://docs.python.org/library/re.html\">bộ lọc biểu thức chính "
+"<a href=\"https://docs.python.org/2/library/re.html\">bộ lọc biểu thức chính "
 "quy</a> bạn ghi rõ bên dưới.\n"
 "Nếu dòng đầu <code>Subject:</code> (Chủ đề) hoặc <code>Keywords:</code>\n"
 "(Từ khoá) chứa điều khớp bộ lọc chủ đề nào, thư được lọc hợp lý vào một\n"
@@ -8239,7 +8243,7 @@ msgstr "Xem danh sách người đăng ký"
 msgid "Once a month, your password will be emailed to you as a reminder."
 msgstr "Hàng tháng, bạn sẽ nhận một thư chứa mật khẩu mình là lời nhắc nhở."
 
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 msgid "The current archive"
 msgstr "Kho hiện thời"
 
@@ -8612,7 +8616,7 @@ msgstr "Kết thúc của "
 msgid "Posting of your message titled \"%(subject)s\""
 msgstr "Việc gởi thư của bạn có chủ đề « %(subject)s »"
 
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "[Chưa ghi lý do]"
 
@@ -8624,28 +8628,28 @@ msgstr "Việc chuyển tiếp thư đã điều tiết"
 msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr "Yêu cầu đăng ký mới với hộp thư %(realname)s từ %(addr)s"
 
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "Yêu cầu đang ký"
 
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "Tiếp tục đợi tán thành"
 
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr "Yêu cầu bỏ đăng ký mới với hộp thư %(realname)s từ %(addr)s"
 
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr "Yêu cầu bỏ đang ký"
 
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr "Thư gốc"
 
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr "Yêu cầu cho hộp thư chung %(realname)s bị từ chối"
 
@@ -8758,60 +8762,60 @@ msgstr "Cần thiết bạn xác nhận để tham gia hộp thư chung %(listna
 msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr "Cần thiết bạn xác nhận để rời đi ra hộp thư chung %(listname)s"
 
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr " từ %(remote)s"
 
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr ""
 "các việc đăng ký với hộp thư chung %(realname)s cần thiết điều tiết viên tán "
 "thành"
 
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "thông báo đăng ký với hộp thư chung %(realname)s"
 
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr "các việc bỏ đăng ký cần thiết điều tiết viên tán thành"
 
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr "thông báo bỏ đăng ký với hộp thư chung %(realname)s"
 
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 #, fuzzy
 msgid "%(realname)s address change notification"
 msgstr "thông báo bỏ đăng ký với hộp thư chung %(realname)s"
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "Chuỗi xác nhận sai"
 
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "Chuỗi xác nhận sai"
 
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr ""
 "các việc đăng ký với hộp thư chung %(name)s cần thiết điều tiết viên tán "
 "thành"
 
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "Chuỗi xác nhận sai"
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "Nhập cookie xác nhận"
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr "Thông báo đáp ứng tự động cuối cùng của hôm nay"
 
@@ -8902,15 +8906,15 @@ msgstr ""
 msgid "Original message suppressed by Mailman site configuration\n"
 msgstr ""
 
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr "Phát do trình Mailman<br>phiên bản %(version)s"
 
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr "Chạy bằng Python"
 
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr "GNU không phải là UNIX"
 
@@ -10287,7 +10291,7 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
@@ -10328,7 +10332,7 @@ msgstr ""
 "Python.\n"
 "Có đặc tả hoàn toàn tại :\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Việc khớp địa chỉ không phân biệt chữ hoa/thường, còn địa chỉ có\n"
 "chữ hoa/thường đã bảo tồn có phải được hiển thị.\n"
diff --git a/messages/zh_CN/LC_MESSAGES/mailman.po b/messages/zh_CN/LC_MESSAGES/mailman.po
index e8ee201a..5d5ab483 100644
--- a/messages/zh_CN/LC_MESSAGES/mailman.po
+++ b/messages/zh_CN/LC_MESSAGES/mailman.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mailman\n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: 2005-05-14 12:07+0800\n"
 "Last-Translator: Dai Xiaoguang <leona@cs.hit.edu.cn>\n"
 "Language-Team:  <mailman-cn@mail.cs.hit.edu.cn>\n"
@@ -201,7 +201,7 @@ msgstr "(由)您自己"
 msgid "by the list administrator"
 msgstr "(由)列表管理员"
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "因为未知原因"
 
@@ -217,23 +217,23 @@ msgstr "禁止"
 msgid "Bounce action notification"
 msgstr "退信行为通告"
 
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "禁止"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr "您最后的退信日期为 %(date)s"
 
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
 msgid "(no subject)"
 msgstr "(无主题)"
 
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr "[无退信的细节信息]"
 
@@ -247,7 +247,7 @@ msgstr "管理员"
 
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -255,7 +255,7 @@ msgstr "没有类似的列表 <em>%(safelistname)s</em>"
 
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -265,8 +265,8 @@ msgstr "错误"
 
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -278,7 +278,7 @@ msgid "Authorization failed."
 msgstr "认证失败"
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr ""
 
@@ -295,7 +295,7 @@ msgstr ""
 "不然你的邮件列表基本是无法使用的。"
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "警告:"
 
@@ -449,7 +449,7 @@ msgstr "处理待裁决请求"
 msgid "Go to the general list information page"
 msgstr "前往列表常规信息页"
 
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 msgid "Edit the public HTML pages and text files"
 msgstr "编辑公开的HTML页和文本文件"
 
@@ -542,7 +542,7 @@ msgstr "主题名"
 msgid "Regexp:"
 msgstr "正则表达式"
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "描述"
 
@@ -701,7 +701,7 @@ msgid "nodupes"
 msgstr "无副本"
 
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr "摘要"
 
@@ -733,7 +733,7 @@ msgstr "B"
 msgid "notmetoo"
 msgstr "除了我"
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr "没有邮件"
 
@@ -1043,151 +1043,151 @@ msgstr "确认主持者密码:"
 msgid "Submit Your Changes"
 msgstr "提交您的修改"
 
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr "主持者密码不匹配"
 
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 #, fuzzy
 msgid "Poster passwords did not match"
 msgstr "您的口令不匹配。"
 
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 msgid "Administrator passwords did not match"
 msgstr "管理员密码不匹配"
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "已经是成员了"
 
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr "&lt;空行&gt;"
 
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "错误/无效的邮件地址"
 
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr "不合法的地址(含有非法的字符)"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "成功邀请:"
 
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "成功订阅:"
 
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "错误邀请:"
 
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "错误订阅:"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "成功取消订阅:"
 
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr "不能取消非成员的订阅:"
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 #, fuzzy
 msgid "You must provide both current and new addresses."
 msgstr "您必须先修正上述的无效地址."
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 #, fuzzy
 msgid "%(schange_to)s is already a list member."
 msgstr "已经是成员了"
 
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 #, fuzzy
 msgid "%(schange_to)s is not a valid email address."
 msgstr "您必须提供一个有效的电子邮件地址。"
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 #, fuzzy
 msgid "%(schange_to)s is already a member"
 msgstr "已经是成员了"
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 #, fuzzy
 msgid "%(list_name)s address change notice."
 msgstr "%(realname)s 退订通知"
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 #, fuzzy
 msgid "Notification sent to %(schange_from)s."
 msgstr "通告"
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 #, fuzzy
 msgid "Notification sent to %(schange_to)s."
 msgstr "通告"
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr "错误的节制标记变量"
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 msgid "member mgt page"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "没有订阅"
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr "忽略对已删除用户的更改: %(user)s"
 
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "成功删除:"
 
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "错误取消订阅:"
 
@@ -1738,8 +1738,8 @@ msgstr ""
 "\n"
 "    <p>或者点击 <em>取消并且删除</em> 来撤销您的取消订阅请求."
 
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "取消订阅"
 
@@ -2316,47 +2316,51 @@ msgstr "是否每月发送密码提示?"
 msgid "List name is required."
 msgstr "列表名称是必需的."
 
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr "%(realname)s -- 为 %(template_info)s 编辑html "
 
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr "编辑HTML : 错误"
 
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr "%(safetemplatename)s: 无效的模版"
 
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr "%(realname)s -- HTML 页面编辑"
 
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr "选择您要编辑的页面:"
 
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "查看或编辑列表的配置信息."
 
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "当您正要完成更改时..."
 
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "提交更改"
 
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr "不能有空的html页面."
 
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr "HTML 没有改变."
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2365,20 +2369,20 @@ msgid ""
 "             "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 #, fuzzy
 msgid "Page Unchanged."
 msgstr "HTML 没有改变."
 
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr "HTML更新成功."
 
@@ -2436,7 +2440,7 @@ msgstr ""
 msgid "Edit Options"
 msgstr "编辑选项"
 
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "选择本页所用的语言:"
@@ -2445,92 +2449,92 @@ msgstr "选择本页所用的语言:"
 msgid "This form requires JavaScript."
 msgstr ""
 
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "CGI脚本错误"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "没有给出地址"
 
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "非法的邮件地址: %(safeuser)s"
 
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr "不存在 %(safeuser)s 这个成员."
 
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 #, fuzzy
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr "确认邮件已经发送"
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 #, fuzzy
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
 "             forwarded to the list administrator for approval."
 msgstr "您的取消订阅的请求已经转发给列表管理员,等待批准."
 
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 #, fuzzy
 msgid ""
 "If you are a list member,\n"
 "            your password has been emailed to you."
 msgstr "您的密码提示已经发送到您的电子信箱了"
 
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "认证失败"
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr "您的密码提示已经发送到您的电子信箱了"
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
 msgstr ""
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr ""
 
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr "为 %(safeuser)s 列出在 %(hostname)s 上的订阅"
 
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
 msgstr "点击连接以访问您请求的邮件列表的选项页面"
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
 "            subscription for this mailing list has been changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "地址不匹配!"
 
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr "您已经使用了那个邮件地址"
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 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 "
@@ -2542,31 +2546,31 @@ msgstr ""
 "但是您仍然请求对这个地址进行全局的修改.\n"
 "确认后, 其他包含 %(safeuser)s 这个地址的邮件列表将被修改."
 
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "新的地址 %(newaddr)s 已经是成员了"
 
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "地址不能为空"
 
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr "确认信息已经发送到了 %(newaddr)s ."
 
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "提供了错误的邮件地址"
 
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "提供了非法的邮件地址"
 
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s 已经是列表的成员."
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 #, fuzzy
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
@@ -2576,11 +2580,11 @@ msgstr ""
 "您提供的邮件地址被禁止。如果您觉得这些限制是错误的,\n"
 "请联系列表管理员 %(owneraddr)s"
 
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr "成员姓名修改成功"
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 #, fuzzy
 msgid ""
 "The list administrator may not change the\n"
@@ -2589,15 +2593,15 @@ msgstr ""
 "列表管理员已经禁止了此列表的非摘要投递功能,所以您的\n"
 "            投递选项没有被设置,但是您的其他选项都已成功地设置。"
 
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "密码不能为空"
 
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "密码不匹配!"
 
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 #, fuzzy
 msgid ""
 "The list administrator may not change the\n"
@@ -2607,12 +2611,12 @@ msgstr ""
 "列表管理员已经禁止了此列表的非摘要投递功能,所以您的\n"
 "            投递选项没有被设置,但是您的其他选项都已成功地设置。"
 
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "密码修改成功"
 
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
@@ -2621,16 +2625,16 @@ msgstr ""
 "为了确认您取消订阅的请求,您必须选中复选框中 <em>取消订阅</em> \n"
 "                这一项.  您还没有取消订阅!"
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 #, fuzzy
 msgid "via the member options page"
 msgstr "%(realname)s 列表: 成员选项登录页 "
 
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "退订结果"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -2640,7 +2644,7 @@ msgstr ""
 "您的退订请求已被收到并转发给列表管理员以待其核准。\n"
 "            管理员作出决定后您将受到一封邮件通知。"
 
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -2654,7 +2658,7 @@ msgstr ""
 "的\n"
 "            问题,请联系列表管理员: %(owneraddr)s。"
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -2662,7 +2666,7 @@ msgid ""
 "                changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -2672,7 +2676,7 @@ msgstr ""
 "列表管理员已经禁止了此列表的摘要投递功能,所以您的\n"
 "            投递选项没有被设置,但是您的其他选项都已成功地设置。"
 
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -2682,63 +2686,63 @@ msgstr ""
 "列表管理员已经禁止了此列表的非摘要投递功能,所以您的\n"
 "            投递选项没有被设置,但是您的其他选项都已成功地设置。"
 
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "您已经成功设置您的选项。"
 
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "您可能会收到最后一封摘要。"
 
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>是的,我确实想要退订</em>"
 
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "修改我的口令"
 
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "列出我的所有订阅"
 
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "把我的口令邮寄给我"
 
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "口令"
 
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "退出登录"
 
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "提交我的修改"
 
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "天"
 
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "天"
 
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr "%(days)d %(units)s"
 
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "修改我的地址和姓名"
 
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "<em>没有已定义的主题</em>"
 
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
@@ -2748,19 +2752,19 @@ msgstr ""
 "您使用大小写相关的地址订阅了此列表\n"
 "<em>%(cpuser)s</em>."
 
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "%(realname)s 列表: 成员选项登录页 "
 
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "邮件地址和"
 
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr "%(realname)s 列表: 用户 %(safeuser)s 的成员选项信息"
 
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -2788,19 +2792,19 @@ msgstr ""
 "    否则您做的所有修改都将不起作用。\n"
 "    "
 
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "邮件地址:"
 
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "口令:"
 
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "登录"
 
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -2812,37 +2816,37 @@ msgstr ""
 "    您需要点击确认函中的一个链接来完成整个退订过程(您也可以通过邮件来确认,\n"
 "    请参考确认函中的具体信息)。"
 
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "口令提示函"
 
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
 msgstr "通过点击<em>提示</em>按钮,您的口令将被邮寄给您。"
 
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "提示"
 
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr "<丢失>"
 
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "请求的主题不存在: %(topicname)s"
 
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "主题过滤器详情"
 
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "名字:"
 
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr "模式(正则表达式)"
 
@@ -6496,7 +6500,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -6531,7 +6535,7 @@ msgstr ""
 "\n"
 "            <p>下面的文本框中,每行只能添加一个地址。行首的字符 ^ 说明后面的"
 "是\n"
-"            一个<a href=\"http://docs.python.org/library/re.html\"\n"
+"            一个<a href=\"https://docs.python.org/2/library/re.html\"\n"
 "            >Python正则表达式</a>。反斜线请按照Python原始字符串的形式输入(也"
 "就是\n"
 "            说您只需要输入一个反斜线就可以了)。\n"
@@ -7252,7 +7256,7 @@ msgstr "启用主题过滤器吗?"
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -7275,7 +7279,7 @@ msgid ""
 "             configuration variable."
 msgstr ""
 "主题过滤器根据您在下面指定的<a\n"
-"             href=\"http://docs.python.org/library/re.html\">\n"
+"             href=\"https://docs.python.org/2/library/re.html\">\n"
 "             正则表达式</a>来对收到的邮件进行分类。如果某邮件的<code>Subject:"
 "</code>\n"
 "             头或<code>Keywords:</code>头匹配一个主题过滤器,那么此邮件将在逻"
@@ -7819,7 +7823,7 @@ msgstr "访问订阅者列表"
 msgid "Once a month, your password will be emailed to you as a reminder."
 msgstr "你的口令将每月一次以提示函的形式发送给你。"
 
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 msgid "The current archive"
 msgstr "当前归档"
 
@@ -8174,7 +8178,7 @@ msgstr "结束"
 msgid "Posting of your message titled \"%(subject)s\""
 msgstr "您以标题 \"%(subject)s\" 发布的信件"
 
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "[没有给出原因]"
 
@@ -8186,28 +8190,28 @@ msgstr "被暂存信件的转发"
 msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr "来自 %(addr)s 的对 %(realname)s 列表的订阅请求"
 
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "订阅请求"
 
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "继续等待批准"
 
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr "来自 %(addr)s 的对 %(realname)s 列表的退订请求"
 
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr "退订请求"
 
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr "原文"
 
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr "对于 %(realname)s 邮件列表的请求被拒绝"
 
@@ -8314,56 +8318,56 @@ msgstr "您需要对加入 %(listname)s 邮件列表进行确认"
 msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr "您需要对退出 %(listname)s 邮件列表进行确认"
 
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr "来自 %(remote)s"
 
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr "对 %(realname)s 的订阅请求需要列表主持者批准"
 
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 msgid "%(realname)s subscription notification"
 msgstr "%(realname)s 订阅通知"
 
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 msgid "unsubscriptions require moderator approval"
 msgstr "退订需要列表主持人批准"
 
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 msgid "%(realname)s unsubscribe notification"
 msgstr "%(realname)s 退订通知"
 
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 #, fuzzy
 msgid "%(realname)s address change notification"
 msgstr "%(realname)s 退订通知"
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "错误的验证字符串"
 
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "错误的验证字符串"
 
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr "%(name)s 的订阅需要管理员批准"
 
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "错误的验证字符串"
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "输入验证cookie"
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr "本日最后一条自动回复通知"
 
@@ -8453,15 +8457,15 @@ msgstr ""
 msgid "Original message suppressed by Mailman site configuration\n"
 msgstr ""
 
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr "由 Mailman<br> %(version)s 投递"
 
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr "Python Powered"
 
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr "Gnu's Not Unix"
 
@@ -9781,7 +9785,7 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
@@ -9818,7 +9822,7 @@ msgstr ""
 "\n"
 "正则表达式语法类似于Perl5,使用了Python的re模块。完整的定义参见:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "地址匹配是大小写无关的,但是显示的地址将保留原有形式。\n"
 "\n"
diff --git a/messages/zh_TW/LC_MESSAGES/mailman.po b/messages/zh_TW/LC_MESSAGES/mailman.po
index 9190ce31..5f972392 100644
--- a/messages/zh_TW/LC_MESSAGES/mailman.po
+++ b/messages/zh_TW/LC_MESSAGES/mailman.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mailman-2.0\n"
-"POT-Creation-Date: Sun Jun 17 12:22:07 2018\n"
+"POT-Creation-Date: Tue Jul 10 21:21:09 2018\n"
 "PO-Revision-Date: Tue Jan 16 10:00:00 2001\n"
 "Last-Translator: Yuan-Chen Cheng <ycheng@slat.org>\n"
 "Language-Team: Chinese (traditional) <zh-L10n@linux.org.tw>\n"
@@ -207,7 +207,7 @@ msgstr "由您自己"
 msgid "by the list administrator"
 msgstr "由論壇管理人"
 
-#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:296 Mailman/Commands/cmd_set.py:182
+#: Mailman/Bouncer.py:49 Mailman/Bouncer.py:297 Mailman/Commands/cmd_set.py:182
 msgid "for unknown reasons"
 msgstr "不明原因"
 
@@ -223,23 +223,23 @@ msgstr "關閉"
 msgid "Bounce action notification"
 msgstr "退信通知"
 
-#: Mailman/Bouncer.py:270
+#: Mailman/Bouncer.py:271
 #, fuzzy
 msgid "disabled address"
 msgstr "關閉"
 
-#: Mailman/Bouncer.py:303
+#: Mailman/Bouncer.py:304
 msgid " The last bounce received from you was dated %(date)s"
 msgstr "您信箱的前一次退信是在 %(date)s"
 
-#: Mailman/Bouncer.py:332 Mailman/Deliverer.py:146
+#: Mailman/Bouncer.py:333 Mailman/Deliverer.py:146
 #: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
 #: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:250
 #: Mailman/ListAdmin.py:225
 msgid "(no subject)"
 msgstr "(沒有主題)"
 
-#: Mailman/Bouncer.py:336
+#: Mailman/Bouncer.py:337
 msgid "[No bounce details are available]"
 msgstr "[退信細節不詳]"
 
@@ -253,7 +253,7 @@ msgstr "論壇管理人"
 
 #: Mailman/Cgi/admin.py:82 Mailman/Cgi/admindb.py:121 Mailman/Cgi/confirm.py:62
 #: Mailman/Cgi/edithtml.py:86 Mailman/Cgi/listinfo.py:55
-#: Mailman/Cgi/options.py:100 Mailman/Cgi/private.py:108
+#: Mailman/Cgi/options.py:101 Mailman/Cgi/private.py:108
 #: Mailman/Cgi/rmlist.py:75 Mailman/Cgi/roster.py:59
 #: Mailman/Cgi/subscribe.py:67
 msgid "No such list <em>%(safelistname)s</em>"
@@ -261,7 +261,7 @@ msgstr "沒有<em>%(safelistname)s</em>這個論壇"
 
 #: Mailman/Cgi/admin.py:97 Mailman/Cgi/admindb.py:136 Mailman/Cgi/confirm.py:80
 #: Mailman/Cgi/create.py:50 Mailman/Cgi/edithtml.py:103
-#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:119
+#: Mailman/Cgi/listinfo.py:67 Mailman/Cgi/options.py:120
 #: Mailman/Cgi/private.py:125 Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72
 #: Mailman/Cgi/roster.py:153 Mailman/Cgi/roster.py:154
 #: Mailman/Cgi/subscribe.py:55 Mailman/Cgi/subscribe.py:66
@@ -271,8 +271,8 @@ msgstr "錯誤"
 
 #: Mailman/Cgi/admin.py:98 Mailman/Cgi/admindb.py:137 Mailman/Cgi/confirm.py:81
 #: Mailman/Cgi/create.py:51 Mailman/Cgi/edithtml.py:104
-#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:83
-#: Mailman/Cgi/options.py:120 Mailman/Cgi/private.py:126
+#: Mailman/Cgi/listinfo.py:68 Mailman/Cgi/options.py:84
+#: Mailman/Cgi/options.py:121 Mailman/Cgi/private.py:126
 #: Mailman/Cgi/rmlist.py:49 Mailman/Cgi/roster.py:73
 #: Mailman/Cgi/subscribe.py:82
 msgid "Invalid options to CGI script."
@@ -284,7 +284,7 @@ msgid "Authorization failed."
 msgstr "授權失敗"
 
 #: Mailman/Cgi/admin.py:221 Mailman/Cgi/admindb.py:243
-#: Mailman/Cgi/edithtml.py:177 Mailman/Cgi/options.py:329
+#: Mailman/Cgi/edithtml.py:184 Mailman/Cgi/options.py:330
 msgid "The form lifetime has expired. (request forgery check)"
 msgstr ""
 
@@ -300,7 +300,7 @@ msgstr ""
 "您必須自兩者中擇一使用,不然您的通信論壇基本上是無法使用的。"
 
 #: Mailman/Cgi/admin.py:231 Mailman/Cgi/admin.py:239 Mailman/Cgi/admin.py:246
-#: Mailman/Cgi/admin.py:1666 Mailman/Gui/GUIBase.py:209
+#: Mailman/Cgi/admin.py:1667 Mailman/Gui/GUIBase.py:209
 msgid "Warning: "
 msgstr "警告:"
 
@@ -448,7 +448,7 @@ msgstr "處理待裁決的事項"
 msgid "Go to the general list information page"
 msgstr "前往論壇的一般資訊網頁"
 
-#: Mailman/Cgi/admin.py:473
+#: Mailman/Cgi/admin.py:473 Mailman/Cgi/edithtml.py:203
 msgid "Edit the public HTML pages and text files"
 msgstr "編輯公開的 HTML 網頁和文字檔"
 
@@ -535,7 +535,7 @@ msgstr "主題名稱"
 msgid "Regexp:"
 msgstr "正則表示式:"
 
-#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1148
+#: Mailman/Cgi/admin.py:764 Mailman/Cgi/options.py:1149
 msgid "Description:"
 msgstr "說明"
 
@@ -694,7 +694,7 @@ msgid "nodupes"
 msgstr "不要重複信"
 
 #: Mailman/Cgi/admin.py:1042 Mailman/Cgi/admin.py:1108
-#: Mailman/Cgi/options.py:389
+#: Mailman/Cgi/options.py:390
 msgid "digest"
 msgstr "文摘"
 
@@ -726,7 +726,7 @@ msgstr "退信"
 msgid "notmetoo"
 msgstr "不收自己寄的信"
 
-#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:387
+#: Mailman/Cgi/admin.py:1084 Mailman/Cgi/options.py:388
 msgid "nomail"
 msgstr "不收信件"
 
@@ -1026,151 +1026,151 @@ msgstr "確認主持人密碼:"
 msgid "Submit Your Changes"
 msgstr "送出您的變更"
 
-#: Mailman/Cgi/admin.py:1420
+#: Mailman/Cgi/admin.py:1421
 msgid "Moderator passwords did not match"
 msgstr "主持人密碼不一致"
 
-#: Mailman/Cgi/admin.py:1431
+#: Mailman/Cgi/admin.py:1432
 #, fuzzy
 msgid "Poster passwords did not match"
 msgstr "您的密碼不符。"
 
-#: Mailman/Cgi/admin.py:1441
+#: Mailman/Cgi/admin.py:1442
 msgid "Administrator passwords did not match"
 msgstr "管理人密碼不一致"
 
-#: Mailman/Cgi/admin.py:1488
+#: Mailman/Cgi/admin.py:1489
 msgid "admin mass sub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1494
+#: Mailman/Cgi/admin.py:1495
 msgid "Already a member"
 msgstr "已是訂戶"
 
-#: Mailman/Cgi/admin.py:1497
+#: Mailman/Cgi/admin.py:1498
 msgid "&lt;blank line&gt;"
 msgstr "&lt;空白行&gt;"
 
-#: Mailman/Cgi/admin.py:1498 Mailman/Cgi/admin.py:1501
+#: Mailman/Cgi/admin.py:1499 Mailman/Cgi/admin.py:1502
 #: Mailman/Cgi/admindb.py:977
 msgid "Bad/Invalid email address"
 msgstr "不良或不正確的 email 地址"
 
-#: Mailman/Cgi/admin.py:1504
+#: Mailman/Cgi/admin.py:1505
 msgid "Hostile address (illegal characters)"
 msgstr "爛地址(含有不合法字元)"
 
-#: Mailman/Cgi/admin.py:1507 bin/add_members:175 bin/clone_member:136
+#: Mailman/Cgi/admin.py:1508 bin/add_members:175 bin/clone_member:136
 #: bin/sync_members:268
 msgid "Banned address (matched %(pattern)s)"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1513
+#: Mailman/Cgi/admin.py:1514
 msgid "Successfully invited:"
 msgstr "邀請成功:"
 
-#: Mailman/Cgi/admin.py:1515
+#: Mailman/Cgi/admin.py:1516
 msgid "Successfully subscribed:"
 msgstr "訂閱成功:"
 
-#: Mailman/Cgi/admin.py:1520
+#: Mailman/Cgi/admin.py:1521
 msgid "Error inviting:"
 msgstr "邀請失敗:"
 
-#: Mailman/Cgi/admin.py:1522
+#: Mailman/Cgi/admin.py:1523
 msgid "Error subscribing:"
 msgstr "訂閱失敗:"
 
-#: Mailman/Cgi/admin.py:1546
+#: Mailman/Cgi/admin.py:1547
 msgid "admin mass unsub"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1556
+#: Mailman/Cgi/admin.py:1557
 msgid "Successfully Unsubscribed:"
 msgstr "退訂成功:"
 
-#: Mailman/Cgi/admin.py:1561
+#: Mailman/Cgi/admin.py:1562
 msgid "Cannot unsubscribe non-members:"
 msgstr "無法讓非訂戶退訂"
 
-#: Mailman/Cgi/admin.py:1574
+#: Mailman/Cgi/admin.py:1575
 #, fuzzy
 msgid "You must provide both current and new addresses."
 msgstr "您一定要先把前面的錯誤地址修好才行。"
 
-#: Mailman/Cgi/admin.py:1576
+#: Mailman/Cgi/admin.py:1577
 msgid "Current and new addresses must be different."
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1580
+#: Mailman/Cgi/admin.py:1581
 #, fuzzy
 msgid "%(schange_to)s is already a list member."
 msgstr "已經是訂戶"
 
-#: Mailman/Cgi/admin.py:1585
+#: Mailman/Cgi/admin.py:1586
 #, fuzzy
 msgid "%(schange_to)s is not a valid email address."
 msgstr "您必須提供正確的 email 地址。"
 
-#: Mailman/Cgi/admin.py:1593
+#: Mailman/Cgi/admin.py:1594
 msgid "%(schange_from)s is not a member"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1595
+#: Mailman/Cgi/admin.py:1596
 #, fuzzy
 msgid "%(schange_to)s is already a member"
 msgstr "已經是訂戶"
 
-#: Mailman/Cgi/admin.py:1598
+#: Mailman/Cgi/admin.py:1599
 msgid "%(schange_to)s matches banned pattern %(spat)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1600
+#: Mailman/Cgi/admin.py:1601
 msgid "Address %(schange_from)s changed to %(schange_to)s"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1607
+#: Mailman/Cgi/admin.py:1608
 msgid ""
 "The member address %(change_from)s on the\n"
 "%(list_name)s list has been changed to %(change_to)s.\n"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1610
+#: Mailman/Cgi/admin.py:1611
 #, fuzzy
 msgid "%(list_name)s address change notice."
 msgstr "%s 退訂通知"
 
-#: Mailman/Cgi/admin.py:1621
+#: Mailman/Cgi/admin.py:1622
 #, fuzzy
 msgid "Notification sent to %(schange_from)s."
 msgstr "通知"
 
-#: Mailman/Cgi/admin.py:1631
+#: Mailman/Cgi/admin.py:1632
 #, fuzzy
 msgid "Notification sent to %(schange_to)s."
 msgstr "通知"
 
-#: Mailman/Cgi/admin.py:1637
+#: Mailman/Cgi/admin.py:1638
 msgid "Bad moderation flag value"
 msgstr "錯誤的裁決設定值"
 
-#: Mailman/Cgi/admin.py:1657
+#: Mailman/Cgi/admin.py:1658
 msgid "member mgt page"
 msgstr ""
 
-#: Mailman/Cgi/admin.py:1662
+#: Mailman/Cgi/admin.py:1663
 msgid "Not subscribed"
 msgstr "不是訂戶"
 
-#: Mailman/Cgi/admin.py:1665
+#: Mailman/Cgi/admin.py:1666
 msgid "Ignoring changes to deleted member: %(user)s"
 msgstr "忽略對已除名訂戶 %(user)s 的設定"
 
-#: Mailman/Cgi/admin.py:1705
+#: Mailman/Cgi/admin.py:1706
 msgid "Successfully Removed:"
 msgstr "成功除名:"
 
-#: Mailman/Cgi/admin.py:1709
+#: Mailman/Cgi/admin.py:1710
 msgid "Error Unsubscribing:"
 msgstr "退訂時出錯:"
 
@@ -1707,8 +1707,8 @@ msgstr ""
 "\n"
 " <p>您也可以按 <em>取消退訂</em> 按鈕來取消這個退訂要求。"
 
-#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:858
-#: Mailman/Cgi/options.py:1005 Mailman/Cgi/options.py:1015
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:859
+#: Mailman/Cgi/options.py:1006 Mailman/Cgi/options.py:1016
 msgid "Unsubscribe"
 msgstr "退訂"
 
@@ -2265,47 +2265,51 @@ msgstr "要不要每月寄出密碼提醒?"
 msgid "List name is required."
 msgstr "需要論壇名稱。"
 
-#: Mailman/Cgi/edithtml.py:147
+#: Mailman/Cgi/edithtml.py:154
 msgid "%(realname)s -- Edit html for %(template_info)s"
 msgstr "%(realname)s - 編輯 %(template_info)s 的 html"
 
-#: Mailman/Cgi/edithtml.py:153
+#: Mailman/Cgi/edithtml.py:160
 msgid "Edit HTML : Error"
 msgstr "編輯 HTML : 錯誤"
 
-#: Mailman/Cgi/edithtml.py:154
+#: Mailman/Cgi/edithtml.py:161
 msgid "%(safetemplatename)s: Invalid template"
 msgstr "%(safetemplatename)s::樣版不正確"
 
-#: Mailman/Cgi/edithtml.py:159 Mailman/Cgi/edithtml.py:160
+#: Mailman/Cgi/edithtml.py:166 Mailman/Cgi/edithtml.py:167
 msgid "%(realname)s -- HTML Page Editing"
 msgstr "%(realname)s - HTML 網頁編輯"
 
-#: Mailman/Cgi/edithtml.py:161
+#: Mailman/Cgi/edithtml.py:168
 msgid "Select page to edit:"
 msgstr "選擇欲編輯的網頁:"
 
-#: Mailman/Cgi/edithtml.py:191
+#: Mailman/Cgi/edithtml.py:201
 msgid "View or edit the list configuration information."
 msgstr "觀看或編輯論壇的組態資訊。"
 
-#: Mailman/Cgi/edithtml.py:201
+#: Mailman/Cgi/edithtml.py:215
+msgid "Edit this template for"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:225
 msgid "When you are done making changes..."
 msgstr "當您完成變更後..."
 
-#: Mailman/Cgi/edithtml.py:202
+#: Mailman/Cgi/edithtml.py:228
 msgid "Submit Changes"
 msgstr "送出變更"
 
-#: Mailman/Cgi/edithtml.py:209
+#: Mailman/Cgi/edithtml.py:237
 msgid "Can't have empty html page."
 msgstr "不接受空白網頁。"
 
-#: Mailman/Cgi/edithtml.py:210
+#: Mailman/Cgi/edithtml.py:238
 msgid "HTML Unchanged."
 msgstr "HTML 沒有變動。"
 
-#: Mailman/Cgi/edithtml.py:216
+#: Mailman/Cgi/edithtml.py:244
 msgid ""
 "The page you saved contains suspicious HTML that could\n"
 "potentially expose your users to cross-site scripting attacks.  This change\n"
@@ -2314,20 +2318,20 @@ msgid ""
 "             "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:221
+#: Mailman/Cgi/edithtml.py:249
 msgid "See "
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:224
+#: Mailman/Cgi/edithtml.py:252
 msgid "FAQ 4.48."
 msgstr ""
 
-#: Mailman/Cgi/edithtml.py:225
+#: Mailman/Cgi/edithtml.py:253
 #, fuzzy
 msgid "Page Unchanged."
 msgstr "HTML 沒有變動。"
 
-#: Mailman/Cgi/edithtml.py:243
+#: Mailman/Cgi/edithtml.py:271
 msgid "HTML successfully updated."
 msgstr "HTML 已更新成功。"
 
@@ -2385,7 +2389,7 @@ msgstr ""
 msgid "Edit Options"
 msgstr "修改設定"
 
-#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:970
+#: Mailman/Cgi/listinfo.py:242 Mailman/Cgi/options.py:971
 #: Mailman/Cgi/roster.py:137
 msgid "View this page in"
 msgstr "選擇本頁所用的語文:"
@@ -2394,92 +2398,92 @@ msgstr "選擇本頁所用的語文:"
 msgid "This form requires JavaScript."
 msgstr ""
 
-#: Mailman/Cgi/options.py:67 Mailman/Cgi/options.py:80
-#: Mailman/Cgi/options.py:97
+#: Mailman/Cgi/options.py:68 Mailman/Cgi/options.py:81
+#: Mailman/Cgi/options.py:98
 msgid "CGI script error"
 msgstr "CGI 手稿錯誤"
 
-#: Mailman/Cgi/options.py:70
+#: Mailman/Cgi/options.py:71
 msgid "Invalid request method: %(method)s"
 msgstr ""
 
-#: Mailman/Cgi/options.py:154
+#: Mailman/Cgi/options.py:155
 msgid "No address given"
 msgstr "沒有給定地址"
 
-#: Mailman/Cgi/options.py:174
+#: Mailman/Cgi/options.py:175
 msgid "Illegal Email Address: %(safeuser)s"
 msgstr "非法的 email 地址: %(safeuser)s"
 
-#: Mailman/Cgi/options.py:181 Mailman/Cgi/options.py:235
-#: Mailman/Cgi/options.py:259 Mailman/Cgi/private.py:170
+#: Mailman/Cgi/options.py:182 Mailman/Cgi/options.py:236
+#: Mailman/Cgi/options.py:260 Mailman/Cgi/private.py:170
 msgid "No such member: %(safeuser)s."
 msgstr "沒有此訂戶:%(safeuser)s。"
 
-#: Mailman/Cgi/options.py:206
+#: Mailman/Cgi/options.py:207
 #, fuzzy
 msgid "If you are a list member, a confirmation email has been sent."
 msgstr "確認信已寄出。"
 
-#: Mailman/Cgi/options.py:207
+#: Mailman/Cgi/options.py:208
 #, fuzzy
 msgid ""
 "If you are a list member, your unsubscription request has been\n"
 "             forwarded to the list administrator for approval."
 msgstr "您的退訂要求已轉送給論壇管理人等待核准。"
 
-#: Mailman/Cgi/options.py:249
+#: Mailman/Cgi/options.py:250
 #, fuzzy
 msgid ""
 "If you are a list member,\n"
 "            your password has been emailed to you."
 msgstr "您的密碼提醒信件已經寄給您"
 
-#: Mailman/Cgi/options.py:292
+#: Mailman/Cgi/options.py:293
 msgid "Authentication failed."
 msgstr "認證失敗"
 
-#: Mailman/Cgi/options.py:360
+#: Mailman/Cgi/options.py:361
 msgid "A reminder of your password has been emailed to you."
 msgstr "您的密碼提醒信件已經寄給您"
 
-#: Mailman/Cgi/options.py:367
+#: Mailman/Cgi/options.py:368
 msgid ""
 "The list administrator may not view the other\n"
 "            subscriptions for this user."
 msgstr ""
 
-#: Mailman/Cgi/options.py:368 Mailman/Cgi/options.py:417
-#: Mailman/Cgi/options.py:545 Mailman/Cgi/options.py:770
+#: Mailman/Cgi/options.py:369 Mailman/Cgi/options.py:418
+#: Mailman/Cgi/options.py:546 Mailman/Cgi/options.py:771
 msgid "Note: "
 msgstr ""
 
-#: Mailman/Cgi/options.py:373
+#: Mailman/Cgi/options.py:374
 msgid "List subscriptions for %(safeuser)s on %(hostname)s"
 msgstr "列出 %(safeuser)s 在 %(hostname)s 上的訂閱清單"
 
-#: Mailman/Cgi/options.py:376
+#: Mailman/Cgi/options.py:377
 msgid ""
 "Click on a link to visit your options page for the\n"
 "        requested mailing list."
 msgstr "點擊任一連結即可前往您在該論壇的選項網頁。"
 
-#: Mailman/Cgi/options.py:414
+#: Mailman/Cgi/options.py:415
 msgid ""
 "The list administrator may not change the names\n"
 "            or addresses for this user's other subscriptions.  However, the\n"
 "            subscription for this mailing list has been changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:437
+#: Mailman/Cgi/options.py:438
 msgid "Addresses did not match!"
 msgstr "地址不符!"
 
-#: Mailman/Cgi/options.py:442
+#: Mailman/Cgi/options.py:443
 msgid "You are already using that email address"
 msgstr "您本來就在用那個 email 地址"
 
-#: Mailman/Cgi/options.py:454
+#: Mailman/Cgi/options.py:455
 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 "
@@ -2491,31 +2495,31 @@ msgstr ""
 "求了整批變更地址。\n"
 "在確認之後,所有含有 %(safeuser)s 的郵遞論壇都會變動。"
 
-#: Mailman/Cgi/options.py:463
+#: Mailman/Cgi/options.py:464
 msgid "The new address is already a member: %(newaddr)s"
 msgstr "新地址已經是訂戶: %(newaddr)s"
 
-#: Mailman/Cgi/options.py:469
+#: Mailman/Cgi/options.py:470
 msgid "Addresses may not be blank"
 msgstr "地址欄不可留空"
 
-#: Mailman/Cgi/options.py:483
+#: Mailman/Cgi/options.py:484
 msgid "A confirmation message has been sent to %(newaddr)s. "
 msgstr "已經寄確認信到 %(newaddr)s。"
 
-#: Mailman/Cgi/options.py:492
+#: Mailman/Cgi/options.py:493
 msgid "Bad email address provided"
 msgstr "提供的 email 地址不正確"
 
-#: Mailman/Cgi/options.py:494
+#: Mailman/Cgi/options.py:495
 msgid "Illegal email address provided"
 msgstr "提供的 email 地址不合法"
 
-#: Mailman/Cgi/options.py:496
+#: Mailman/Cgi/options.py:497
 msgid "%(newaddr)s is already a member of the list."
 msgstr "%(newaddr)s 本來就是本論壇訂戶。"
 
-#: Mailman/Cgi/options.py:499
+#: Mailman/Cgi/options.py:500
 #, fuzzy
 msgid ""
 "%(newaddr)s is banned from this list.  If you\n"
@@ -2525,11 +2529,11 @@ msgstr ""
 "你使用的這 email 目前被本論壇列入黑名單。\n"
 "如果認為這項限制有問題的話,請與 %(owneraddr)s 壇主聯絡"
 
-#: Mailman/Cgi/options.py:510
+#: Mailman/Cgi/options.py:511
 msgid "Member name successfully changed. "
 msgstr "訂戶名稱已經變更成功。"
 
-#: Mailman/Cgi/options.py:520
+#: Mailman/Cgi/options.py:521
 #, fuzzy
 msgid ""
 "The list administrator may not change the\n"
@@ -2539,15 +2543,15 @@ msgstr ""
 "因此您的訂閱選項並未設定,\n"
 "但其他選項已經設定成功。"
 
-#: Mailman/Cgi/options.py:529
+#: Mailman/Cgi/options.py:530
 msgid "Passwords may not be blank"
 msgstr "密碼不可是空白"
 
-#: Mailman/Cgi/options.py:534
+#: Mailman/Cgi/options.py:535
 msgid "Passwords did not match!"
 msgstr "密碼不符"
 
-#: Mailman/Cgi/options.py:542
+#: Mailman/Cgi/options.py:543
 #, fuzzy
 msgid ""
 "The list administrator may not change the\n"
@@ -2558,12 +2562,12 @@ msgstr ""
 "因此您的訂閱選項並未設定,\n"
 "但其他選項已經設定成功。"
 
-#: Mailman/Cgi/options.py:559 Mailman/Commands/cmd_password.py:83
+#: Mailman/Cgi/options.py:560 Mailman/Commands/cmd_password.py:83
 #: Mailman/Commands/cmd_password.py:109
 msgid "Password successfully changed."
 msgstr "密碼已更新成功。"
 
-#: Mailman/Cgi/options.py:568
+#: Mailman/Cgi/options.py:569
 msgid ""
 "You must confirm your unsubscription request by turning\n"
 "                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
@@ -2572,16 +2576,16 @@ msgstr ""
 "您還沒退訂唷!\n"
 "您必須勾選 <em>退訂</em> 按鈕下面的方格以示確認您的退訂要求。"
 
-#: Mailman/Cgi/options.py:589
+#: Mailman/Cgi/options.py:590
 #, fuzzy
 msgid "via the member options page"
 msgstr "%(realname)s 的列表: 會員選項登入頁"
 
-#: Mailman/Cgi/options.py:609
+#: Mailman/Cgi/options.py:610
 msgid "Unsubscription results"
 msgstr "退訂的結果"
 
-#: Mailman/Cgi/options.py:613
+#: Mailman/Cgi/options.py:614
 msgid ""
 "Your unsubscription request has been received and\n"
 "            forwarded on to the list moderators for approval.  You will\n"
@@ -2591,7 +2595,7 @@ msgstr ""
 "您的退訂要求已經收到了,並已轉給論壇主持人。\n"
 "一旦論壇主持人作出決定,您就會收到通知。"
 
-#: Mailman/Cgi/options.py:618
+#: Mailman/Cgi/options.py:619
 msgid ""
 "You have been successfully unsubscribed from the\n"
 "            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
@@ -2604,7 +2608,7 @@ msgstr ""
 "如果您原本訂的是文摘的話,可能還會收到一期文摘。\n"
 "如果您有任何有關退訂的問題,請聯絡論壇擁有人 %(owneraddr)s。"
 
-#: Mailman/Cgi/options.py:767
+#: Mailman/Cgi/options.py:768
 msgid ""
 "The list administrator may not change the\n"
 "                options for this user's other subscriptions.  However the\n"
@@ -2612,7 +2616,7 @@ msgid ""
 "                changed."
 msgstr ""
 
-#: Mailman/Cgi/options.py:777
+#: Mailman/Cgi/options.py:778
 msgid ""
 "The list administrator has disabled digest delivery for\n"
 "            this list, so your delivery option has not been set.  However "
@@ -2623,7 +2627,7 @@ msgstr ""
 "因此您的訂閱選項並未設定,\n"
 "但其他選項已經設定成功。"
 
-#: Mailman/Cgi/options.py:781
+#: Mailman/Cgi/options.py:782
 msgid ""
 "The list administrator has disabled non-digest delivery\n"
 "            for this list, so your delivery option has not been set.  "
@@ -2634,63 +2638,63 @@ msgstr ""
 "因此您的訂閱選項並未設定,\n"
 "但其他選項已經設定成功。"
 
-#: Mailman/Cgi/options.py:785
+#: Mailman/Cgi/options.py:786
 msgid "You have successfully set your options."
 msgstr "您的選項已經設定成功。"
 
-#: Mailman/Cgi/options.py:788
+#: Mailman/Cgi/options.py:789
 msgid "You may get one last digest."
 msgstr "您可能還會收到最後一次的文摘。"
 
-#: Mailman/Cgi/options.py:860
+#: Mailman/Cgi/options.py:861
 msgid "<em>Yes, I really want to unsubscribe</em>"
 msgstr "<em>是的,我真的要退訂</em>"
 
-#: Mailman/Cgi/options.py:864
+#: Mailman/Cgi/options.py:865
 msgid "Change My Password"
 msgstr "變更我的密碼"
 
-#: Mailman/Cgi/options.py:867
+#: Mailman/Cgi/options.py:868
 msgid "List my other subscriptions"
 msgstr "列出我訂的其他論壇"
 
-#: Mailman/Cgi/options.py:874
+#: Mailman/Cgi/options.py:875
 msgid "Email My Password To Me"
 msgstr "把我的密碼寄給我"
 
-#: Mailman/Cgi/options.py:876
+#: Mailman/Cgi/options.py:877
 msgid "password"
 msgstr "密碼"
 
-#: Mailman/Cgi/options.py:878
+#: Mailman/Cgi/options.py:879
 msgid "Log out"
 msgstr "登出"
 
-#: Mailman/Cgi/options.py:880
+#: Mailman/Cgi/options.py:881
 msgid "Submit My Changes"
 msgstr "送出我的變更"
 
-#: Mailman/Cgi/options.py:892
+#: Mailman/Cgi/options.py:893
 msgid "days"
 msgstr "天"
 
-#: Mailman/Cgi/options.py:894
+#: Mailman/Cgi/options.py:895
 msgid "day"
 msgstr "天"
 
-#: Mailman/Cgi/options.py:895
+#: Mailman/Cgi/options.py:896
 msgid "%(days)d %(units)s"
 msgstr "%(days)d %(units)s"
 
-#: Mailman/Cgi/options.py:901
+#: Mailman/Cgi/options.py:902
 msgid "Change My Address and Name"
 msgstr "變更我的地址和名字"
 
-#: Mailman/Cgi/options.py:927
+#: Mailman/Cgi/options.py:928
 msgid "<em>No topics defined</em>"
 msgstr "<em>尚未定義任何標題</em>"
 
-#: Mailman/Cgi/options.py:935
+#: Mailman/Cgi/options.py:936
 msgid ""
 "\n"
 "You are subscribed to this list with the case-preserved address\n"
@@ -2699,19 +2703,19 @@ msgstr ""
 "\n"
 "您以保留大寫字母的地址 <em>%(cpuser)s</em> 訂閱本論壇。"
 
-#: Mailman/Cgi/options.py:951
+#: Mailman/Cgi/options.py:952
 msgid "%(realname)s list: member options login page"
 msgstr "%(realname)s 的列表: 會員選項登入頁"
 
-#: Mailman/Cgi/options.py:952
+#: Mailman/Cgi/options.py:953
 msgid "email address and "
 msgstr "訂戶地址和"
 
-#: Mailman/Cgi/options.py:955
+#: Mailman/Cgi/options.py:956
 msgid "%(realname)s list: member options for user %(safeuser)s"
 msgstr "%(realname)s 的列表: %(safeuser)s 的訂戶選項。"
 
-#: Mailman/Cgi/options.py:981
+#: Mailman/Cgi/options.py:982
 msgid ""
 "In order to change your membership option, you must\n"
 "    first log in by giving your %(extra)smembership password in the section\n"
@@ -2736,19 +2740,19 @@ msgstr ""
 " <p><strong><em>重要:</em></strong>從此以後您必需開啟瀏覽器的 cookies 功能,"
 "不然您作的更動都將失效。"
 
-#: Mailman/Cgi/options.py:995
+#: Mailman/Cgi/options.py:996
 msgid "Email address:"
 msgstr "Email 地址:"
 
-#: Mailman/Cgi/options.py:999
+#: Mailman/Cgi/options.py:1000
 msgid "Password:"
 msgstr "密碼: "
 
-#: Mailman/Cgi/options.py:1001
+#: Mailman/Cgi/options.py:1002
 msgid "Log in"
 msgstr "登入"
 
-#: Mailman/Cgi/options.py:1009
+#: Mailman/Cgi/options.py:1010
 msgid ""
 "By clicking on the <em>Unsubscribe</em> button, a\n"
 "    confirmation message will be emailed to you.  This message will have a\n"
@@ -2760,37 +2764,37 @@ msgstr ""
 "那封信會含有一個網址,您只要點擊就能完成退訂程序。您也可以用 email 確認;請閱"
 "讀確認信中的指示。"
 
-#: Mailman/Cgi/options.py:1017
+#: Mailman/Cgi/options.py:1018
 msgid "Password reminder"
 msgstr "密碼提示信: "
 
-#: Mailman/Cgi/options.py:1021
+#: Mailman/Cgi/options.py:1022
 msgid ""
 "By clicking on the <em>Remind</em> button, your\n"
 "    password will be emailed to you."
 msgstr "如果您點擊 <em>提醒</em> 按鈕,您的密碼會定時寄給您。"
 
-#: Mailman/Cgi/options.py:1024
+#: Mailman/Cgi/options.py:1025
 msgid "Remind"
 msgstr "提醒"
 
-#: Mailman/Cgi/options.py:1124 Mailman/ListAdmin.py:227
+#: Mailman/Cgi/options.py:1125 Mailman/ListAdmin.py:227
 msgid "<missing>"
 msgstr "<missing>"
 
-#: Mailman/Cgi/options.py:1135
+#: Mailman/Cgi/options.py:1136
 msgid "Requested topic is not valid: %(topicname)s"
 msgstr "要求的標題無效: %(topicname)s"
 
-#: Mailman/Cgi/options.py:1140
+#: Mailman/Cgi/options.py:1141
 msgid "Topic filter details"
 msgstr "標題過濾器明細"
 
-#: Mailman/Cgi/options.py:1143
+#: Mailman/Cgi/options.py:1144
 msgid "Name:"
 msgstr "名字:"
 
-#: Mailman/Cgi/options.py:1145
+#: Mailman/Cgi/options.py:1146
 msgid "Pattern (as regexp):"
 msgstr "規則(正規表示式):"
 
@@ -6075,7 +6079,7 @@ msgid ""
 "\n"
 "            <p>In the text boxes below, add one address per line; start the\n"
 "            line with a ^ character to designate a <a href=\n"
-"            \"http://docs.python.org/library/re.html\"\n"
+"            \"https://docs.python.org/2/library/re.html\"\n"
 "            >Python regular expression</a>.  When entering backslashes, do "
 "so\n"
 "            as if you were using Python raw strings (i.e. you generally "
@@ -6100,7 +6104,7 @@ msgstr ""
 "a>的過濾。\n"
 "\n"
 " <p>在下面的文字框中每行填入一個地址,在行首寫 ^ 字元代表是\n"
-"<a href=\"http://docs.python.org/library/re.html\">Python 正規表示式</a>。\n"
+"<a href=\"https://docs.python.org/2/library/re.html\">Python 正規表示式</a>。\n"
 "要填入反斜線【譯註:╲】的話,請直接打反斜線即可,不用多加一個反斜線逸出。\n"
 "\n"
 " <p>請注意,會先做非正規表示式的比對。"
@@ -6760,7 +6764,7 @@ msgstr ""
 msgid ""
 "The topic filter categorizes each incoming email message\n"
 "             according to <a\n"
-"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"            href=\"https://docs.python.org/2/library/re.html\">regular\n"
 "             expression filters</a> you specify below.  If the message's\n"
 "             <code>Subject:</code> or <code>Keywords:</code> header contains "
 "a\n"
@@ -7262,7 +7266,7 @@ msgstr "查看訂閱會員清單"
 msgid "Once a month, your password will be emailed to you as a reminder."
 msgstr "您的密碼每個月將自動寄給你一次備忘。"
 
-#: Mailman/HTMLFormatter.py:404
+#: Mailman/HTMLFormatter.py:409
 #, fuzzy
 msgid "The current archive"
 msgstr "現在的檔案"
@@ -7615,7 +7619,7 @@ msgstr "結尾: "
 msgid "Posting of your message titled \"%(subject)s\""
 msgstr "以標題 \"%(subject)s\" 發表"
 
-#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:432
+#: Mailman/ListAdmin.py:310 Mailman/ListAdmin.py:433
 msgid "[No reason given]"
 msgstr "〔原因不詳〕"
 
@@ -7627,28 +7631,28 @@ msgstr "轉送管制的信件"
 msgid "New subscription request to list %(realname)s from %(addr)s"
 msgstr "%(realname)s 論壇訂閱申請,由 %(addr)s 提出"
 
-#: Mailman/ListAdmin.py:431
+#: Mailman/ListAdmin.py:432
 msgid "Subscription request"
 msgstr "訂閱申請"
 
-#: Mailman/ListAdmin.py:441
+#: Mailman/ListAdmin.py:442
 #, fuzzy
 msgid "via admin approval"
 msgstr "繼續等待審核"
 
-#: Mailman/ListAdmin.py:465
+#: Mailman/ListAdmin.py:466
 msgid "New unsubscription request from %(realname)s by %(addr)s"
 msgstr "%(realname)s 論壇退訂申請,由 %(addr)s 提出"
 
-#: Mailman/ListAdmin.py:489
+#: Mailman/ListAdmin.py:490
 msgid "Unsubscription request"
 msgstr "退訂申請"
 
-#: Mailman/ListAdmin.py:522
+#: Mailman/ListAdmin.py:523
 msgid "Original Message"
 msgstr "原始發言"
 
-#: Mailman/ListAdmin.py:525
+#: Mailman/ListAdmin.py:526
 msgid "Request to mailing list %(realname)s rejected"
 msgstr "在論壇 %(realname)s 的申請已被拒絕"
 
@@ -7760,61 +7764,61 @@ msgstr "請確認退出 %(listname)s 論壇"
 msgid "Your confirmation is required to leave the %(listname)s mailing list"
 msgstr "請確認加入 %(listname)s 論壇"
 
-#: Mailman/MailList.py:952 Mailman/MailList.py:1442
+#: Mailman/MailList.py:973 Mailman/MailList.py:1464
 msgid " from %(remote)s"
 msgstr " 寄自 %(remote)s"
 
-#: Mailman/MailList.py:996
+#: Mailman/MailList.py:1017
 #, fuzzy
 msgid "subscriptions to %(realname)s require moderator approval"
 msgstr "%(realname)s 的訂閱需要壇主核准"
 
-#: Mailman/MailList.py:1078 bin/add_members:299
+#: Mailman/MailList.py:1099 bin/add_members:299
 #, fuzzy
 msgid "%(realname)s subscription notification"
 msgstr "%(realname)s 訂閱通知"
 
-#: Mailman/MailList.py:1098
+#: Mailman/MailList.py:1119
 #, fuzzy
 msgid "unsubscriptions require moderator approval"
 msgstr "%s 的訂閱需要壇主核准"
 
-#: Mailman/MailList.py:1119
+#: Mailman/MailList.py:1140
 #, fuzzy
 msgid "%(realname)s unsubscribe notification"
 msgstr "%s 退訂通知"
 
-#: Mailman/MailList.py:1281
+#: Mailman/MailList.py:1302
 #, fuzzy
 msgid "%(realname)s address change notification"
 msgstr "%s 退訂通知"
 
-#: Mailman/MailList.py:1314
+#: Mailman/MailList.py:1336
 #, fuzzy
 msgid "via email confirmation"
 msgstr "壞的確認字串"
 
-#: Mailman/MailList.py:1323
+#: Mailman/MailList.py:1345
 #, fuzzy
 msgid "via web confirmation"
 msgstr "壞的確認字串"
 
-#: Mailman/MailList.py:1348
+#: Mailman/MailList.py:1370
 #, fuzzy
 msgid "subscriptions to %(name)s require administrator approval"
 msgstr "%s 的訂閱需要壇主核准"
 
-#: Mailman/MailList.py:1358
+#: Mailman/MailList.py:1380
 #, fuzzy
 msgid "email confirmation"
 msgstr "壞的確認字串"
 
-#: Mailman/MailList.py:1360
+#: Mailman/MailList.py:1382
 #, fuzzy
 msgid "web confirmation"
 msgstr "填入確認用的 cookie "
 
-#: Mailman/MailList.py:1616
+#: Mailman/MailList.py:1638
 msgid "Last autoresponse notification for today"
 msgstr ""
 
@@ -7888,16 +7892,16 @@ msgstr ""
 msgid "Original message suppressed by Mailman site configuration\n"
 msgstr ""
 
-#: Mailman/htmlformat.py:673
+#: Mailman/htmlformat.py:675
 #, fuzzy
 msgid "Delivered by Mailman<br>version %(version)s"
 msgstr "由 Mailman<br>版本 %s 發送"
 
-#: Mailman/htmlformat.py:674
+#: Mailman/htmlformat.py:676
 msgid "Python Powered"
 msgstr "Python 加力"
 
-#: Mailman/htmlformat.py:675
+#: Mailman/htmlformat.py:677
 msgid "Gnu's Not Unix"
 msgstr ""
 
@@ -8897,7 +8901,7 @@ msgid ""
 "Complete\n"
 "specifications are at:\n"
 "\n"
-"http://docs.python.org/library/re.html\n"
+"https://docs.python.org/2/library/re.html\n"
 "\n"
 "Address matches are case-insensitive, but case-preserved addresses are\n"
 "displayed.\n"
diff --git a/misc/sitelist.cfg b/misc/sitelist.cfg
index bd5f4ca5..73c25da2 100644
--- a/misc/sitelist.cfg
+++ b/misc/sitelist.cfg
@@ -248,7 +248,7 @@ obscure_addresses = 1
 # 
 # <p>In the text boxes below, add one address per line; start the line
 # with a ^ character to designate a <a href=
-# "http://docs.python.org/library/re.html" >Python regular
+# "https://docs.python.org/2/library/re.html" >Python regular
 # expression</a>.  When entering backslashes, do so as if you were using
 # Python raw strings (i.e. you generally just use a single backslash).
 # 
diff --git a/templates/ar/headfoot.html b/templates/ar/headfoot.html
index 9587de77..ba142058 100644
--- a/templates/ar/headfoot.html
+++ b/templates/ar/headfoot.html
@@ -1,4 +1,4 @@
-يمكن لهذا النص أن يتضمن<a href="http://docs.python.org/library/stdtypes.html#string-formatting-operations">محارف تنسيق بايثون</a> 
+يمكن لهذا النص أن يتضمن<a href="https://docs.python.org/2/library/stdtypes.html#string-formatting-operations">محارف تنسيق بايثون</a> 
 والتي سيتم حلها مع مواصفات القائمة. قائمة الاستبدالات المسموحة هي:
 
 <ul>
diff --git a/templates/ast/headfoot.html b/templates/ast/headfoot.html
index f2c273c8..72d71953 100644
--- a/templates/ast/headfoot.html
+++ b/templates/ast/headfoot.html
@@ -1,5 +1,5 @@
 Esti testu puede incluyir 
-<a href="http://docs.python.org/library/stdtypes.html#string-formatting-operations">cadenes de formatu Python</a> que sustituyir&aacute;nse polos atributos de la llista. La llista de sustituciones permit&iacute;es son:
+<a href="https://docs.python.org/2/library/stdtypes.html#string-formatting-operations">cadenes de formatu Python</a> que sustituyir&aacute;nse polos atributos de la llista. La llista de sustituciones permit&iacute;es son:
 
 <ul>
     <li><b>real_name</b> - El nome 'presentable' de la llista. Davezu ye'l nome de la llista cola primer lletra en may&uacute;scula.
diff --git a/templates/ca/headfoot.html b/templates/ca/headfoot.html
index 265da00b..ce0e2c13 100644
--- a/templates/ca/headfoot.html
+++ b/templates/ca/headfoot.html
@@ -1,5 +1,5 @@
 Aquest text pot incloure 
-<a href="http://docs.python.org/library/stdtypes.html#string-formatting-operations">cadenes 
+<a href="https://docs.python.org/2/library/stdtypes.html#string-formatting-operations">cadenes 
 de format del Python</a>, les quals es resoldran com atributs de la llista. 
 La llista de les substitucions permeses &eacute;s la seg&uuml;ent: 
 
diff --git a/templates/cs/headfoot.html b/templates/cs/headfoot.html
index a6dc6d83..bf4cad6e 100644
--- a/templates/cs/headfoot.html
+++ b/templates/cs/headfoot.html
@@ -1,5 +1,5 @@
 Tento text m��e obsahovat <a
-href="http://docs.python.org/library/stdtypes.html#string-formatting-operations">form&aacute;tovac&iacute;
+href="https://docs.python.org/2/library/stdtypes.html#string-formatting-operations">form&aacute;tovac&iacute;
 p�&iacute;kazy Pythonu</a> kter&eacute; se nahrazuj&iacute; odpov&iacute;daj&iacute;c&iacute;mi hodnotami, p�i
 generov&aacute;n&iacute; str&aacute;nky.  Nejd�le�it�j&scaron;&iacute; prom�nn&eacute; jsou:
 
diff --git a/templates/cs/listinfo.html b/templates/cs/listinfo.html
index 408b22b5..8da0066a 100644
--- a/templates/cs/listinfo.html
+++ b/templates/cs/listinfo.html
@@ -2,7 +2,7 @@
 <!-- $Revision: 6023 $ -->
 <HTML>
   <HEAD>
-    <TITLE>Informace o konferenci<MM-List-Name></TITLE>
+    <TITLE>Informace o konferenci <MM-List-Name></TITLE>
   
   </HEAD>
   <BODY BGCOLOR="#ffffff">
diff --git a/templates/da/headfoot.html b/templates/da/headfoot.html
index 48f2767d..042fa535 100644
--- a/templates/da/headfoot.html
+++ b/templates/da/headfoot.html
@@ -1,6 +1,6 @@
 Teksten kan indeholde formateringskoder
 som udskiftes med v&aelig;rdier fra listens ops&aelig;tning. For detaljer, se
-<a href="http://docs.python.org/library/stdtypes.html#string-formatting-operations">Pythons
+<a href="https://docs.python.org/2/library/stdtypes.html#string-formatting-operations">Pythons
 formateringsregler (engelsk)</a>. Gyldige koder er:
 
 <ul>
diff --git a/templates/de/headfoot.html b/templates/de/headfoot.html
index 707dcac0..853b8ba6 100644
--- a/templates/de/headfoot.html
+++ b/templates/de/headfoot.html
@@ -1,6 +1,6 @@
 <!-- updated to en 2.1 -->
 Dieser Text kann sogenannte
-"<a href="http://docs.python.org/library/stdtypes.html#string-formatting-operations">
+"<a href="https://docs.python.org/2/library/stdtypes.html#string-formatting-operations">
 Python format strings</a>" enthalten, die durch listenspezifische Werte
 ersetzt werden.
 
diff --git a/templates/el/headfoot.html b/templates/el/headfoot.html
index 7bea4928..61b508cc 100644
--- a/templates/el/headfoot.html
+++ b/templates/el/headfoot.html
@@ -1,6 +1,6 @@
 
 ���� �� ������� ������ �� �������� 
-<a href="http://docs.python.org/library/stdtypes.html#string-formatting-operations">���������� �� 
+<a href="https://docs.python.org/2/library/stdtypes.html#string-formatting-operations">���������� �� 
 Python format</a> �� ������ ���������� �� �� ����� ���� ������ �����.  � ����� ��� 
 ������������� ��� ������������ �����:
 
diff --git a/templates/en/headfoot.html b/templates/en/headfoot.html
index f2dd04e0..6bb9a75a 100644
--- a/templates/en/headfoot.html
+++ b/templates/en/headfoot.html
@@ -1,5 +1,5 @@
 This text can include 
-<a href="http://docs.python.org/library/stdtypes.html#string-formatting-operations">Python
+<a href="https://docs.python.org/2/library/stdtypes.html#string-formatting-operations">Python
 format strings</a> which are resolved against list attributes.  The
 list of substitutions allowed are:
 
diff --git a/templates/es/headfoot.html b/templates/es/headfoot.html
index 79c0eab6..af0032c1 100644
--- a/templates/es/headfoot.html
+++ b/templates/es/headfoot.html
@@ -1,5 +1,5 @@
 Este texto puede incluir 
-<a href="http://docs.python.org/library/stdtypes.html#string-formatting-operations">
+<a href="https://docs.python.org/2/library/stdtypes.html#string-formatting-operations">
 cadenas de formato Python
 </a>
 que ser&aacute;n sustituidas por los atributos de la lista. La lista de
diff --git a/templates/et/headfoot.html b/templates/et/headfoot.html
index 9219828d..93a8d419 100644
--- a/templates/et/headfoot.html
+++ b/templates/et/headfoot.html
@@ -1,5 +1,5 @@
 See tekst v&otilde;ib sisaldada
-<a href="http://docs.python.org/library/stdtypes.html#string-formatting-operations">Pythoni
+<a href="https://docs.python.org/2/library/stdtypes.html#string-formatting-operations">Pythoni
 vormingustringe</a>, mis asendatakse selle listi atribuutidega.  Lubatud
 asendused on j&auml;rgmised:
 <ul>
diff --git a/templates/eu/headfoot.html b/templates/eu/headfoot.html
index 8536f8df..d493d9a5 100644
--- a/templates/eu/headfoot.html
+++ b/templates/eu/headfoot.html
@@ -1,5 +1,5 @@
 Testu honek 
-<a href="http://docs.python.org/library/stdtypes.html#string-formatting-operations">Python
+<a href="https://docs.python.org/2/library/stdtypes.html#string-formatting-operations">Python
 kateak</a> izan ditzake; zerrendako atributuen bidez ordezkatuko dira.  
 Onartzen diren ordezkapenak hauexek dira:
 
diff --git a/templates/fi/headfoot.html b/templates/fi/headfoot.html
index 1b23eb5b..00fc9fc4 100644
--- a/templates/fi/headfoot.html
+++ b/templates/fi/headfoot.html
@@ -1,5 +1,5 @@
 <br>
-Teksti voi sis&auml;lt&auml;&auml; <a href="http://docs.python.org/library/stdtypes.html#string-formatting-operations"> muotoiltuja
+Teksti voi sis&auml;lt&auml;&auml; <a href="https://docs.python.org/2/library/stdtypes.html#string-formatting-operations"> muotoiltuja
 merkkijonoja. Muotoilussa k&Atilde;&curren;ytett&Atilde;&curren;vi&Atilde;&curren; arvoja ovat:
 
 <ul>
diff --git a/templates/fr/headfoot.html b/templates/fr/headfoot.html
index 1ee642fe..684ebfce 100644
--- a/templates/fr/headfoot.html
+++ b/templates/fr/headfoot.html
@@ -1,5 +1,5 @@
 Ce texte peut contenir <a 
-href="http://docs.python.org/library/stdtypes.html#string-formatting-operations">des formats 
+href="https://docs.python.org/2/library/stdtypes.html#string-formatting-operations">des formats 
 de cha&icirc;nes Python </a>qui sont remplac&eacute;es par les attributs 
 de la liste.  La liste des substitutions valides est:     
 <ul>
diff --git a/templates/gl/headfoot.html b/templates/gl/headfoot.html
index 22d63bb5..ca5b147c 100644
--- a/templates/gl/headfoot.html
+++ b/templates/gl/headfoot.html
@@ -1,5 +1,5 @@
 Este texto pode inclu&iacute;r 
-<a href="http://docs.python.org/library/stdtypes.html#string-formatting-operations">
+<a href="https://docs.python.org/2/library/stdtypes.html#string-formatting-operations">
 cadeas de formato Python
 </a>
 que se substituir&aacute;n polos atributos da rolda. A relaci&oacute;n de
diff --git a/templates/he/headfoot.html b/templates/he/headfoot.html
index 38fdca39..9efbd51c 100644
--- a/templates/he/headfoot.html
+++ b/templates/he/headfoot.html
@@ -1,5 +1,5 @@
 טקסט זה יכול לכלול 
-<a href="http://docs.python.org/library/stdtypes.html#string-formatting-operations">מחרוזות
+<a href="https://docs.python.org/2/library/stdtypes.html#string-formatting-operations">מחרוזות
 בפורמאט Python</a> אשר מפוענחות מול תכונות הרשימה. רשימת
 תתי-המצבים המותרים:
 <ul>
diff --git a/templates/hr/headfoot.html b/templates/hr/headfoot.html
index e94d9653..750c1a26 100644
--- a/templates/hr/headfoot.html
+++ b/templates/hr/headfoot.html
@@ -1,5 +1,5 @@
  Ovaj tekst mo�e uklju�iti 
-<a href="http://docs.python.org/library/stdtypes.html#string-formatting-operations">Python
+<a href="https://docs.python.org/2/library/stdtypes.html#string-formatting-operations">Python
 format stringova</a> koji su razlu�eni prema atributima liste. Lista dozvoljenih 
 zamjena je: 
 
diff --git a/templates/hu/headfoot.html b/templates/hu/headfoot.html
index 8b4ea1d9..97a2be3c 100644
--- a/templates/hu/headfoot.html
+++ b/templates/hu/headfoot.html
@@ -1,4 +1,4 @@
-Ez a sz&ouml;veg olyan <a href="http://docs.python.org/library/stdtypes.html#string-formatting-operations">Python-t&iacute;pus&uacute; v&aacute;ltoz&oacute;k</a>at mutat be, amelyekkel a lista egyes jellemz&#337;ire lehet hivatkozni.
+Ez a sz&ouml;veg olyan <a href="https://docs.python.org/2/library/stdtypes.html#string-formatting-operations">Python-t&iacute;pus&uacute; v&aacute;ltoz&oacute;k</a>at mutat be, amelyekkel a lista egyes jellemz&#337;ire lehet hivatkozni.
 Az al&aacute;bbi v&aacute;ltoz&oacute;k jelent&eacute;se:
 
 <ul>
diff --git a/templates/ia/headfoot.html b/templates/ia/headfoot.html
index 3899b521..4a20d11c 100644
--- a/templates/ia/headfoot.html
+++ b/templates/ia/headfoot.html
@@ -1,5 +1,5 @@
 Iste texto pote includer
-<a href="http://docs.python.org/library/stdtypes.html#string-formatting-operations">stringas
+<a href="https://docs.python.org/2/library/stdtypes.html#string-formatting-operations">stringas
 in formato Python</a> que es completate per un lista de attributos. Le lista
 de substitutiones permittite es:
 
diff --git a/templates/it/headfoot.html b/templates/it/headfoot.html
index d345ade6..75899db5 100644
--- a/templates/it/headfoot.html
+++ b/templates/it/headfoot.html
@@ -1,5 +1,5 @@
 Questo testo pu&ograve; includere <a
-href="http://docs.python.org/library/stdtypes.html#string-formatting-operations">Stringhe
+href="https://docs.python.org/2/library/stdtypes.html#string-formatting-operations">Stringhe
 di formato Python</a> che saranno sostituite automaticamente dai
 valori degli attributi della lista.  L'elenco degli attributi permessi
 &egrave;:
diff --git a/templates/ja/adminaddrchgack.txt b/templates/ja/adminaddrchgack.txt
index 194c228e..883d92a0 100644
--- a/templates/ja/adminaddrchgack.txt
+++ b/templates/ja/adminaddrchgack.txt
@@ -1,4 +1,4 @@
 �᡼��󥰥ꥹ�� %(listname)s �β���� %(name)s �����
-�쥢�ɥ쥹 %(oldaddr)s �򿷥��ɥ쥹 %(newaddr)s ���ѹ����ޤ���.
+�쥢�ɥ쥹 %(oldaddr)s �򿷥��ɥ쥹 %(newaddr)s ���ѹ����ޤ�����
 
 
diff --git a/templates/ja/admindbdetails.html b/templates/ja/admindbdetails.html
index 8defa139..05a6efd5 100644
--- a/templates/ja/admindbdetails.html
+++ b/templates/ja/admindbdetails.html
@@ -1,61 +1,62 @@
-���������ϼ���2�Ĥ���ˡ��ɽ������ޤ�. <a href="%(summaryurl)s">
-����ڡ���</a>��<em>�ܺ�</em>�ڡ����Ǥ�. ����ڡ����ˤ�, ��α��
-�ʤäƤ���������������˲ä���, �����ԤΥ᡼�륢�ɥ쥹��
-���롼��ʬ�����줿��α��Ƥ�ɽ������ޤ�. �ܺ٥ڡ����Ǥ�, ���줾��
-����α�᡼��ξܺ٤Ĥޤ�, �᡼��Υإå�����������ʸ��ȴ��
-��ɽ������ޤ�.
+���������ˤϡ�
+<a href="%(summaryurl)s">����ڡ���</a>��
+<em>�ܺ�</em>�ڡ����Ȥ�2�Ĥ�ɽ������ˡ������ޤ���
+����ڡ����ˤϡ���α�ˤʤäƤ���������������˲ä���
+�����ԤΥ᡼�륢�ɥ쥹�ǥ��롼��ʬ�����줿��α��Ƥ�ɽ������ޤ���
+�ܺ٥ڡ����Ǥϡ����줾�����α�᡼��ξܺ٤Ĥޤꡢ
+�᡼��Υإå�����������ʸ��ȴ�񤭤�ɽ������ޤ���
 
 <p>�ɤ���Υڡ����ˤ⼡�ν�����˥塼������ޤ�:
 
 <ul>
-<li><b>���</b> -- �������˱�Ф��������α���ޤ�.
-    ���λ����Ǥϴ��������ν����ϹԤ��ޤ���, ��α����Ƥ���
-    �᡼���ž������¸���Ǥ��ޤ�(���򻲾�).
-
-<li><b>��ǧ</b> -- ��Ƥ�ǧ��, �ꥹ�Ȥ��������ޤ�.
-    �����ο�����, ��������ѹ���ǧ���ޤ�.
-
-<li><b>����</b> -- ��Ƥ���ݤ�, ���Τ��Ȥ������Ԥ����Τ��ޤ�.
-    �ޤ�, ���ꥸ�ʥ����Ƥ��˴�����ޤ�. �����ο����˴ؤ��Ƥ�,
-    ��������ѹ�����ݤ��ޤ�. �ɤ���ξ���, �ƥ����ȥܥå�����
-    ���ݤ���ͳ��񤭲ä���Ȥ褤�Ǥ��礦.
-
-<li><b>�˴�</b> -- ��ƥ᡼���Τ�, ���ݤ����Τ�����ޤ���.
-    ��������˴ؤ��Ƥ�, ñ�˿������˴���, ������Ф����ͤؤ�
-    ���ΤϹԤ��ޤ���. SPAM���Ф��ƤϤ����Ȥ��Ȥ褤�Ǥ��礦.
+<li><b>���</b> -- �������˱�Ф��������α���ޤ���
+    ���λ����Ǥϴ��������ν����ϹԤ��ޤ��󤬡�
+    ��α����Ƥ���᡼���ž������¸���Ǥ��ޤ�(���򻲾�)��
+
+<li><b>��ǧ</b> -- ��Ƥ�ǧ�����ꥹ�Ȥ��������ޤ���
+    �����ο����ϡ���������ѹ���ǧ���ޤ���
+
+<li><b>����</b> -- ��Ƥ���ݤ������Τ��Ȥ������Ԥ����Τ��ޤ���
+    �ޤ������ꥸ�ʥ����Ƥ��˴�����ޤ��������ο����˴ؤ��Ƥϡ�
+    ��������ѹ�����ݤ��ޤ����ɤ���ξ��⡢
+    �ƥ����ȥܥå����˵��ݤ���ͳ��񤭲ä���Ȥ褤�Ǥ��礦��
+
+<li><b>�˴�</b> -- ��ƥ᡼���Τơ����ݤ����Τ�����ޤ���
+    ��������˴ؤ��Ƥϡ�ñ�˿������˴�����
+    ������Ф����ͤؤ����ΤϹԤ��ޤ���
+    SPAM���Ф��ƤϤ����Ȥ��Ȥ褤�Ǥ��礦��
 </ul>
 
-<p>��α��ƤˤĤ��Ƥ�, �����ȴ����ԤΤ���˥᡼��Υ��ԡ���
-��¸���褦�Ȼפä���, <b>��¸</b>������å����Ƥ�������.
-�����, �ꥹ�Ȥ��Ѥ��褦�Ȥ���᡼����˴���������, ���
-Ĵ���Τ���˵�Ͽ��Ĥ�ɬ�פ��������ͭ���Ǥ�.
-
-<p><b>ž��</b>������å�����, ž����᡼�륢�ɥ쥹���������,
-�᡼��󥰥ꥹ�Ȥδط��԰ʳ��οͤ�ž�����뤳�Ȥ��Ǥ��ޤ�.
-��α�᡼���ꥹ�Ȥ����������Խ�����ˤ�, �᡼���ʬ
-(�ꥹ�ȴ�����)��ž����, ���Υ᡼����˴�����Ȥ褤�Ǥ��礦.
-��ʬ�����Ϥ����᡼����Խ�����, (ɬ�פʤ�)
-<tt>Approved:</tt>�إå��ȥꥹ�ȤΥѥ���ɤ��դ���, �ꥹ�Ȱ���
-�������ޤ�. ���ΤȤ�, ��ʸ�˼��ä������Ȥ�����᡼��˵�����
-�������Ȥϥͥ����åȤˤ��ʤäƤ���Ǥ��礦.
-
-<p>�����Ԥ������դ��Υꥹ�Ȳ�����ä����, 
-���β�������¥ե饰��ꥻ�åȤ��뤳�Ȥ�Ǥ��ޤ�. ���ε�ǽ��, 
-��������Ϥ��٤������դ�����Ͽ���Ƥ���᡼��󥰥ꥹ�Ȥ�, 
-�ʸ����ƤϾ�ǧ��������ƤǤ���褦�ˤ���Ȥ��˻Ȥ��ޤ�.
-
-<p>�����Ԥ������ʤ�, ���Υ��ɥ쥹�� <em>�����ԥե��륿</em>
-���ɲä��뤳�Ȥ��Ǥ��ޤ�. �����ԥե��륿�ˤĤ���
-�� <a href="%(filterurl)s">�����ԥե��륿���ץ饤�Х����ڡ���
-</a> �˽񤤤Ƥ���ޤ���, <b>auto-accept</b> (��ǧ) �ޤ���, 
-<b>auto-hold</b> (��α), <b>auto-reject</b> (����), 
-<b>auto-discard</b> (�˴�) �Τɤ줫�����ꤷ�ޤ�. �����Ԥ�
-���������ԥե��륿����Ͽ����Ƥ����, ���Υ��ץ�����
-ɽ������ޤ���.
-
-<p>�����λ������, ���Υڡ����κǽ�ޤ��ϺǸ�ˤ���, 
-<em>��������</em>�򥯥�å����Ƥ�������.
-���Υܥ����, ���ʤ������ꤷ�����Ƥδ��������ˤĤ���, ���򤷤�
-ư���������ޤ�.
-
-<p><a href="%(summaryurl)s">����ڡ��������</a>.
+<p>��α��ƤˤĤ��ơ������ȴ����ԤΤ���˥᡼��Υ��ԡ�����¸���������ϡ�
+<b>��¸</b>������å����Ƥ���������
+����ϡ��ꥹ�Ȥ��Ѥ��褦�Ȥ���᡼����˴�����������ɤ⡢
+���Ĵ���Τ���˵�Ͽ��Ĥ�ɬ�פ��������ͭ���Ǥ���
+
+<p><b>ž��</b>������å����ơ�ž����᡼�륢�ɥ쥹��������ȡ�
+�᡼��󥰥ꥹ�Ȥδط��԰ʳ��οͤ�ž�����뤳�Ȥ��Ǥ��ޤ���
+��α�᡼���ꥹ�Ȥ����������Խ�����ˤϡ�
+�᡼���ʬ (�ꥹ�ȴ�����)��ž���������Υ᡼����˴�����Ȥ褤�Ǥ��礦��
+��ʬ�����Ϥ����᡼����Խ�����(ɬ�פʤ�)
+<tt>Approved:</tt>�إå��ȥꥹ�ȤΥѥ���ɤ��դ��ơ��ꥹ�Ȱ��˺������ޤ���
+���ΤȤ�����ʸ�˼��ä����Ⱥ����᡼��˵����Ƥ����Τ��ͥ����åȾ�褤�Ǥ��礦��
+
+<p>�����Ԥ������դ��Υꥹ�Ȳ���ξ�硢
+���β�������¥ե饰��ꥻ�åȤ��뤳�Ȥ�Ǥ��ޤ������ε�ǽ�ϡ�
+��������Ϥ��٤������դ�����Ͽ���Ƥ���᡼��󥰥ꥹ�Ȥǡ�
+�ʸ����ƤϾ�ǧ��������ƤǤ���褦�ˤ���Ȥ��˻Ȥ��ޤ���
+
+<p>�����Ԥ������ξ�硢���Υ��ɥ쥹�� <em>�����ԥե��륿</em>
+���ɲä��뤳�Ȥ�Ǥ��ޤ��������ԥե��륿��
+<a href="%(filterurl)s">�����ԥե��륿���ץ饤�Х����ڡ���</a>
+���������Ƥ����̤ꡢ<b>auto-accept</b> (��ǧ) �ޤ��ϡ�
+<b>auto-hold</b> (��α)��<b>auto-reject</b> (����)��
+<b>auto-discard</b> (�˴�) �Τ����줫��ĤǤ���
+�����Ԥ����������ԥե��륿����Ͽ����Ƥ���С�
+���Υ��ץ�����ɽ������ޤ���
+
+<p>�����λ�����顢���Υڡ����κǽ�ޤ��ϺǸ�ˤ��롢
+<em>��������</em>�򥯥�å����Ƥ���������
+���Υܥ���ǡ����ʤ������ꤷ�����Ƥδ��������ˤĤ��ơ�
+���򤷤�ư���������ޤ���
+
+<p><a href="%(summaryurl)s">����ڡ��������</a>��
diff --git a/templates/ja/admindbpreamble.html b/templates/ja/admindbpreamble.html
index 3dc4523a..e79089ae 100644
--- a/templates/ja/admindbpreamble.html
+++ b/templates/ja/admindbpreamble.html
@@ -1,10 +1,10 @@
-���Υڡ�����, ��ǧ�Τ������α����Ƥ���
-<em>%(listname)s</em>�᡼��󥰥ꥹ�Ȥ���Ƥΰ�����ɽ�����ޤ�. 
+���Υڡ����ϡ���ǧ�Τ������α����Ƥ���
+<em>%(listname)s</em>�᡼��󥰥ꥹ�Ȥ���Ƥΰ�����ɽ�����ޤ���
 ���ߤ�ɽ����: %(description)s
 
-<p>���줾��δ����������Ф�����������򤷤Ƥ�������.
-������, <b>��������</b> �ܥ���򥯥�å����Ƥ�������.
-<a href="%(detailsurl)s">�ܤ�������</a> �⤢��ޤ�.
+<p>���줾��δ����������Ф�����������򤷤Ƥ���������
+�����ˡ�<b>��������</b> �ܥ���򥯥�å����Ƥ���������
+<a href="%(detailsurl)s">�ܤ�������</a> �⤢��ޤ���
 
-<p>�ޤ�, ���Ƥδ��������� <a href="%(summaryurl)s">����򸫤�</a>
-���Ȥ�Ǥ��ޤ�.
+<p>�ޤ������Ƥδ��������� <a href="%(summaryurl)s">����򸫤�</a>
+���Ȥ�Ǥ��ޤ���
diff --git a/templates/ja/admindbsummary.html b/templates/ja/admindbsummary.html
index 16f199e8..1d27b41a 100644
--- a/templates/ja/admindbsummary.html
+++ b/templates/ja/admindbsummary.html
@@ -1,12 +1,12 @@
-���Υڡ�����, 
+���Υڡ����ϡ�
 <a href="%(adminurl)s"><em>%(listname)s</em>�᡼��󥰥ꥹ��</a>
-�˴ؤ��뾵ǧ�Ԥ����������������ɽ�����ޤ�. 
-�ǽ��, ��ǧ�Ԥ�������������������, �����ο�����ɽ�����ޤ�.
-���μ���, ��ǧ������뤿�����α����Ƥ�����Ƥ�ɽ�����ޤ�.
+�˴ؤ��뾵ǧ�Ԥ����������������ɽ�����ޤ���
+�ǽ�ˡ���ǧ�Ԥ������������������С������ο�����ɽ�����ޤ���
+���μ��ˡ���ǧ������뤿�����α����Ƥ�����Ƥ�ɽ�����ޤ���
 
-<p>���줾��δ����������Ф�����������򤷤Ƥ�������.
-������, <b>��������</b> �ܥ���򥯥�å����Ƥ�������.
-<a href="%(detailsurl)s">�ܤ�������</a> �⤢��ޤ�.
+<p>���줾��δ����������Ф�����������򤷤Ƥ���������
+�����ˡ�<b>��������</b> �ܥ���򥯥�å����Ƥ���������
+<a href="%(detailsurl)s">�ܤ�������</a> �⤢��ޤ���
 
-<p>�ޤ�, ��α��Ƥ� <a href="%(viewallurl)s">�ܺ٤򸫤�</a>
-���Ȥ�Ǥ��ޤ�.
+<p>�ޤ�����α��Ƥ� <a href="%(viewallurl)s">�ܺ٤򸫤�</a>
+���Ȥ�Ǥ��ޤ���
diff --git a/templates/ja/adminsubscribeack.txt b/templates/ja/adminsubscribeack.txt
index 88a07ab2..3e9b773d 100644
--- a/templates/ja/adminsubscribeack.txt
+++ b/templates/ja/adminsubscribeack.txt
@@ -1,3 +1,3 @@
-%(member)s ���� %(listname)s �����񤷤ޤ���.
+%(member)s ���� %(listname)s �����񤷤ޤ�����
 %(whence)s
 
diff --git a/templates/ja/adminunsubscribeack.txt b/templates/ja/adminunsubscribeack.txt
index 179d8829..d78d6681 100644
--- a/templates/ja/adminunsubscribeack.txt
+++ b/templates/ja/adminunsubscribeack.txt
@@ -1,3 +1,3 @@
-%(member)s ���� %(listname)s ������񤷤ޤ���.
+%(member)s ���� %(listname)s ������񤷤ޤ�����
 %(whence)s
 
diff --git a/templates/ja/admlogin.html b/templates/ja/admlogin.html
index ea98087d..a3a8d707 100644
--- a/templates/ja/admlogin.html
+++ b/templates/ja/admlogin.html
@@ -25,15 +25,15 @@
     </tr>
   </TABLE>
       <p><strong><em>����:</em></strong> 
-      ����������ϥ֥饦���Υ��å�����ͭ���ˤ��Ƥ�������. 
-      ���å�����̵�����ȴ���������ѹ��Ǥ��ޤ���. 
+      ����������ϥ֥饦���Υ��å�����ͭ���ˤ��Ƥ���������
+      ���å�����̵�����ȴ���������ѹ��Ǥ��ޤ���
 
       <p>�������󥿡��ե������Ǥδ������򤹤뤿�Ӥ�ǧ�ڤ��׵�
-      ����ʤ��褦��, ���å���󥯥å�����ȯ�Ԥ��ޤ���
-      ���Υ��å����ϥ֥饦���ν�λ����������Ū��<em>����������</em>
-      �������˼�ưŪ�˼������ޤ���
-      (ǧ�ڤ���λ�����, <em>¾�δ�������</em>�β���
-      ���������ȤΥ�󥯤�ɽ������ޤ�).
+      ����ʤ��褦�ˡ����å���󥯥å�����ȯ�Ԥ��ޤ���
+      ���Υ��å����ϥ֥饦���ν�λ����������Ū��<em>����������</em>
+      �������˼�ưŪ�˼������ޤ���
+      (ǧ�ڤ���λ����ȡ�<em>¾�δ�������</em>�β���
+      ���������ȤΥ�󥯤�ɽ������ޤ�)��
 
 </FORM>
 </body>
diff --git a/templates/ja/approve.txt b/templates/ja/approve.txt
index 4cd63ec0..175185ee 100644
--- a/templates/ja/approve.txt
+++ b/templates/ja/approve.txt
@@ -2,16 +2,16 @@
 
     %(cmd)s
 
-��ꥹ�ȴ����Ԥ�ž�����ޤ���.
+��ꥹ�ȴ����Ԥ�ž�����ޤ�����
 
-����򿽤�������᡼��󥰥ꥹ�Ȥ�, '�ĺ�'�᡼���
-�ꥹ�Ȥ��ä���ǽ��������ޤ�.
+����򿽤�������᡼��󥰥ꥹ�Ȥ���'�ĺ�'�᡼���
+�ꥹ�Ȥ��ä���ǽ��������ޤ���
 
-�����������ϴ����Ԥη�Ѥ����꼡��, �᡼��Ƿ���
-���Τ������ޤ�.
+�����������ϴ����Ԥη�Ѥ����꼡�衢�᡼��Ƿ���
+���Τ������ޤ���
 
-�ꥹ�ȴ����Ԥδ������ˤˤĤ��Ƥμ����,
+�ꥹ�ȴ����Ԥδ������ˤˤĤ��Ƥμ���ϡ�
 
     %(adminaddr)s
 
-���ˤ��ꤤ���ޤ�.
+���ˤ��ꤤ���ޤ���
diff --git a/templates/ja/archidxfoot.html b/templates/ja/archidxfoot.html
index e471cb0d..1a4cbf48 100644
--- a/templates/ja/archidxfoot.html
+++ b/templates/ja/archidxfoot.html
@@ -16,6 +16,6 @@
      <p>
      <hr>
      <i>������¸��ˤ�
-     Pipermail %(version)s �Ǻ�������ޤ���.</i>
+     Pipermail %(version)s ���������ޤ�����</i>
   </BODY>
 </HTML>
diff --git a/templates/ja/archtoc.html b/templates/ja/archtoc.html
index 0060beb3..10e209bf 100644
--- a/templates/ja/archtoc.html
+++ b/templates/ja/archtoc.html
@@ -10,7 +10,7 @@
      <p>
       <a href="%(listinfo)s">�ꥹ�Ȥΰ���</a> *
       <a href="%(fullarch)s">�����Υ᡼���mbox�����ǥ����������</a>
-      (%(size)s).
+      (%(size)s)��
      </p>
      %(noarchive_msg)s
      %(archive_listing_start)s
diff --git a/templates/ja/bounce.txt b/templates/ja/bounce.txt
index 798c5f62..33317b1e 100644
--- a/templates/ja/bounce.txt
+++ b/templates/ja/bounce.txt
@@ -1,12 +1,12 @@
-����� Mailman �᡼��󥰥ꥹ�Ȥ������Բ����ΤǤ�.
+����� Mailman �᡼��󥰥ꥹ�Ȥ������Բ����ΤǤ���
 
     �ꥹ��:     %(listname)s
     ���:       %(addr)s
-    ����:       ����ؤ������� %(negative)s%(did)s.
-    ��ͳ:       ���������̿Ū�������顼.
+    ����:       ����ؤ������� %(negative)s%(did)s��
+    ��ͳ:       ���������̿Ū�������顼��
     %(but)s
 
 %(reenable)s
-�ǽ��������Բ����Τ�ʲ���ź�դ��ޤ�.
+�ǽ��������Բ����Τ�ʲ���ź�դ��ޤ���
 
-���η�˴ؤ������ϡ�Mailman ������ %(owneraddr)s ��Ϣ�����Ƥ�������.
+���η�˴ؤ������ϡ�Mailman ������ %(owneraddr)s ��Ϣ�����Ƥ���������
diff --git a/templates/ja/checkdbs.txt b/templates/ja/checkdbs.txt
index 3b4da3b6..747d29e6 100644
--- a/templates/ja/checkdbs.txt
+++ b/templates/ja/checkdbs.txt
@@ -1,7 +1,7 @@
- %(real_name)s@%(host_name)s �᡼��󥰥ꥹ�Ȥ� %(count)d ��
-��̤��������������ޤ�.
-�ʲ���URL��, �Ǥ�������᤯�������Ƥ���������
+%(real_name)s@%(host_name)s �᡼��󥰥ꥹ�Ȥ� %(count)d ��
+��̤��������������ޤ���
+�ʲ���URL�ǡ��Ǥ�������᤯�������Ƥ���������
 
 	%(adminDB)s
 
-̤�����ο������ĤäƤ���С��������Τ������������ޤ���
+̤�����ο������ĤäƤ���С��������Τ������������ޤ���
diff --git a/templates/ja/convert.txt b/templates/ja/convert.txt
index f38af151..d62a5969 100644
--- a/templates/ja/convert.txt
+++ b/templates/ja/convert.txt
@@ -1,33 +1,33 @@
-%(listname)s �᡼��󥰥ꥹ�Ȥϸ������¤��Ǥ�.
-����, �������᡼��󥰥ꥹ�ȴ����ץ������ "Mailman" ��ȤäƤ��ޤ�.
-����ˤ��, ���ޤǤδ�������͡������꤬��褵����Τȴ�˾���Ƥ���ޤ���
+%(listname)s �᡼��󥰥ꥹ�Ȥϸ������¤��Ǥ���
+���ߡ��������᡼��󥰥ꥹ�ȴ����ץ������ "Mailman" ��ȤäƤ��ޤ���
+����ˤ�ꡢ���ޤǤδ�������͡������꤬��褵����Τȴ�˾���Ƥ���ޤ���
 
 �ɤ�ʱƶ�������ΤǤ��礦��
 
-1) �᡼��󥰥ꥹ�ȤؤΥ᡼��� 
-    %(listaddr)s 
-   �������äƲ�����.
+1) �᡼��󥰥ꥹ�ȤؤΥ᡼���
+    %(listaddr)s
+   �������äƲ�������
 
-2) ��ʬ�ǥѥ���ɤ����ꤷ, ¾�ͤ�����ˤ��ʤ�����񤵤��Ƥ��ޤ�
-   �褦�ʤ��Ȥ��ɤ��ޤ�. �ѥ���ɤ��̤Υ᡼�������ޤ�������, 
-   ���˼�����ä����ȤȻפ��ޤ�. �⤷�ѥ���ɤ�˺��Ƥ�, ���ۤ���
-   ɬ�פϤ���ޤ���. ���ѥ���ɤ��Τ餻����褦�ˤʤäƤ��ޤ�.
+2) ��ʬ�ǥѥ���ɤ����ꤷ��¾�ͤ�����ˤ��ʤ�����񤵤��Ƥ��ޤ�
+   �褦�ʤ��Ȥ��ɤ��ޤ����ѥ���ɤ��̤Υ᡼�������ޤ������顢
+   ���˼�����ä����ȤȻפ��ޤ����⤷�ѥ���ɤ�˺��Ƥ⡢���ۤ���
+   ɬ�פϤ���ޤ������ѥ���ɤ��Τ餻����褦�ˤʤäƤ��ޤ���
 
-3) WWW �˥��������Ǥ����, Web �֥饦���ǥꥹ�Ȥ��������, 
-   �֤ޤȤ��ɤߡץ⡼�ɤؤ��ڤ��ؤ�, �������λ��Ȥʤɤ��Ǥ��ޤ�.
-   Web ���ɥ쥹�ϰʲ��ΤȤ���Ǥ�.
+3) WWW �˥��������Ǥ���С�Web �֥饦���ǥꥹ�Ȥ�������䡢
+   �֤ޤȤ��ɤߡץ⡼�ɤؤ��ڤ��ؤ����������λ��Ȥʤɤ��Ǥ��ޤ���
+   Web ���ɥ쥹�ϰʲ��ΤȤ���Ǥ���
 
     %(listinfo_url)s
 
-4) WWW �˥��������Ǥ��ʤ�����, �᡼���Ȥä�Ʊ�����Ȥ��Ǥ��ޤ�.
-   ��ʸ�ޤ��Ϸ�̾�� help �Ƚ񤤤��᡼��� 
-       %(requestaddr)s 
-   �������äƲ�����. �ؼ������ܤ��줿�᡼�뤬��ưŪ���ֿ�����ޤ�. 
+4) WWW �˥��������Ǥ��ʤ����ϡ��᡼���Ȥä�Ʊ�����Ȥ��Ǥ��ޤ���
+   ��ʸ�ޤ��Ϸ�̾�� help �Ƚ񤤤��᡼���
+       %(requestaddr)s
+   �������äƲ��������ؼ������ܤ��줿�᡼�뤬��ưŪ���ֿ�����ޤ���
 
 ���ο���������ˤĤ��Ƥμ��������˴ؤ���Ϣ����
     %(adminaddr)s
-�ˤ��ꤤ���ޤ�.
+�ˤ��ꤤ���ޤ���
 
-���Υ᡼��� Mailman %(version)s �Ǽ�ưȯ�����줿��ΤǤ�. 
-Mailman �ˤĤ��Ƥ�äȾܤ����Τꤿ������, Mailman �ۡ���ڡ���
-http://www.list.org/ ������������.
+���Υ᡼��� Mailman %(version)s �Ǽ�ưȯ�����줿��ΤǤ���
+Mailman �ˤĤ��Ƥ�äȾܤ����Τꤿ�����ϡ�Mailman �ۡ���ڡ���
+http://www.list.org/ ��������������
diff --git a/templates/ja/cronpass.txt b/templates/ja/cronpass.txt
index 487e1063..e8286e7b 100644
--- a/templates/ja/cronpass.txt
+++ b/templates/ja/cronpass.txt
@@ -1,16 +1,16 @@
 ���Υ᡼��� %(hostname)s �᡼��󥰥ꥹ�Ȥ����
-��ư����������˺���ΤǤ�. 
-�����ѹ��������˻��Ѥ��������󤬵��ܤ���Ƥ��ޤ�.
+��ư����������˺���ΤǤ���
+�����ѹ��������˻��Ѥ��������󤬵��ܤ���Ƥ��ޤ���
 
-Web�֥饦���Ǹ��ߤβ������䡤��񡤤ޤȤ��ɤߤη���, �����ΰ��Ū
-�����, ����¾�Υ��ץ������ѹ����뤳�Ȥ��Ǥ��ޤ�.
+Web�֥饦���Ǹ��ߤβ������䡢��񡢤ޤȤ��ɤߤη����������ΰ��Ū
+����ߡ�����¾�Υ��ץ������ѹ����뤳�Ȥ��Ǥ��ޤ���
 
-Web�֥饦���ʳ���, �Żҥ᡼��Ǥ�����������ѹ����뤳�Ȥ�Ǥ��ޤ�.
-�ܤ�����, �᡼��󥰥ꥹ�ȤΥ��ɥ쥹�� '-request'���դ������ɥ쥹��
-(�㤨�� %(exreq)s )�Υ᡼����ʸ��, 'help'�Ƚ񤤤����äƤ�������. 
-�������ˡ�򵭺ܤ����᡼�뤬��������ޤ�.
+Web�֥饦���ʳ��ˡ��Żҥ᡼��Ǥ�����������ѹ����뤳�Ȥ�Ǥ��ޤ���
+�ܤ����ϡ��᡼��󥰥ꥹ�ȤΥ��ɥ쥹�� '-request'���դ������ɥ쥹��
+(�㤨�� %(exreq)s )�Υ᡼����ʸ�ˡ�'help'�Ƚ񤤤����äƤ���������
+�������ˡ�򵭺ܤ����᡼�뤬��������ޤ���
 
-���䡤���ꡤ�����Ȥʤɤ�, %(owner)s
-���ˤ��ꤤ���ޤ�. 
+���䡢���ꡢ�����Ȥʤɤϡ�%(owner)s
+���ˤ��ꤤ���ޤ���
 
 %(useraddr)s �Υѥ����:
diff --git a/templates/ja/disabled.txt b/templates/ja/disabled.txt
index f446990e..9ea6e2ed 100644
--- a/templates/ja/disabled.txt
+++ b/templates/ja/disabled.txt
@@ -1,24 +1,24 @@
-%(listname)s �᡼��󥰥ꥹ�ȤǤβ������, 
-%(reason)s ���Ū����ߤ���Ƥ��ޤ�. 
-��߲��������Ԥ�ʤ����, ���Υꥹ�Ȥ���Υ᡼���
-�������ޤ���. ����, %(noticesleft)s ��, �����Ʊ�����Τ�
-ȯ�����ޤ���, ����ʹߤ�������֤�Ȥ餻�Ƥ��������ޤ�.
+%(listname)s �᡼��󥰥ꥹ�ȤǤβ��������
+%(reason)s ���Ū����ߤ���Ƥ��ޤ���
+��߲��������Ԥ�ʤ���С����Υꥹ�Ȥ���Υ᡼���
+�������ޤ��󡣤��� %(noticesleft)s �󡢤����Ʊ�����Τ�
+ȯ�����ޤ���������ʹߤ�������֤�Ȥ餻�Ƥ��������ޤ���
 
-��ߤ�������ˤ�, ���Υ᡼����ֿ� (������, Subject: ��
-���ѹ����ʤ��Ǥ�������) ���뤫, �ޤ��ϰʲ��γ�ǧ�ڡ�����
-�����������Ƥ�������.
+��ߤ�������ˤϡ����Υ᡼����ֿ� (��������Subject: ��
+���ѹ����ʤ��Ǥ�������) ���뤫���ޤ��ϰʲ��γ�ǧ�ڡ�����
+�����������Ƥ���������
 
     %(confirmurl)s
 
-�ޤ�, �ʲ��β�����ץ����ڡ�����, �᡼�륢�ɥ쥹���ѹ���
-�ޤȤ��ɤ�, ����¾���������ץ���������Ǥ��ޤ�. 
+�ޤ����ʲ��β�����ץ����ڡ����ǡ��᡼�륢�ɥ쥹���ѹ���
+�ޤȤ��ɤߡ�����¾���������ץ���������Ǥ��ޤ���
 
     %(optionsurl)s
 
-ǰ�Τ���, ���ʤ��Υѥ���ɤϰʲ��ΤȤ���Ǥ�.
+ǰ�Τ��ᡢ���ʤ��Υѥ���ɤϰʲ��ΤȤ���Ǥ���
 
     %(password)s
 
-�������䤬�����, �ꥹ�ȴ����԰��ˤ�Ϣ����������.
+�������䤬����С��ꥹ�ȴ����԰��ˤ�Ϣ������������
 
     %(owneraddr)s
diff --git a/templates/ja/emptyarchive.html b/templates/ja/emptyarchive.html
index 3b1b52bd..bc9077bd 100644
--- a/templates/ja/emptyarchive.html
+++ b/templates/ja/emptyarchive.html
@@ -7,10 +7,10 @@
   <BODY BGCOLOR="#ffffff">
      <h1>%(listname)s ��¸��� </h1>
      <p>
-      �ޤ����Υ᡼��󥰥ꥹ�Ȥ���Ƥ���Ƥ��ʤ�����,
-      ��¸��ˤ϶��Ǥ�. <a href="%(listinfo)s">
+      �ޤ����Υ᡼��󥰥ꥹ�Ȥ���Ƥ���Ƥ��ʤ����ᡢ
+      ��¸��ˤ϶��Ǥ���<a href="%(listinfo)s">
       �ꥹ�Ȥ˴ؤ������Ϥ�����</a>
-      �ˤ���ޤ�.
+      �ˤ���ޤ���
      </p>
   </BODY>
   </HTML>
diff --git a/templates/ja/headfoot.html b/templates/ja/headfoot.html
index c2f3904b..d25f2769 100644
--- a/templates/ja/headfoot.html
+++ b/templates/ja/headfoot.html
@@ -1,26 +1,28 @@
-���Υƥ����Ȥˤ�, �ꥹ�Ȥ�°�����֤���������
-<a href="http://docs.python.org/library/stdtypes.html#string-formatting-operations">
+���Υƥ����Ȥˤϡ��ꥹ�Ȥ�°�����֤���������
+<a href="https://docs.python.org/2/library/stdtypes.html#string-formatting-operations">
 Python�ե����ޥå�ʸ����</a>���������뤳�Ȥ��Ǥ��ޤ���
-�����ǻȤ����ִ�ʸ����ϰʲ����̤�Ǥ���
+(<a href="https://docs.python.org/ja/2.7/library/stdtypes.html#string-formatting-operations">
+���ܸ���</a>)
+�����ǻȤ����ִ�ʸ����ϰʲ����̤�Ǥ���
 
 <ul>
     <li><b>real_name</b> - �ꥹ�ȤΡ֤��줤�ʡ�̾��;
-    ���̤���ʸ���Ⱦ�ʸ���򺮤���ɽ�����줿�ꥹ�Ȥ�̾���ˤʤ�ޤ���
+    ���̤���ʸ���Ⱦ�ʸ���򺮤���ɽ�����줿�ꥹ�Ȥ�̾���ˤʤ�ޤ���
 
-    <li><b>list_name</b> - URL ����ǥꥹ�Ȥ򼨤�̾��.
-    ��ʸ���Ⱦ�ʸ���ΰ㤤�϶��̤���ޤ���(�ߴ����Τ���,
+    <li><b>list_name</b> - URL ����ǥꥹ�Ȥ򼨤�̾����
+    ��ʸ���Ⱦ�ʸ���ΰ㤤�϶��̤���ޤ���(�ߴ����Τ��ᡢ
     _internal_name�Ǥ�Ʊ���ˤʤ�ޤ�)
 
     <li><b>host_name</b> - Mailman����Ư���Ƥ���ۥ��Ȥ�
-    �����ɥᥤ��̾(FQDN).
+    �����ɥᥤ��̾(FQDN)��
 
-    <li><b>web_page_url</b> - Mailman ��� URL.
-    ���Ȥ���, ����URL�� <em>listinfo/%(list_name)s</em> ���դ��ä����
-    �᡼��󥰥ꥹ�Ȥΰ���ڡ����ˤʤ�ޤ���
+    <li><b>web_page_url</b> - Mailman ��� URL��
+    ���Ȥ��С�����URL�� <em>listinfo/%(list_name)s</em> ���դ��ä����
+    �᡼��󥰥ꥹ�Ȥΰ���ڡ����ˤʤ�ޤ���
 
-    <li><b>description</b> - ���Υ᡼��󥰥ꥹ�Ȥδʷ������.
+    <li><b>description</b> - ���Υ᡼��󥰥ꥹ�Ȥδʷ��������
 
-    <li><b>info</b> - ���Υ᡼��󥰥ꥹ�Ȥ�Ĺ������.
+    <li><b>info</b> - ���Υ᡼��󥰥ꥹ�Ȥ�Ĺ��������
 
-    <li><b>cgiext</b> - CGI������ץȤγ�ĥ��.
+    <li><b>cgiext</b> - CGI������ץȤγ�ĥ�ҡ�
 </ul>
diff --git a/templates/ja/help.txt b/templates/ja/help.txt
index 3f80e4d5..218200e9 100644
--- a/templates/ja/help.txt
+++ b/templates/ja/help.txt
@@ -1,33 +1,33 @@
 %(listname)s �᡼��󥰥ꥹ�ȤΥإ��:
 
 �᡼��󥰥ꥹ�ȴ����ץ������ Mailman �� %(version)s �ǤΥ᡼�륳�ޥ�
-�ɡ��إ�פǤ�. �ʲ��Υ��ޥ�ɤ� Mailman����Ͽ����Ƥ����������
-���ꡤ��ʬ�β��������ѹ����뤳�Ȥ��Ǥ��ޤ���
-���ޥ�ɤϡַ�̾��Subject:�ˡפǻ��ꤹ�뤫��ʸ�˽񤭹��ߤޤ���
+�ɡ��إ�פǤ����ʲ��Υ��ޥ�ɤ� Mailman����Ͽ����Ƥ����������
+���ꡢ��ʬ�β��������ѹ����뤳�Ȥ��Ǥ��ޤ���
+���ޥ�ɤϡַ�̾��Subject:�ˡפǻ��ꤹ�뤫��ʸ�˽񤭹��ߤޤ���
 
-���ޥ�ɤΤۤȤ�ɤ�, Web�֥饦���ǰʲ��Υ��ɥ쥹�˥�������������
-�뤳�Ȥ�Ǥ��ޤ���
+���ޥ�ɤΤۤȤ�ɤϡ�Web�֥饦���ǰʲ��Υ��ɥ쥹�˥�������������
+�뤳�Ȥ�Ǥ��ޤ���
 
     %(listinfo_url)s
 
-�ѥ���ɤ��狼��ʤ��ʤä��Ȥ���, Web�Υڡ��������������ɥ쥹����
-�ѥ���ɤ����餻�뤳�Ȥ��Ǥ��ޤ���
+�ѥ���ɤ��狼��ʤ��ʤä��Ȥ��⡢Web�Υڡ��������������ɥ쥹����
+�ѥ���ɤ����餻�뤳�Ȥ��Ǥ��ޤ���
 
-���줾��Υ᡼��󥰥ꥹ�Ȥǻ��Ѥ��륳�ޥ�� (subscribe, who, ��) ��, 
+���줾��Υ᡼��󥰥ꥹ�Ȥǻ��Ѥ��륳�ޥ�� (subscribe, who, ��) �ϡ�
 �᡼��󥰥ꥹ�ȤΥ��ɥ쥹�� -request ���դ����᡼�륢�ɥ쥹�����äƤ�
-�����������Ȥ��С�'mailman' �Ȥ����᡼��󥰥ꥹ�ȤؤΥ��ޥ�ɥ᡼���, 
-'mailman-request@�ɥᥤ��̾' ��������ޤ�.
+�����������Ȥ��С�'mailman' �Ȥ����᡼��󥰥ꥹ�ȤؤΥ��ޥ�ɥ᡼��ϡ�
+'mailman-request@�ɥᥤ��̾' ��������ޤ���
 
-�ʲ��Υ��ޥ�ɤε�����, < > �ǰϤ�����ܤϾ�ά�Ǥ��ޤ���
-[ ] �ǰϤ�����ܤϾ�ά���뤳�Ȥ��Ǥ��ޤ����ʤ�, < > �� [ ] ��ʸ����,
-���ޥ�ɤ�����ʤ��Ǥ���������
+�ʲ��Υ��ޥ�ɤε����桢 < > �ǰϤ�����ܤϾ�ά�Ǥ��ޤ���
+[ ] �ǰϤ�����ܤϾ�ά���뤳�Ȥ��Ǥ��ޤ����ʤ��� < > �� [ ] ��ʸ���ϡ�
+���ޥ�ɤ�����ʤ��Ǥ���������
 
 �ʲ��Υ��ޥ�ɤ����Ѥ��뤳�Ȥ��Ǥ��ޤ�:
 
     %(commands)s
 
-���ޥ�ɤ� %(requestaddr)s �����äƤ���������
+���ޥ�ɤ� %(requestaddr)s �����äƤ���������
 
 �䤤��碌��
     %(adminaddr)s
-�������äƤ���������
+�������äƤ���������
diff --git a/templates/ja/invite.txt b/templates/ja/invite.txt
index 1ed318d0..85ae95d2 100644
--- a/templates/ja/invite.txt
+++ b/templates/ja/invite.txt
@@ -1,23 +1,23 @@
 %(hostname)s �DZ��Ѥ���Ƥ��� %(listname)s �᡼���
-�ꥹ�Ȥδ����Ԥ� "%(email)s" ��������Ԥ��Ƥ��ޤ�.
+�ꥹ�Ȥδ����Ԥ� "%(email)s" ��������Ԥ��Ƥ��ޤ���
 
-���ξ��Ԥ˱����� %(listname)s �᡼��󥰥ꥹ�Ȥ˻��ä�������, 
-���Υ᡼���Subject: (��̾)���ѹ��������ֿ����뤫, �ޤ��ϰʲ���
-Web�ڡ����˥����������Ƥ�������.
+���ξ��Ԥ˱����� %(listname)s �᡼��󥰥ꥹ�Ȥ˻��ä������ϡ�
+���Υ᡼���Subject: (��̾)���ѹ��������ֿ����뤫���ޤ��ϰʲ���
+Web�ڡ����˥����������Ƥ���������
 
     %(confirmurl)s
 
-���Τۤ�, �ʲ��Σ��Ԥ�����᡼��˽񤤤�,
-%(requestaddr)s ������������ˡ�⤢��ޤ�.
+���Τۤ����ʲ��Σ��Ԥ�����᡼��˽񤤤ơ�
+%(requestaddr)s ������������ˡ�⤢��ޤ���
 
     confirm %(cookie)s
 
-�ۤȤ�ɤΥ᡼�륽�եȤǤ�, ñ�ˤ��Υ᡼����Ф��ơ��ֿ������򤹤��
-����, ���ξ��Ԥ˱����뤳�Ȥ��Ǥ���Ϥ��Ǥ�.
+�ۤȤ�ɤΥ᡼�륽�եȤǤϡ�ñ�ˤ��Υ᡼����Ф��ơ��ֿ������򤹤��
+���ǡ����ξ��Ԥ˱����뤳�Ȥ��Ǥ���Ϥ��Ǥ���
 
-���Ԥ��Ǥ�, �᡼��󥰥ꥹ�Ȥ˻��ä��ʤ�����, ���Υ᡼���̵�뤷�Ƥ�
-������. 
+���Ԥ��Ǥꡢ�᡼��󥰥ꥹ�Ȥ˻��ä��ʤ����ϡ����Υ᡼���̵�뤷�Ƥ�
+��������
 
 ���Υ᡼��˴ؤ��뤴�����
     %(listowner)s
-���ˤ����꤯������.
+���ˤ����꤯��������
diff --git a/templates/ja/listinfo.html b/templates/ja/listinfo.html
index dfe50760..288f51cd 100644
--- a/templates/ja/listinfo.html
+++ b/templates/ja/listinfo.html
@@ -3,7 +3,7 @@
 <HTML>
   <HEAD>
     <TITLE><MM-List-Name> ����ڡ���</TITLE>
-  
+
   </HEAD>
   <BODY BGCOLOR="#ffffff">
 
@@ -33,9 +33,9 @@
 	    <tr>
 	      <td colspan="2">
 		<P><MM-List-Info></P>
-	  <p> ���Υ᡼��󥰥ꥹ�Ȥ���Ƥ��줿���Υ᡼���,
+	  <p> ���Υ᡼��󥰥ꥹ�Ȥ���Ƥ��줿���Υ᡼��ϡ�
 	      <MM-Archive><MM-List-Name>
-		  ��¸���</MM-Archive>����������.
+		  ��¸���</MM-Archive>������������
 	      <MM-Restricted-List-Message>
 	  </p>
 	</TD>
@@ -47,12 +47,12 @@
       </TR>
       <tr>
 	<td colspan="2">
-	  �᡼��󥰥ꥹ�Ȥ������������᡼���, 
+	  �᡼��󥰥ꥹ�Ȥ������������᡼��ϡ�
 	  <A HREF="mailto:<MM-Posting-Addr>"><MM-Posting-Addr></A>
-          �Υ��ɥ쥹�����������Ƥ�������.
+          �Υ��ɥ쥹�����������Ƥ���������
 
-	  <p>�᡼��󥰥ꥹ�Ȥ�����丽�ߤβ�����ץ������ѹ���, 
-          �ʲ��Υե���������Ѥ�������.
+	  <p>�᡼��󥰥ꥹ�Ȥ�����丽�ߤβ�����ץ������ѹ��ϡ�
+          �ʲ��Υե���������Ѥ���������
 	</td>
       </tr>
       <TR>
@@ -63,8 +63,8 @@
       <tr>
 	<td colspan="2">
 	  <P>
-	    <MM-List-Name> �ؤ������, 
-            �ʲ��Υե������ɬ�׻���������Ƥ�������. 
+	    <MM-List-Name> �ؤ�����ϡ�
+            �ʲ��Υե������ɬ�׻���������Ƥ���������
 	  <MM-List-Subscription-Msg>
 	  <ul>
     <MM-Subscribe-Form-Start>
@@ -81,24 +81,24 @@
 	<TD WIDTH="12%">&nbsp;</TD></TR>
       <TR>
 	<TD COLSPAN="3"><FONT SIZE=-1>������ݸ�˻Ȥ��ѥ���ɤ�
-	���ꤹ�뤳�Ȥ�Ǥ��ޤ�. ���٤ʥ������ƥ��ǤϤ���ޤ���,
-	¾�ͤ˲��������ѹ�����뤳�Ȥ��ɤ����ȤϤǤ���Ϥ��Ǥ�. 
-	���Υѥ���ɤ�, �Ź沽�����˥᡼�������������礬����ޤ�
-	�Τ�, �����ƥ�ѥ���ɤʤɤ� <b>���פʥѥ���ɤ���ꤷ�ʤ�
-	</b>�褦�ˤ��Ƥ�������.
+	���ꤹ�뤳�Ȥ�Ǥ��ޤ������٤ʥ������ƥ��ǤϤ���ޤ��󤬡�
+	¾�ͤ˲��������ѹ�����뤳�Ȥ��ɤ����ȤϤǤ���Ϥ��Ǥ���
+	���Υѥ���ɤϡ��Ź沽�����˥᡼�������������礬����ޤ�
+	�Τǡ������ƥ�ѥ���ɤʤɤ� <b>���פʥѥ���ɤ���ꤷ�ʤ�
+	</b>�褦�ˤ��Ƥ���������
 	<br>
-	�ѥ���ɤ����ꤵ��ʤ��ä����, �ѥ���ɤ�ưŪ����������
-	�����ǧ��˥᡼������դ��ޤ�. 
-	���ĤǤ⤳�Υѥ���ɤ�᡼��Ǽ��󤻤뤳�Ȥ��Ǥ��ޤ�.
+	�ѥ���ɤ����ꤵ��ʤ��ä���硢�ѥ���ɤ�ưŪ����������
+	�����ǧ��˥᡼������դ��ޤ���
+	���ĤǤ⤳�Υѥ���ɤ�᡼��Ǽ��󤻤뤳�Ȥ��Ǥ��ޤ���
 	    <MM-Reminder>
 	    </font>
 	</TD>
-      </TR>  
+      </TR>
       <TR>
 	<TD BGCOLOR="#dddddd">�ѥ���ɤ����Ϥ��Ƥ�������:</TD>
 	<TD><MM-New-Password-Box></TD>
 	<TD>&nbsp;</TD></TR>
-      <TR> 
+      <TR>
 	<TD BGCOLOR="#dddddd">��ǧ�Τ���Ʊ���ѥ���ɤ������:</TD>
 	<TD><MM-Confirm-Password></TD>
 	<TD>&nbsp; </TD></TR>
diff --git a/templates/ja/masthead.txt b/templates/ja/masthead.txt
index fe68477b..4dfa3e5f 100644
--- a/templates/ja/masthead.txt
+++ b/templates/ja/masthead.txt
@@ -1,15 +1,15 @@
-%(real_name)s �᡼��󥰥ꥹ�Ȥؤ���Ƥϰʲ��Υ��ɥ쥹�����äƤ���������
+%(real_name)s �᡼��󥰥ꥹ�Ȥؤ���Ƥϰʲ��Υ��ɥ쥹�����äƤ���������
 	%(got_list_email)s
 
-Web�֥饦����Ȥä�����񤹤�ˤϰʲ���URL�ˤɤ�����
+Web�֥饦����Ȥä�����񤹤�ˤϰʲ���URL�ˤɤ�����
 	%(got_listinfo_url)s
-�᡼���Ȥ���硤��̾(Subject:)�ޤ�����ʸ�� help �Ƚ񤤤ưʲ���
-���ɥ쥹���������Ƥ���������
+�᡼���Ȥ���硢��̾(Subject:)�ޤ�����ʸ�� help �Ƚ񤤤ưʲ���
+���ɥ쥹���������Ƥ���������
 	%(got_request_email)s
 
-�᡼��󥰥ꥹ�Ȥδ����Ԥؤ�Ϣ���ϡ��ʲ��Υ��ɥ쥹�ˤ��ꤤ���ޤ�.
+�᡼��󥰥ꥹ�Ȥδ����Ԥؤ�Ϣ���ϡ��ʲ��Υ��ɥ쥹�ˤ��ꤤ���ޤ���
 	%(got_owner_email)s
 
-�ֿ������硤��̾���ľ�������Ƥ��狼��褦�ˤ��Ƥ���������
-���Τޤޤ��ȡ��ʲ��Τ褦�ˤʤäƤ��ޤ��ޤ���
+�ֿ������硢��̾���ľ�������Ƥ��狼��褦�ˤ��Ƥ���������
+���Τޤޤ��ȡ��ʲ��Τ褦�ˤʤäƤ��ޤ��ޤ���
 "Re: %(real_name)s �ޤȤ��ɤ�, XX �� XX ��"
diff --git a/templates/ja/newlist.txt b/templates/ja/newlist.txt
index fd57dcc9..187a01fd 100644
--- a/templates/ja/newlist.txt
+++ b/templates/ja/newlist.txt
@@ -1,35 +1,35 @@
-`%(listname)s' �᡼��󥰥ꥹ�Ȥ���������ޤ�����
-�ʲ��ϡ����Υ᡼��󥰥ꥹ�Ȥδ���Ū�ʾ���Ǥ���
+`%(listname)s' �᡼��󥰥ꥹ�Ȥ���������ޤ�����
+�ʲ��ϡ����Υ᡼��󥰥ꥹ�Ȥδ���Ū�ʾ���Ǥ���
 
 �᡼��󥰥ꥹ�ȤΥѥ����:
 
     %(password)s
 
-�᡼��󥰥ꥹ�Ȥ������Ԥ��ˤϤ��Υѥ���ɤ�ɬ�פǤ���
-�ޤ���ȯ�������¤�����ꥹ�Ȥؤ���Ƥ�ǧ������ʤɡ�������ο�����
-��������ݤˤ�ɬ�פˤʤ�ޤ���
+�᡼��󥰥ꥹ�Ȥ������Ԥ��ˤϤ��Υѥ���ɤ�ɬ�פǤ���
+�ޤ���ȯ�������¤�����ꥹ�Ȥؤ���Ƥ�ǧ������ʤɡ�������ο�����
+��������ݤˤ�ɬ�פˤʤ�ޤ���
 
-�᡼��󥰥ꥹ�Ȥ�����ϰʲ��� Web �ڡ����ǹԤ����Ȥ��Ǥ��ޤ���
+�᡼��󥰥ꥹ�Ȥ�����ϰʲ��� Web �ڡ����ǹԤ����Ȥ��Ǥ��ޤ���
 
     %(admin_url)s
 
-���̤Υꥹ�Ȳ���Ѥ� Web�ڡ����ϡ��ʲ���URL�ˤʤ�ޤ���
+���̤Υꥹ�Ȳ���Ѥ� Web�ڡ����ϡ��ʲ���URL�ˤʤ�ޤ���
 
     %(listinfo_url)s
 
-HTML���μ�����������, ������ Web�ڡ�����ꥹ������ڡ������ѹ�����
-���Ȥ�Ǥ��ޤ���
+HTML���μ����������ϡ������� Web�ڡ�����ꥹ������ڡ������ѹ�����
+���Ȥ�Ǥ��ޤ���
 
-���̤β��������, �᡼��ˤ�륳�ޥ�ɡ����󥿡��ե������⤢��ޤ���
+���̤β�������ˡ��᡼��ˤ�륳�ޥ�ɡ����󥿡��ե������⤢��ޤ���
 �ʴ������ѤΥ��ޥ�ɡ����󥿡��ե������Ϥ���ޤ����
-���ޥ�ɡ����󥿡��ե������˴ؤ�������, ��̾�ޤ�����ʸ�� help �Ƚ�
-�ưʲ��Υ��ɥ쥹�˥᡼������äƤ�������.
+���ޥ�ɡ����󥿡��ե������˴ؤ������ϡ���̾�ޤ�����ʸ�� help �Ƚ�
+�ưʲ��Υ��ɥ쥹�˥᡼������äƤ���������
 
     %(requestaddr)s
 
-�������񤵤����硤listinfo �Υڡ����Dz���Υ᡼�륢�ɥ쥹�����Ϥ���
-�ѥ���ɤ˴����ѤΥѥ���ɤ����Ϥ��뤳�Ȥ��Ǥ��ޤ����ޤ�, �ޤȤ���
-�ߤ������������ߤʤɤβ�����ץ������ѹ��Ǥ��ޤ���
+�������񤵤����硢listinfo �Υڡ����Dz���Υ᡼�륢�ɥ쥹�����Ϥ���
+�ѥ���ɤ˴����ѤΥѥ���ɤ����Ϥ��뤳�Ȥ��Ǥ��ޤ����ޤ����ޤȤ���
+�ߤ������������ߤʤɤβ�����ץ������ѹ��Ǥ��ޤ���
 
 ���䤬�����  %(siteowner)s
-�ޤǤɤ�����
+�ޤǤɤ�����
diff --git a/templates/ja/nomoretoday.txt b/templates/ja/nomoretoday.txt
index e4b07274..585e8598 100644
--- a/templates/ja/nomoretoday.txt
+++ b/templates/ja/nomoretoday.txt
@@ -1,7 +1,7 @@
-`%(sender)s' ����Υ᡼���, %(listname)s �᡼��󥰥ꥹ�Ȥ���μ�ư��
-�����׵᤬����ޤ���. ����, Ʊ���׵�� %(num)s �̼�����äƤ��ޤ�.
-��ư�����ƥ�ˤ��᡼��Υ롼�פʤɤΥȥ�֥���򤱤뤿���, ������
-����ʾ�μ�ư����������ޤ���. ����, �⤦���٤��ľ���Ƥ�������.
+`%(sender)s' ����Υ᡼��ǡ�%(listname)s �᡼��󥰥ꥹ�Ȥ���μ�ư��
+�����׵᤬����ޤ�����������Ʊ���׵�� %(num)s �̼�����äƤ��ޤ���
+��ư�����ƥ�ˤ��᡼��Υ롼�פʤɤΥȥ�֥���򤱤뤿��ˡ�������
+����ʾ�μ�ư����������ޤ����������⤦���٤��ľ���Ƥ���������
 
-���Υ᡼�뤬�ְ�ä���������Ƥ���Ȼפ�����, �ޤ��Ϥ������, 
-%(owneremail)s �ˤ��ꤤ���ޤ�.
+���Υ᡼�뤬�ְ�ä���������Ƥ���Ȼפ����硢�ޤ��Ϥ�����ϡ�
+%(owneremail)s �ˤ��ꤤ���ޤ���
diff --git a/templates/ja/options.html b/templates/ja/options.html
index 03a0db5f..4da2afa0 100644
--- a/templates/ja/options.html
+++ b/templates/ja/options.html
@@ -16,7 +16,7 @@
 <table width="100%" border="0" cellspacing="5" cellpadding="5">
     <tr><td>
         <b><MM-List-Name> �᡼��󥰥ꥹ�ȤǤ�<MM-Presentable-User></b> �����
-        �������������ѥ���ɡ����ץ��������������
+        �������������ѥ���ɡ����ץ��������������
         </td><td><MM-Form-Start><mm-logout-button><MM-Form-End></td>
     </tr><tr>
         <td colspan="2">
@@ -77,7 +77,7 @@
 </table>
 
 <p>
-<TABLE WIDTH="100%" BORDER="0" CELLSPACING=5" CELLPADDING="5">
+<TABLE WIDTH="100%" BORDER="0" CELLSPACING="5" CELLPADDING="5">
     <TR><TD WIDTH="50%" BGCOLOR="#FFF0D0"><FONT COLOR="#000000">
         <B><MM-List-Name> ����񤹤�</B></td>
 
@@ -87,8 +87,8 @@
 
     <tr><td>
         ��񤹤�ˤϳ�ǧ�ܥå���������å����ơ�����
-        �ܥ���򥯥�å����Ƥ�������. <strong>�ٹ�:</strong>
-        �����ľ��������³����λ���ޤ�. 
+        �ܥ���򥯥�å����Ƥ���������<strong>�ٹ�:</strong>
+        �����ľ��������³����λ���ޤ���
         <p>
         <center><MM-Unsubscribe-Button></center></td>
     <td>
@@ -98,7 +98,7 @@
 
         <p>
         <center><MM-Other-Subscriptions-Submit></center>
-	</TD></TR> 
+	</TD></TR>
 </table>
 
 <TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="5">
@@ -126,7 +126,7 @@
                 ���ѥ����:</div></TD>
 	        <TD><MM-New-Pass-Box></TD>
                 </TR>
-            <TR> 
+            <TR>
 	        <TD BGCOLOR="#dddddd"><div align="right">
                 ��ǧ�Ѻ�����:</div></TD>
 	        <TD><MM-Confirm-Pass-Box></TD>
@@ -141,14 +141,14 @@
 <TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="5">
     <TR><TD WIDTH="100%" BGCOLOR="#FFF0D0"><FONT COLOR="#000000">
         <B><MM-List-Name> �β�����ץ����</B>
-	</FONT></TD></TR> 
+	</FONT></TD></TR>
 </table>
 
 <p>
-<i><strong>���ߤ����꤬�����å�����Ƥ��ޤ�.</strong></i>
-<p><em>��������</em>�Υ����å��ܥå���������å������,
+<i><strong>���ߤ����꤬�����å�����Ƥ��ޤ���</strong></i>
+<p><em>��������</em>�Υ����å��ܥå���������å�����ȡ�
 ���񤷤Ƥ���<mm-host>�����᡼��󥰥ꥹ�ȤǤ�������ѹ����뤳�Ȥ��Ǥ��ޤ���
-���<em>¾�Υ᡼��󥰥ꥹ�Ȥؤ��������</em>��, 
+���<em>¾�Υ᡼��󥰥ꥹ�Ȥؤ��������</em>�ǡ�
 ��ʬ�����񤷤Ƥ���᡼��󥰥ꥹ�Ȥ�Ĵ�٤뤳�Ȥ��Ǥ��ޤ���
 <p>
 <TABLE BORDER="0" CELLSPACING="2" CELLPADDING="3" WIDTH="100%">
@@ -158,7 +158,7 @@
         �᡼��󥰥ꥹ�Ȥ���Ƥ��줿�᡼��������򳫻Ϥ�����Ȥ��ϡ�
 	���Υ��ץ�����<em>ͭ��</em>�ˤ��ޤ���<em>���</em>�����֤ȡ�
         ���Ū�˥᡼���������ߤ�뤳�Ȥ��Ǥ��ޤ�
-        (�㤨��û���֤εٲ���ʤ�). ��������ߤ����Ȥ��ϡ�
+        (�㤨��û���֤εٲ���ʤ�)����������ߤ����Ȥ��ϡ�
         �ٲˤ�����ä���ͭ�������ꤷľ�����Ȥ�˺��ʤ���
         </td><td bgcolor="#cccccc">
         <mm-delivery-enable-button> ͭ��<br>
@@ -169,9 +169,9 @@
 <!--Start-Digests-Delete-->
     <tr><TD BGCOLOR="#cccccc">
         <strong> �ޤȤ��ɤߥ⡼�ɤ�����</strong> <br>
-        ͭ�� �����֤�, ��ƤΤ��Ӥ˥᡼������餺�����٤ƤΥ᡼���
+        ͭ�� �����֤ȡ���ƤΤ��Ӥ˥᡼������餺�����٤ƤΥ᡼���
 	����1�̤ˤޤȤ�ƥ᡼�뤬�Ϥ��ޤ����ޤȤ��ɤߥ⡼�ɤ������
-        ͭ�� ���� ̵�� ���ѹ�����ȡ��Ǹ��1�̤ΤޤȤ�᡼�뤬�����ޤ���
+        ͭ�� ���� ̵�� ���ѹ�����ȡ��Ǹ��1�̤ΤޤȤ�᡼�뤬�����ޤ���
         </td><td bgcolor="#cccccc">
         <MM-Undigest-Radio-Button> ̵��<br>
         <MM-Digest-Radio-Button> ͭ��
@@ -182,7 +182,7 @@
 	ʿʸ�ޤ���MIME��ź�եե����������</strong><p>
         �᡼�륽�եȤˤ�äƤ� MIME�����ǤޤȤ��ɤߥ᡼����ɤ�ʤ�
         ��Τ⤢��ޤ�������Ū�ˤ�MIME���������������Ǥ�����
-        MIME�����Υ᡼�뤬�ɤ�ʤ�����ʿʸ������Ǥ���������
+        MIME�����Υ᡼�뤬�ɤ�ʤ�����ʿʸ������Ǥ���������
         </td><td bgcolor="#cccccc">
         <MM-Mime-Digests-Button> MIME <br>
         <MM-Plain-Digests-Button> ʿʸ <p>
@@ -202,9 +202,9 @@
 
     <tr><TD BGCOLOR="#cccccc">
         <strong> �ꥹ�Ȥؤ���Ƥ��Ф����ǧ���Τ�ɬ�פǤ���?</strong><p>
-        </td><td bgcolor="#cccccc"> 
+        </td><td bgcolor="#cccccc">
         <mm-dont-ack-posts-button> ������<br>
-        <mm-ack-posts-button> �Ϥ� 
+        <mm-ack-posts-button> �Ϥ�
         </td></tr>
 
     <tr><td bgcolor="#cccccc">
@@ -269,14 +269,14 @@
         <strong>��ʣ�����᡼���������ʤ��褦�ˤ��ޤ���?</strong><p>
 
             ��ʬ���ȤΥ��ɥ쥹��<tt>To:</tt>�ޤ���<tt>Cc:</tt>�إå���
-            �ޤޤ�Ƥ���Ȥ���, �᡼��󥰥ꥹ�Ȥ���Υ᡼���������ʤ�
-            �褦�ˤ��뤳�Ȥ��Ǥ��ޤ�. 
-            <em>�Ϥ�</em>�����֤ȡ���ʣ����᡼���������ޤ���.
-            <em>������</em>�����֤ȡ���ʣ����᡼���������ޤ�.
+            �ޤޤ�Ƥ���Ȥ��ϡ��᡼��󥰥ꥹ�Ȥ���Υ᡼���������ʤ�
+            �褦�ˤ��뤳�Ȥ��Ǥ��ޤ���
+            <em>�Ϥ�</em>�����֤ȡ���ʣ����᡼���������ޤ���
+            <em>������</em>�����֤ȡ���ʣ����᡼���������ޤ���
 
-            <p>�ꥹ�Ȥ��Ŀ��������⡼�ɤˤʤäƤ�����,
+            <p>�ꥹ�Ȥ��Ŀ��������⡼�ɤˤʤäƤ����硢
             �֤������פ����֤� <tt>X-Mailman-Copy: yes</tt> �Ȥ���
-            �إå����դ��褦�ˤʤ�ޤ�.
+            �إå����դ��褦�ˤʤ�ޤ���
 
         </td><td bgcolor="#cccccc">
         <mm-receive-duplicates-button>������<br>
diff --git a/templates/ja/postauth.txt b/templates/ja/postauth.txt
index 200f1fdd..bb3103ce 100644
--- a/templates/ja/postauth.txt
+++ b/templates/ja/postauth.txt
@@ -5,6 +5,6 @@
     ��̾:    %(subject)s
     ��ͳ:    %(reason)s
 
-Ŭ���ʻ��˰ʲ��� URL �Ǿ�ǧ��Ȥ򤷤Ƥ���������
+Ŭ���ʻ��˰ʲ��� URL �Ǿ�ǧ��Ȥ򤷤Ƥ���������
 
     %(admindb_url)s
diff --git a/templates/ja/private.html b/templates/ja/private.html
index cee73eb7..a0da2abd 100644
--- a/templates/ja/private.html
+++ b/templates/ja/private.html
@@ -9,7 +9,7 @@
   <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
     <TR>
       <TD COLSPAN="2" WIDTH="100%%" BGCOLOR="#99CCFF" ALIGN="CENTER">
-	<B><FONT COLOR="#000000" SIZE="+1">%(realname)s 
+	<B><FONT COLOR="#000000" SIZE="+1">%(realname)s
 	    ���������¸��� ǧ��</FONT></B>
       </TD>
     </TR>
@@ -29,26 +29,28 @@
     </tr>
   </TABLE>
       <p><strong><em>����:</em></strong>
-      ����������ϥ֥饦���Υ��å�����ͭ���ˤ��Ƥ�������.
-      ���å�����̵������������ѹ��Ǥ��ޤ���.
+      ����������ϥ֥饦���Υ��å�����ͭ���ˤ��Ƥ���������
+      ���å�����̵���������Τ��Ӥ�ǧ�ڤ��׵ᤵ��ޤ���
 
       <p>���������¸��˥��󥿡��ե������Ǥ����򤹤뤿�Ӥ�ǧ�ڤ��׵�
-      ����ʤ��褦��, ���å���󥯥å�����ȯ�Ԥ��ޤ���
-      ���Υ��å����ϥ֥饦���ν�λ���˼�ưŪ�˼������ޤ���
+      ����ʤ��褦�ˡ����å���󥯥å�����ȯ�Ԥ��ޤ���
+      ���Υ��å����ϥ֥饦���ν�λ���˼�ưŪ�˼������ޤ���
+      �ޤ���������ץ����Υڡ����˰�ư����<em>����������</em>
+      �ܥ���򲡤����Ȥ��ۤ˥��å������˴����뤳�Ȥ�Ǥ��ޤ���
       <p>
     <TABLE WIDTH="100%%" BORDER="0" CELLSPACING="4" CELLPADDING="5">
     <TR>
       <TD COLSPAN="2" WIDTH="100%%" BGCOLOR="#99CCFF" ALIGN="CENTER">
-	<B><FONT COLOR="#000000" SIZE="+1">Password Reminder</FONT></B>
+	<B><FONT COLOR="#000000" SIZE="+1">�ѥ������˺����</FONT></B>
       </TD>
     </TR>
     <tr>
-      <td>If you don't remember your password, enter your email address
-          above and click the <em>Remind</em> button and your
-          password will be emailed to you.</td>
+      <td>�ѥ���ɤ��狼��ʤ��Ȥ��ϡ���Υե�����˥᡼�륢�ɥ쥹�������
+          <em>��˺����</em>�ܥ���򲡤��Ʋ�������
+          �᡼��ǥѥ���ɤ�����ޤ���</td>
     </tr>
     <tr>
-      <td><center><INPUT name="login-remind" type="SUBMIT" value="Remind" ></center></td>
+      <td><center><INPUT name="login-remind" type="SUBMIT" value="��˺����" ></center></td>
     </tr>
   </TABLE>
 </FORM>
diff --git a/templates/ja/probe.txt b/templates/ja/probe.txt
index 63d14d76..dbdfc0e7 100644
--- a/templates/ja/probe.txt
+++ b/templates/ja/probe.txt
@@ -1,23 +1,23 @@
-�����õ���᡼��Ǥ�. ̵�뤷�Ƥ��ޤ��ޤ���.
+�����õ���᡼��Ǥ���̵�뤷�Ƥ��ޤ��ޤ���
 
-%(listname)s �᡼��󥰥ꥹ�ȤǤ�, ���ʤ����� �������顼���Τ� ���٤�������
-�ޤ���. �����, %(address)s �ؤΥ᡼�������� ���꤬����Ȥ������ȤǤ�.
-�������顼���Τ� ����ץ�� ź�դ��Ƥ���ޤ�. �᡼���Ĵ�٤�, 
-�᡼�륢�ɥ쥹�� ���꤬�ʤ��� ��ǧ���Ƥ�������. ����������, ���ʤ���
-�᡼�륷���ƥ�����Ԥ� �ҤͤƤߤƤ�������.
+%(listname)s �᡼��󥰥ꥹ�ȤǤϡ����ʤ����� �������顼���Τ� ���٤�������
+�ޤ���������ϡ� %(address)s �ؤΥ᡼�������� ���꤬����Ȥ������ȤǤ���
+�������顼���Τ� ����ץ�� ź�դ��Ƥ���ޤ����᡼���Ĵ�٤ơ�
+�᡼�륢�ɥ쥹�� ���꤬�ʤ��� ��ǧ���Ƥ������������������ϡ����ʤ���
+�᡼�륷���ƥ�����Ԥ� �ҤͤƤߤƤ���������
 
-�⤷, ���ʤ������Υ᡼��� �ɤ�Ǥ���ʤ�, �᡼��󥰥ꥹ�Ȥ� ��������Ȥ���
-���� ���뤳�Ȥ� ����ޤ���. �⤷, ���Υ᡼�뤬 ���顼�ˤʤä���,
-���ʤ��� �ɤळ�Ȥ�̵���Ǥ��礦����, ������ ��ߤ���ޤ�. �̾�, �������
-�Ȥʤä�����ˤ�, ����, �����Ƴ���¥�� �᡼�뤬��������ޤ�.
+�⤷�����ʤ������Υ᡼��� �ɤ�Ǥ���ʤ顢�᡼��󥰥ꥹ�Ȥ� ��������Ȥ���
+���� ���뤳�Ȥ� ����ޤ��󡣤⤷�����Υ᡼�뤬 ���顼�ˤʤä��顢
+���ʤ��� �ɤळ�Ȥ�̵���Ǥ��礦���顢������ ��ߤ���ޤ����̾�������
+�Ȥʤä�����ˤϡ������������Ƴ���¥�� �᡼�뤬��������ޤ���
 
 ���ʤ��ϲ�����ץ����ڡ���
 
     %(optionsurl)s
 
-�عԤä�, �͡��� �������ץ����� �ѹ����뤳�Ȥ� �Ǥ��ޤ�. �㤨��, 
-�᡼�륢�ɥ쥹�Ȥ� �ޤȤ��ɤߤˤ��뤫 �ʤɤǤ�.
+�عԤäơ��͡��� �������ץ����� �ѹ����뤳�Ȥ� �Ǥ��ޤ����㤨�С�
+�᡼�륢�ɥ쥹�Ȥ� �ޤȤ��ɤߤˤ��뤫 �ʤɤǤ���
 
-�⤷, ��������� ���꤬�����, �ꥹ�ȴ����ԤΥ��ɥ쥹�� �᡼�뤷�Ƥ�������.
+�⤷����������� ���꤬����С��ꥹ�ȴ����ԤΥ��ɥ쥹�� �᡼�뤷�Ƥ���������
 
     %(owneraddr)s
diff --git a/templates/ja/roster.html b/templates/ja/roster.html
index 5c484c9d..b0ca54c9 100644
--- a/templates/ja/roster.html
+++ b/templates/ja/roster.html
@@ -2,7 +2,7 @@
 <HTML>
   <HEAD>
     <TITLE><MM-List-Name> ���̾��</TITLE>
-  
+
   </HEAD>
   <BODY BGCOLOR="#ffffff">
 
@@ -36,8 +36,8 @@
 	</TD>
 	<TD BGCOLOR="#FFF0D0" WIDTH="50%">
 	  <center>
-	    <B><FONT COLOR="#000000"> 
-		  <MM-List-Name>�ޤȤ��ɤ߲��: <MM-Num-Digesters>̾</FONT></B> 
+	    <B><FONT COLOR="#000000">
+		  <MM-List-Name>�ޤȤ��ɤ߲��: <MM-Num-Digesters>̾</FONT></B>
 	  </center>
 	</TD>
       </TR>
diff --git a/templates/ja/unsub.txt b/templates/ja/unsub.txt
index 60fd7f2b..6f8492ed 100644
--- a/templates/ja/unsub.txt
+++ b/templates/ja/unsub.txt
@@ -14,7 +14,7 @@
     confirm %(cookie)s
 
 �ۤȤ�ɤξ�硢ñ�ˤ��Υ᡼����ֿ�������������γ�ǧ���Ǥ���Ϥ���
-����(Subject:�ˤ� Re: �����äƤ⤫�ޤ��ޤ���.)
+����(Subject:�ˤ� Re: �����äƤ⤫�ޤ��ޤ���)
 
 ���Υ᡼��󥰥ꥹ�Ȥ�����񤷤ʤ����ϡ����Υ᡼����ֿ�������ñ�˺�
 �����Ƥ���������
diff --git a/templates/ja/verify.txt b/templates/ja/verify.txt
index 3a55afa2..38f05754 100644
--- a/templates/ja/verify.txt
+++ b/templates/ja/verify.txt
@@ -14,7 +14,7 @@
     confirm %(cookie)s
 
 �ۤȤ�ɤξ�硢ñ�ˤ��Υ᡼����ֿ��������������γ�ǧ���Ǥ���Ϥ���
-����(Subject:�ˤ� Re: �����äƤ⤫�ޤ��ޤ���.)
+����(Subject:�ˤ� Re: �����äƤ⤫�ޤ��ޤ���)
 
 ���Υ᡼��󥰥ꥹ�Ȥ����񤷤ʤ����ϡ����Υ᡼����ֿ�������ñ�˺��
 ���Ƥ���������
diff --git a/templates/ko/headfoot.html b/templates/ko/headfoot.html
index 9f26d23a..b5cfc6d9 100644
--- a/templates/ko/headfoot.html
+++ b/templates/ko/headfoot.html
@@ -1,6 +1,6 @@
 �� ������ ���ϸ� ����Ʈ�� ����Ǿ� �ִ� Ư���� <b>%(attribute)s</b>
 ������ �����ϰ� �ֽ��ϴ�. �� �ڼ��� ������ 
-<a href="http://docs.python.org/library/stdtypes.html#string-formatting-operations">Python��
+<a href="https://docs.python.org/2/library/stdtypes.html#string-formatting-operations">Python��
 ���ڿ� ���� ��Ģ</a>�� ���ñ� �ٶ��ϴ�. ��� ������ �Ӽ��� �Ʒ��� �����ϴ�.
 
 <ul>
diff --git a/templates/lt/headfoot.html b/templates/lt/headfoot.html
index 5d99cc91..12d9e688 100644
--- a/templates/lt/headfoot.html
+++ b/templates/lt/headfoot.html
@@ -1,5 +1,5 @@
 � &scaron;� tekst� gali b�ti �trauktos
-<a href="http://docs.python.org/library/stdtypes.html#string-formatting-operations">Python
+<a href="https://docs.python.org/2/library/stdtypes.html#string-formatting-operations">Python
 formato eilut�s</a> kurios yra apdorojamos pagal po�ymius. 
 �ia pateikiame pakeitim� s�ra&scaron;�:
 
diff --git a/templates/nl/headfoot.html b/templates/nl/headfoot.html
index f47006a7..6b38440b 100644
--- a/templates/nl/headfoot.html
+++ b/templates/nl/headfoot.html
@@ -1,5 +1,5 @@
 De tekst mag de volgende
-<a href="http://docs.python.org/library/stdtypes.html#string-formatting-operations" target="_blank">Python
+<a href="https://docs.python.org/2/library/stdtypes.html#string-formatting-operations" target="_blank">Python
 format strings</a> bevatten, die automatisch herleid worden naar attributen die elders
 gedefinieerd zijn voor deze lijst. De mogelijke vervangende strings zijn:
 
diff --git a/templates/no/headfoot.html b/templates/no/headfoot.html
index ffb9947f..70d93b1f 100644
--- a/templates/no/headfoot.html
+++ b/templates/no/headfoot.html
@@ -1,6 +1,6 @@
 Teksten kan inneholde formateringskoder
 som byttes ut med verdier fra listens oppsett. For detaljer, se
-<a href="http://docs.python.org/library/stdtypes.html#string-formatting-operations">Pythons
+<a href="https://docs.python.org/2/library/stdtypes.html#string-formatting-operations">Pythons
 formateringsregler (engelsk)</a>. Gyldige koder er:
 
 <ul>
diff --git a/templates/pt/headfoot.html b/templates/pt/headfoot.html
index 75769c76..fdbb83fb 100644
--- a/templates/pt/headfoot.html
+++ b/templates/pt/headfoot.html
@@ -1,5 +1,5 @@
 Este texto pode incluir
-<a href="http://docs.python.org/library/stdtypes.html#string-formatting-operations">strings 
+<a href="https://docs.python.org/2/library/stdtypes.html#string-formatting-operations">strings 
 de formata&ccedil;&atilde;o em Python</a> as quais s&atilde;o resolvidas em rela&ccedil;&atilde;o &agrave; lista de
 atributos ??????? atributos da lista.
 As substitui&ccedil;&otilde;es permitidas s&atilde;o:
diff --git a/templates/pt_BR/headfoot.html b/templates/pt_BR/headfoot.html
index 48da833b..32a34114 100644
--- a/templates/pt_BR/headfoot.html
+++ b/templates/pt_BR/headfoot.html
@@ -1,5 +1,5 @@
 Este texto pode incluir
-<a href="http://docs.python.org/library/stdtypes.html#string-formatting-operations">strings no formato
+<a href="https://docs.python.org/2/library/stdtypes.html#string-formatting-operations">strings no formato
 do Python</a> que s&atilde;o resolvidos contra atributos da lista. a lista 
 de substitui&ccedil;&otilde;es permitidas s&atilde;o:
 
diff --git a/templates/ro/headfoot.html b/templates/ro/headfoot.html
index 75629479..bf401f0e 100644
--- a/templates/ro/headfoot.html
+++ b/templates/ro/headfoot.html
@@ -1,5 +1,5 @@
 Acest text poate include
-<a href="http://docs.python.org/library/stdtypes.html#string-formatting-operations">şiruri
+<a href="https://docs.python.org/2/library/stdtypes.html#string-formatting-operations">şiruri
 de caractere formatate Python</a> care sunt rezolvate vis-a-ais de atributele
 listei.  Lista substituţiilor permise este:
 
diff --git a/templates/ru/headfoot.html b/templates/ru/headfoot.html
index e8acf888..542d1263 100644
--- a/templates/ru/headfoot.html
+++ b/templates/ru/headfoot.html
@@ -1,5 +1,5 @@
 Этот текст может включать <a
-href="http://docs.python.org/library/stdtypes.html#string-formatting-operations">строки
+href="https://docs.python.org/2/library/stdtypes.html#string-formatting-operations">строки
 подстановки Python (текст по-английски)</a>, которые заменяются следующими атрибутами
 списка рассылки:
 
diff --git a/templates/sk/headfoot.html b/templates/sk/headfoot.html
index 6a7668a0..07351cb3 100644
--- a/templates/sk/headfoot.html
+++ b/templates/sk/headfoot.html
@@ -1,5 +1,5 @@
 Tento text m&ocirc;že obsahovať <a
-href="http://docs.python.org/library/stdtypes.html#string-formatting-operations"
+href="https://docs.python.org/2/library/stdtypes.html#string-formatting-operations"
 ">form&aacute;tovacie
 pr&iacute;kazy jazyka Python</a>, ktor&eacute; sa nahradia pr&iacute;slu&scaron;n&yacute;mi
 hodnotami pri vytv&aacute;ran&iacute; str&aacute;nky.  Nejd&ocirc;ležitej&scaron;ie premenn&eacute; s&uacute;:
diff --git a/templates/sl/headfoot.html b/templates/sl/headfoot.html
index c1e98ebf..3f9dfbd5 100644
--- a/templates/sl/headfoot.html
+++ b/templates/sl/headfoot.html
@@ -1,5 +1,5 @@
 To besedilo lahko vklju�uje
-<a href="http://docs.python.org/library/stdtypes.html#string-formatting-operations">Python
+<a href="https://docs.python.org/2/library/stdtypes.html#string-formatting-operations">Python
 nize</a>, ki jih uporabljamo namesto atributov seznama. Seznam
 mo�nih nadomestil:
 
diff --git a/templates/sr/headfoot.html b/templates/sr/headfoot.html
index 4bdf8ad9..3f38ece6 100644
--- a/templates/sr/headfoot.html
+++ b/templates/sr/headfoot.html
@@ -1,4 +1,4 @@
-Овај текст може да садржи <a href="http://docs.python.org/library/stdtypes.html#string-formatting-operations">Python-ово 
+Овај текст може да садржи <a href="https://docs.python.org/2/library/stdtypes.html#string-formatting-operations">Python-ово 
 форматирање</a> које се утврђује на основу атрибута листа. Дозвољене замјене листе 
 су: 
 <ul>
diff --git a/templates/sv/headfoot.html b/templates/sv/headfoot.html
index 39cc6653..8f86d0aa 100644
--- a/templates/sv/headfoot.html
+++ b/templates/sv/headfoot.html
@@ -1,4 +1,4 @@
-Den h&auml;r texten kan inneh&aring;lla formateringskoder som byts ut mot v&auml;rden fr&aring;n listans upps&auml;ttning. F&ouml;r detaljer, se <a href="http://docs.python.org/library/stdtypes.html#string-formatting-operations">Pythons formateringsregler (engelska)</a>. Giltiga koder &auml;r:
+Den h&auml;r texten kan inneh&aring;lla formateringskoder som byts ut mot v&auml;rden fr&aring;n listans upps&auml;ttning. F&ouml;r detaljer, se <a href="https://docs.python.org/2/library/stdtypes.html#string-formatting-operations">Pythons formateringsregler (engelska)</a>. Giltiga koder &auml;r:
 <ul>
     <li><b>real_name</b> - Listans formaterade namn, vanligtvis listnamnet med stor initial eller stora bokst&auml;ver rakt igenom.
     <li><b>list_name</b> - Listens namn, s&aring;som det anv&auml;nds i URL:er, d&auml;r det har betydelse om namnet stavas med stora eller sm&aring; bokst&auml;ver.
diff --git a/templates/tr/headfoot.html b/templates/tr/headfoot.html
index c24a545f..80984bbe 100644
--- a/templates/tr/headfoot.html
+++ b/templates/tr/headfoot.html
@@ -1,5 +1,5 @@
 Bu yaz�, liste &ouml;zniteliklerine kar�� &ccedil;&ouml;z&uuml;lecek
-<a href="http://docs.python.org/library/stdtypes.html#string-formatting-operations">Python
+<a href="https://docs.python.org/2/library/stdtypes.html#string-formatting-operations">Python
 bi&ccedil;im dizgileri</a> i&ccedil;erebilir. �zin verilen yerine koymalar�n listesi
 �unlard�r:
 
diff --git a/templates/uk/headfoot.html b/templates/uk/headfoot.html
index 834cd2eb..16332618 100644
--- a/templates/uk/headfoot.html
+++ b/templates/uk/headfoot.html
@@ -1,5 +1,5 @@
 Цей текст може включати 
-<a href="http://docs.python.org/library/stdtypes.html#string-formatting-operations">
+<a href="https://docs.python.org/2/library/stdtypes.html#string-formatting-operations">
 форматовані рядки</a>, які пов'язані з ознаками списку.  Перелік
 дозволених ознак:
 
diff --git a/templates/vi/headfoot.html b/templates/vi/headfoot.html
index 54611c21..ef218df1 100644
--- a/templates/vi/headfoot.html
+++ b/templates/vi/headfoot.html
@@ -1,5 +1,5 @@
 Đoạn này có thể gồm 
-<a href="http://docs.python.org/library/stdtypes.html#string-formatting-operations">chuỗi dạng thức Python</a> mà được khớp với thuộc tính hộp thư chung. Danh sách các điều thay thế có thể là:
+<a href="https://docs.python.org/2/library/stdtypes.html#string-formatting-operations">chuỗi dạng thức Python</a> mà được khớp với thuộc tính hộp thư chung. Danh sách các điều thay thế có thể là:
 
 <ul>
     <li><b>real_name</b> &mdash; ten « xinh » của hộp thư chung đó, thường là tên hộp thư với chữ hoa đầu từ.
diff --git a/templates/zh_CN/headfoot.html b/templates/zh_CN/headfoot.html
index 88e89d16..6653ceeb 100644
--- a/templates/zh_CN/headfoot.html
+++ b/templates/zh_CN/headfoot.html
@@ -1,5 +1,5 @@
 此文本可以包括
-<a href="http://docs.python.org/library/stdtypes.html#string-formatting-operations">Python
+<a href="https://docs.python.org/2/library/stdtypes.html#string-formatting-operations">Python
 格式字符串</a>,它们将根据列表属性来被解释。可用的替换有:
 <ul>
     <li><b>real_name</b> - 列表的确切名字;  通常列表名字要大写。
diff --git a/templates/zh_TW/headfoot.html b/templates/zh_TW/headfoot.html
index e055f580..ba34daa5 100644
--- a/templates/zh_TW/headfoot.html
+++ b/templates/zh_TW/headfoot.html
@@ -1,6 +1,6 @@
 本文可包含 <b>%(attribute)s</b> 格式字串,其可替換為通信論壇
 相應的屬性。詳情請參照
-<a href="http://docs.python.org/library/stdtypes.html#string-formatting-operations">Python
+<a href="https://docs.python.org/2/library/stdtypes.html#string-formatting-operations">Python
 格式化字串規則</a>.  預設屬性如下:
 
 <ul>
-- 
GitLab