aboutsummaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2015-01-22 16:09:03 -0800
committerMark Sapiro <mark@msapiro.net>2015-01-22 16:09:03 -0800
commit4758a0d904a12d6be21972fa432ad89ed9c1a768 (patch)
tree85d88b27697dd72a55d6470d9e88487bf29568c9 /templates
parentac22662b811ac9bcf58cf001c8fd5ad21e757c8b (diff)
downloadmailman2-4758a0d904a12d6be21972fa432ad89ed9c1a768.tar.gz
mailman2-4758a0d904a12d6be21972fa432ad89ed9c1a768.tar.xz
mailman2-4758a0d904a12d6be21972fa432ad89ed9c1a768.zip
A number of changes from the unofficial 2.2 branch have been backported to
the 2.1 branch for release with 2.1.19. The 2.2 branch is now no different from the 2.1 branch and will no longer be maintained.
Diffstat (limited to 'templates')
-rw-r--r--templates/en/adminaddrchgack.txt4
-rw-r--r--templates/en/admindbdetails.html2
2 files changed, 5 insertions, 1 deletions
diff --git a/templates/en/adminaddrchgack.txt b/templates/en/adminaddrchgack.txt
new file mode 100644
index 00000000..a24dd3d9
--- /dev/null
+++ b/templates/en/adminaddrchgack.txt
@@ -0,0 +1,4 @@
+Address for member %(name)s has been successfully changed
+from %(oldaddr)s to %(newaddr)s for list %(listname)s.
+
+
diff --git a/templates/en/admindbdetails.html b/templates/en/admindbdetails.html
index a6b7eb96..4c19fc49 100644
--- a/templates/en/admindbdetails.html
+++ b/templates/en/admindbdetails.html
@@ -12,7 +12,7 @@ excerpt of the message body.
taken now for this pending administrative request, but for held
postings, you can still forward or preserve the message (see below).
-<li><b>Approve</b> -- Approve the message, sending it on to the list.
+<li><b>Accept/Approve</b> -- Accept the message, sending it on to the list.
For membership requests, approve the change in membership status.
<li><b>Reject</b> -- Reject the message, sending a rejection notice to