CVS: tmda/templates bounce_expired_dated.txt, NONE, 1.1 bounce_fail_dated.txt, NONE, 1.1 bounce_fail_keyword.txt, NONE, 1.1 bounce_fail_sender.txt, NONE, 1.1 bounce_incoming.txt, NONE, 1.1 bounce_invalid_confirmation.txt, NONE, 1.1 bounce_missing_pending.txt, NONE, 1.1 confirm_accept_already_confirmed.txt, NONE, 1.1 confirm_accept_already_released.txt, NONE, 1.1 confirm_accept_initial.txt, NONE, 1.1 bounce.txt, 1.4, NONE confirm_accept.txt, 1.12, NONE

Update of /cvsroot/tmda/tmda/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26064/templates

Added Files:
	bounce_expired_dated.txt bounce_fail_dated.txt 
	bounce_fail_keyword.txt bounce_fail_sender.txt 
	bounce_incoming.txt bounce_invalid_confirmation.txt 
	bounce_missing_pending.txt 
	confirm_accept_already_confirmed.txt 
	confirm_accept_already_released.txt confirm_accept_initial.txt 
Removed Files:
	bounce.txt confirm_accept.txt 
Log Message:
Knock another item off TmdaOneDotTwoTodoList:

Templates:
  *  Remove BOUNCE_TEXT_* and CONFIRM_ACCEPT_* in favour of multiple
     templates, one for each condition. This might mean some content
     duplication in the template collection and more editing, but it's
     much simpler. It also makes things much easier for users of
     non-english templates.

This effectively solves the problem for multi-lingual users
described in http://mla.libertine.org/tmda-users/2003-10/msg00255.html.
This is also a much more intuitive interface IMO.


--- NEW FILE ---
From.US-ASCII: "%(FULLNAME)s" <%(recipient_address)s>
Subject.US-ASCII: Mail delivery failed: returning message to sender
BodyCharset: US-ASCII

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>:

You have sent email to an expired dated address.

--- NEW FILE ---
From.US-ASCII: "%(FULLNAME)s" <%(recipient_address)s>
Subject.US-ASCII: Mail delivery failed: returning message to sender
BodyCharset: US-ASCII

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>:

You have sent email to an invalid dated address.

--- NEW FILE ---
From.US-ASCII: "%(FULLNAME)s" <%(recipient_address)s>
Subject.US-ASCII: Mail delivery failed: returning message to sender
BodyCharset: US-ASCII

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>:

You have sent email to an invalid keyword address.

--- NEW FILE ---
From.US-ASCII: "%(FULLNAME)s" <%(recipient_address)s>
Subject.US-ASCII: Mail delivery failed: returning message to sender
BodyCharset: US-ASCII

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>:

You have sent email to an address you are not authorized to use.

--- NEW FILE ---
From.US-ASCII: "%(FULLNAME)s" <%(recipient_address)s>
Subject.US-ASCII: Mail delivery failed: returning message to sender
BodyCharset: US-ASCII

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>:

Message rejected by recipient.

--- NEW FILE ---
From.US-ASCII: "%(FULLNAME)s" <%(recipient_address)s>
Subject.US-ASCII: Mail delivery failed: returning message to sender
BodyCharset: US-ASCII

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>:

This confirmation address is invalid.

--- NEW FILE ---
From.US-ASCII: "%(FULLNAME)s" <%(recipient_address)s>
Subject.US-ASCII: Mail delivery failed: returning message to sender
BodyCharset: US-ASCII

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>:

Your original message could not be located, please resend.

--- NEW FILE ---
From.US-ASCII: "%(FULLNAME)s" <%(recipient_address)s>
Subject.US-ASCII: Confirmation accepted
BodyCharset: US-ASCII

This message was created automatically by mail delivery software (TMDA).

Your original message has already been confirmed and delivered; 
you don't need to confirm it again.

--- NEW FILE ---
From.US-ASCII: "%(FULLNAME)s" <%(recipient_address)s>
Subject.US-ASCII: Confirmation accepted
BodyCharset: US-ASCII

This message was created automatically by mail delivery software (TMDA).

Your original message has already been released and delivered.

--- NEW FILE ---
From.US-ASCII: "%(FULLNAME)s" <%(recipient_address)s>
Subject.US-ASCII: Confirmation accepted
BodyCharset: US-ASCII

This message was created automatically by mail delivery software (TMDA).

Your confirmation was accepted, and so your original message has been
delivered.

--- bounce.txt DELETED ---

--- confirm_accept.txt DELETED ---