Rewrap end of 'finish' text accidentally neglected before.

[mlmmj-listtexts.git] / en / finish

diff --git a/en/finish b/en/finish
index f9c14dc713f443e47a819e23d499e9556fb71b63..8560bae1cb95e5d477c7048831f704915356e40a 100644 (file)
--- a/en/finish
+++ b/en/finish
@@ -1,47 +1,55 @@
-%ifaction unsub%Subject: Goodbye from $listaddr$%endif%
-%ifaction release reject%Subject: Moderated $listaddr$: $subject$%endif%
-%ifaction permit obstruct%Subject: Guarded $listaddr$: $subaddr$%endif%
-%ifaction post%Subject: Posted to $listaddr$: $subject$%endif%
+%ifaction unsub%Subject: Goodbye from $list$@$domain$%endif%
+%ifaction release reject%Subject: Moderated $list$@$domain$: $subject$%endif%
+%ifaction permit obstruct%Subject: Guarded $list$@$domain$: $subaddr$%endif%
+%ifaction post%Subject: Posted to $list$@$domain$: $subject$%endif%
 
-%wrap%Hi, this is the Mlmmj program managing the $listaddr$ mailing list.
+%text prologue%
 
-%wrap%
 %ifaction unsub%
+  %^%%wrap%
   %ifreason request%
   %endif%
   %ifreason confirm%
     Thank you for confirming your unsubscribe.
   %endif%
-  You have now been removed from
-  %iftype normal%%endif%
-  %iftype digest% the digest version of %endif%
-  %iftype nomail% the no-mail version of %endif%
-  the list.
+  %ifreason admin%
+    An administrator has removed you from the list.
+  %else%
+    You have now been removed from the list.
+  %endif%
 %endif%
+
 %ifaction release%
-  You have successfully released the message from $posteraddr$ with subject
-  "$subject" to the list.
+  %^%%wrap%You have successfully released the message from <$posteraddr$>
+  with subject "$subject$" to the list.
 %endif%
+
 %ifaction reject%
-  You have successfully rejected the message from $posteraddr$ with subject
-  "$subject".
+  %^%%wrap%You have successfully rejected the message from <$posteraddr$>
+  with subject "$subject$".
 %endif%
+
 %ifaction permit%
-  You have successfully permitted $subaddr$ to join the list.
+  %^%%wrap%You have successfully permitted <$subaddr$> to join the list.
 %endif%
+
 %ifaction obstruct%
-  You have successfully obstructed $subaddr$ from joining the list.
+  %^%%wrap%You have successfully obstructed <$subaddr$> from joining the
+  list.
 %endif%
+
 %ifaction post%
+  %^%%wrap%
   %ifreason confirm%
-    Thank you for confirming your post.
+    Thank you for confirming
   %endif%
   %ifreason release%
-    A moderator has released your post.
+    A moderator has released
   %endif%
   %ifreason request%
-    Thank you for your post.
+    Thank you for
   %endif%
-  It is now being distributed to the list.
+  your post with subject "$subject$". It is now being distributed to the
+  list.
 %endif%