merge lp:mailman/2.1 up to 1777

1 files changed, 14 insertions, 7 deletions

diff --git a/NEWS b/NEWS
index 7494695a..eaa75cd9 100644
--- a/NEWS
+++ b/NEWS
@@ -42,7 +42,8 @@ Here is a history of user visible changes to Mailman.
     - Thanks to Jim Popovitch, admin notices of (un)subscribes now may give
       the source of the action.  This consists of a %(whence)s replacement
       that has been added to the admin(un)subscribeack.txt templates.  Thanks
-      to Yasuhito FUTATSUKI for updating the non-English templates.
+      to Yasuhito FUTATSUKI for updating the non-English templates and help
+      with internationalizing the reasons.
 
     - Thanks to Jim Popovitch, there is a new
       BLOCK_SPAMHAUS_LISTED_DBL_SUBSCRIBE setting to enable blocking web
@@ -57,6 +58,9 @@ Here is a history of user visible changes to Mailman.
     - A partial Esperanto translation has been added.  Thanks to
       Rubén Fernández Asensio.
 
+    - Fixed a '# -*- coding:' line in the Russian message catalog that was
+      mistakenly translated to Russian.  (LP: #1777342)
+
   Bug fixes and other patches
 
     - Some messages from bin/arch were not issued in the charset of the system
@@ -85,7 +89,10 @@ Here is a history of user visible changes to Mailman.
       required.  (LP: #1769374)
 
     - Quoting in the mailman-config command has been changed from double to
-      single quotes to allow double-quoted parameters.  (LP:1774986)
+      single quotes to allow double-quoted parameters.  (LP: #1774986)
+
+    - Approving a held subscription for a user with a 'different' preferred
+      language no longer corrupts the results page.  (LP: #1777222)
 
   Miscellaneous
 
@@ -162,7 +169,7 @@ Here is a history of user visible changes to Mailman.
   i18n
 
     - The Russian translation has been updated by Sergey Matveev.
-      (LP:#1708016)
+      (LP: #1708016)
 
   Bug fixes and other patches
 
@@ -235,7 +242,7 @@ Here is a history of user visible changes to Mailman.
   Bug fixes and other patches
 
     - The list-owner@virtual.domain addresses are now added to virtual-mailman
-      as they are exposed in 'list created' emails.  (LP: 1694384)
+      as they are exposed in 'list created' emails.  (LP: #1694384)
 
     - The 'list run by' addresses in web page footers are now just the
       list-owner address.  (LP: #1694384)
@@ -810,7 +817,7 @@ Here is a history of user visible changes to Mailman.
 
     - Fixed a bug in bin/rmlist that would throw an exception or just fail to
       remove held message files for a list with regexp special characters in
-      its name.  (LP:#1414864)
+      its name.  (LP: #1414864)
 
     - When applying DMARC mitigations, CookHeaders now adds the original From:
       to Cc: rather than Reply-To: in some cases to make MUA 'reply' and
@@ -959,10 +966,10 @@ Here is a history of user visible changes to Mailman.
       names that look like email addresses.  (LP: #1304511)
 
     - Added the list name to the vette log "held message approved" entry.
-      (LP: 1295875)
+      (LP: #1295875)
 
     - Added the CGI module name to various "No such list" error log entries.
-      (LP: 1295875)
+      (LP: #1295875)
 
     - Modified contrib/mmdsr to report module name if present in "No such list
       error log entries.