Reformatting.

[mlmmj-listtexts.git] / en / deny

diff --git a/en/deny b/en/deny
index 5c1804bc6e2d1a077a20bce7e14a4e5e7576911f..e02b1be32ed07b3c903244bd3b0ccff1a426145a 100644 (file)
--- a/en/deny
+++ b/en/deny
@@ -1,19 +1,18 @@
-%ifaction sub%Subject: Unable to subscribe to $listaddr$%endif%
-%ifaction unsub%Subject: Unable to unsubscribe from $listaddr$%endif%
-%ifaction release reject%Subject: Unable to moderate $listaddr$%endif%
-%ifaction permit obstruct%Subject: Unable to gatekeep $listaddr$%endif%
+%ifaction sub%Subject: Unable to subscribe to $list$@$domain$%endif%
+%ifaction unsub%Subject: Unable to unsubscribe from $list$@$domain$%endif%
+%ifaction release reject%Subject: Unable to moderate $list$@$domain$%endif%
+%ifaction permit obstruct%Subject: Unable to gatekeep $list$@$domain$%endif%
 
-%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list.
+%text prologue%
 
-%wrap%
 %ifaction sub%
-  You were unable to be subscribed to the list
+  %^%%wrap%You were unable to be subscribed to the list
   %ifreason disabled%
-    because
-    %iftype normal%%endif%
-    %iftype digest% the digest version of %endif%
-    %iftype nomail% the no-mail version of %endif%
-    the list is turned off.
+    because the
+    %iftype normal% normal %endif%
+    %iftype digest% digest %endif%
+    %iftype nomail% no-mail %endif%
+    version of the list is turned off.
   %endif%
   %ifreason closed%
     because people are not allowed to subscribe to this list by email.
@@ -21,37 +20,28 @@
   %ifreason subbed%
     because you are already subscribed.
   %endif%
+  %ifreason expired%
+    because too much time passed without a gatekeeper permitting your entry.
+  %endif%
   %ifreason obstruct%
     because a gatekeeper obstructed your entry.
   %endif%
 %endif%
+
 %ifaction unsub%
-  You were unable to be unsubscribed from
-  %iftype normal%%endif%
-  %iftype digest% the digest version of %endif%
-  %iftype nomail% the no-mail version of %endif%
-  the list
+  %^%%wrap%You were unable to be unsubscribed from the list
   %ifreason unsubbed%
     because you are not subscribed.
 
-%wrap%
-    If you are receiving messages, perhaps a different email address is
-    subscribed. To find out which address you are subscribed with, refer to
-    the message welcoming you to the list, or look at the envelope
-    "Return-Path" header of a message you receive from the list.
-    %iftype digest%
-      Or perhaps you are subscribed to the normal version of the list. To
-      unsubscribe from that version of the list, send a message to
-      $listunsubaddr$
-    %endif
-    %iftype normal%
-      Or perhaps you are subscribed to the digest version of the list. To
-      unsubscribe from that version of the list, send a message to
-      $digestunsubaddr$
-    %endif
+    %^%%wrap%If you are receiving messages, perhaps a different email
+    address is subscribed. To find out which address you are subscribed
+    with, refer to the message welcoming you to the list, or look at the
+    envelope "Return-Path" header of a message you receive from the list.
   %endif%
 %endif%
+
 %ifaction release reject%
+  %^%%wrap%
   %ifaction release%
     You were unable to release the specified post to the list
   %endif%
@@ -66,7 +56,9 @@
     because you are not a moderator for the list.
   %endif%
 %endif%
+
 %ifaction permit obstruct%
+  %^%%wrap%
   %ifaction permit%
     You were unable to permit the specified subscription request
   %endif%