Update of /cvsroot/tmda/tmda/templates
In directory usw-pr-cvs1:/tmp/cvs-serv11409/templates
Modified Files:
bounce.txt confirm_accept.txt confirm_request.txt
Log Message:
Template revisions for improved clarification, and also to better
support I18N.
See http://mla.libertine.org/tmda-workers/200210/msg00080.html
for rationale.
This is an ongoing discussion, and the templates may be subject to
further revision.
Index: bounce.txt
===================================================================
RCS file: /cvsroot/tmda/tmda/templates/bounce.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- bounce.txt 18 Oct 2002 22:36:17 -0000 1.3
+++ bounce.txt 24 Oct 2002 21:57:21 -0000 1.4
@@ -1,11 +1,12 @@
From.US-ASCII: "%(FULLNAME)s" <%(recipient_address)s>
-Subject.US-ASCII: failure notice
+Subject.US-ASCII: Mail delivery failed: returning message to sender
BodyCharset: US-ASCII
-Hi. This is the TMDA program at %(recipient_domain)s.
-I'm afraid I wasn't able to deliver your message to the following addresses.
-This is a permanent error; I've given up. Sorry it didn't work out.
+This message was created automatically by mail delivery software (TMDA).
+
+Your message attached below could not be delivered to one or more of
+its recipients. This is a permanent error. The following address(es)
+failed:
<%(recipient_address)s>:
%(bounce_text)s
-
Index: confirm_accept.txt
===================================================================
RCS file: /cvsroot/tmda/tmda/templates/confirm_accept.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- confirm_accept.txt 18 Oct 2002 22:36:17 -0000 1.11
+++ confirm_accept.txt 24 Oct 2002 21:57:21 -0000 1.12
@@ -2,8 +2,6 @@
Subject.US-ASCII: Confirmation accepted
BodyCharset: US-ASCII
-%(confirm_accept_text)s
-
-[ This notice was generated by TMDA/%(TMDA_VERSION)s %(TMDA_HOMEPAGE)s,
- an automated junk-mail reduction system. ]
+This message was created automatically by mail delivery software (TMDA).
+%(confirm_accept_text)s
Index: confirm_request.txt
===================================================================
RCS file: /cvsroot/tmda/tmda/templates/confirm_request.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- confirm_request.txt 18 Oct 2002 22:36:17 -0000 1.8
+++ confirm_request.txt 24 Oct 2002 21:57:21 -0000 1.9
@@ -3,17 +3,15 @@
Reply-To.US-ASCII: %(confirm_accept_address)s
BodyCharset: US-ASCII
-Your e-mail message with the subject of "%(subject)s"
-is being held because your address was not recognized.
+This message was created automatically by mail delivery software (TMDA).
+
+Your message attached below is being held because the address
+<%(envelope_sender)s> has not been verified.
To release your message for delivery, please send an empty message
-to the following address, or use your mailer's "Reply" feature.
+to the following address, or use your mailer's `Reply' feature.
%(confirm_accept_address)s
This confirmation verifies that your message is legitimate and not
junk-mail.
-
-[ This notice was generated by TMDA/%(TMDA_VERSION)s %(TMDA_HOMEPAGE)s,
- an automated junk-mail reduction system. ]
-
_______________________________________
tmda-cvs mailing list
http://tmda.net/lists/listinfo/tmda-cvs
