# HG changeset patch
# User Ben Schmidt
# Date 1329785395 -39600
# Node ID 330a9d3c551c0de7c20e883ce2f891c1bf003af7
# Parent  dee698fbb0d9d343b0bbc493832d2d137e3e6899
Fix directive and substitution errors in non-English texts.

diff -r dee698fbb0d9 -r 330a9d3c551c de/deny-post
--- a/de/deny-post	Tue Jan 24 13:18:25 2012 +1100
+++ b/de/deny-post	Tue Feb 21 11:49:55 2012 +1100
@@ -10,7 +10,7 @@
 
 %text prologue%
 
-%wrap%Die Nachricht von $posteraddr$ mit dem Betreff "$subject" konnte
+%wrap%Die Nachricht von $posteraddr$ mit dem Betreff "$subject$" konnte
 nicht über die Liste verteilt werden,
 %ifreason maxmailsize%
   weil sie die maximal erlaubte Größe von $maxmailsize$ Bytes überschritten hat
@@ -61,8 +61,8 @@
 Content-Disposition: inline; filename="message.eml"
 
 %ifreason maxmailsize%
-$originalmail100$
+%originalmail 300%
 %else%
-$originalmail1000000000$
+%originalmail%
 %endif%
 --=_$random0$$random1$_=--
\ No newline at end of file
diff -r dee698fbb0d9 -r 330a9d3c551c de/finish-sub
--- a/de/finish-sub	Tue Jan 24 13:18:25 2012 +1100
+++ b/de/finish-sub	Tue Feb 21 11:49:55 2012 +1100
@@ -26,7 +26,7 @@
 %iftype nomail% No-Mail-Version %endif%
 der Liste.
 
-Ihre Abonnement-Adresse lautet $reqaddr$.
+Ihre Abonnement-Adresse lautet $subaddr$.
 
 %ifcontrol closedlist%
 %wrap%
diff -r dee698fbb0d9 -r 330a9d3c551c de/list
--- a/de/list	Tue Jan 24 13:18:25 2012 +1100
+++ b/de/list	Tue Feb 21 11:49:55 2012 +1100
@@ -13,4 +13,12 @@
 der Liste:
 %endif%
 
-%subs%
+%iftype all normal%
+- %listsubs%
+%endif%
+%iftype all digest%
+- %digestsubs%
+%endif%
+%iftype all nomail%
+- %nomailsubs%
+%endif%
diff -r dee698fbb0d9 -r 330a9d3c551c de/moderate-post
--- a/de/moderate-post	Tue Jan 24 13:18:25 2012 +1100
+++ b/de/moderate-post	Tue Feb 21 11:49:55 2012 +1100
@@ -46,5 +46,5 @@
 Content-Transfer-Encoding: 8bit
 Content-Disposition: inline; filename="message.eml"
 
-$originalmail1000000000$
+%originalmail%
 --=_$random0$$random1$_=--
diff -r dee698fbb0d9 -r 330a9d3c551c de/wait-post
--- a/de/wait-post	Tue Jan 24 13:18:25 2012 +1100
+++ b/de/wait-post	Tue Feb 21 11:49:55 2012 +1100
@@ -33,5 +33,5 @@
 Content-Transfer-Encoding: 8bit
 Content-Disposition: inline; filename="message.eml"
 
-$originalmail1000000000$
+%originalmail%
 --=_$random0$$random1$_=--
diff -r dee698fbb0d9 -r 330a9d3c551c en/list
--- a/en/list	Tue Jan 24 13:18:25 2012 +1100
+++ b/en/list	Tue Feb 21 11:49:55 2012 +1100
@@ -22,4 +22,3 @@
 %iftype all nomail%
 - %nomailsubs%
 %endif%
-
diff -r dee698fbb0d9 -r 330a9d3c551c fi/deny-post
--- a/fi/deny-post	Tue Jan 24 13:18:25 2012 +1100
+++ b/fi/deny-post	Tue Feb 21 11:49:55 2012 +1100
@@ -10,7 +10,7 @@
 
 %text prologue%
 
-%wrap%Viestiä osoitteesta $posteraddr$ otsikolla "$subject" ei voitu
+%wrap%Viestiä osoitteesta $posteraddr$ otsikolla "$subject$" ei voitu
 välittää postituslistalle,
 %ifreason maxmailsize%
   koska sen koko on suurempi kuin suurin sallittu koko $maxmailsize$
@@ -65,8 +65,8 @@
 Content-Disposition: inline; filename="message.eml"
 
 %ifreason maxmailsize%
-$originalmail100$
+%originalmail 300%
 %else%
-$originalmail1000000000$
+%originalmail%
 %endif%
 --=_$random0$$random1$_=--
diff -r dee698fbb0d9 -r 330a9d3c551c fi/finish-sub
--- a/fi/finish-sub	Tue Jan 24 13:18:25 2012 +1100
+++ b/fi/finish-sub	Tue Feb 21 11:49:55 2012 +1100
@@ -25,7 +25,7 @@
 %iftype digest% postituslistan viestikoosteiden tilaajaksi. %endif%
 %iftype nomail% postituslistan jäseneksi ilman viestien jakelua. %endif%
 
-Osoite, joka postituslistalle on liitetty, on $reqaddr$.
+Osoite, joka postituslistalle on liitetty, on $subaddr$.
 
 %ifcontrol closedlist%
 %wrap%
diff -r dee698fbb0d9 -r 330a9d3c551c fi/list
--- a/fi/list	Tue Jan 24 13:18:25 2012 +1100
+++ b/fi/list	Tue Feb 21 11:49:55 2012 +1100
@@ -11,5 +11,12 @@
 %iftype nomail% jäsenistä, joille ei välitetä postia: %endif%
 %endif%
 
-%subs%
-
+%iftype all normal%
+- %listsubs%
+%endif%
+%iftype all digest%
+- %digestsubs%
+%endif%
+%iftype all nomail%
+- %nomailsubs%
+%endif%
diff -r dee698fbb0d9 -r 330a9d3c551c fi/moderate-post
--- a/fi/moderate-post	Tue Jan 24 13:18:25 2012 +1100
+++ b/fi/moderate-post	Tue Feb 21 11:49:55 2012 +1100
@@ -46,5 +46,5 @@
 Content-Transfer-Encoding: 8bit
 Content-Disposition: inline; filename="message.eml"
 
-$originalmail1000000000$
+%originalmail%
 --=_$random0$$random1$_=--
diff -r dee698fbb0d9 -r 330a9d3c551c fi/wait-post
--- a/fi/wait-post	Tue Jan 24 13:18:25 2012 +1100
+++ b/fi/wait-post	Tue Feb 21 11:49:55 2012 +1100
@@ -34,5 +34,5 @@
 Content-Transfer-Encoding: 8bit
 Content-Disposition: inline; filename="message.eml"
 
-$originalmail1000000000$
+%originalmail%
 --=_$random0$$random1$_=--
diff -r dee698fbb0d9 -r 330a9d3c551c fr/deny-post
--- a/fr/deny-post	Tue Jan 24 13:18:25 2012 +1100
+++ b/fr/deny-post	Tue Feb 21 11:49:55 2012 +1100
@@ -10,7 +10,7 @@
 
 %text prologue%
 
-%wrap%Le message de $posteraddr$ ayant pour sujet "$subject" n'a pas pu être délivré à la liste
+%wrap%Le message de $posteraddr$ ayant pour sujet "$subject$" n'a pas pu être délivré à la liste
 %ifreason maxmailsize%
   parce qu'il dépassait la taille maximale autorisée de $maxmailsize$
   octets.
@@ -55,8 +55,8 @@
 Content-Disposition: inline; filename="message.eml"
 
 %ifreason maxmailsize%
-$originalmail100$
+%originalmail 300%
 %else%
-$originalmail1000000000$
+%originalmail%
 %endif%
 --=_$random0$$random1$_=--
diff -r dee698fbb0d9 -r 330a9d3c551c fr/finish-sub
--- a/fr/finish-sub	Tue Jan 24 13:18:25 2012 +1100
+++ b/fr/finish-sub	Tue Feb 21 11:49:55 2012 +1100
@@ -26,7 +26,7 @@
 %iftype nomail% no-mail %endif%
 de la liste.
 
-L'adresse e-mail avec laquelle vous avez été inscrit est $reqaddr$.
+L'adresse e-mail avec laquelle vous avez été inscrit est $subaddr$.
 
 %ifcontrol closedlist%
 %wrap%
diff -r dee698fbb0d9 -r 330a9d3c551c fr/list
--- a/fr/list	Tue Jan 24 13:18:25 2012 +1100
+++ b/fr/list	Tue Feb 21 11:49:55 2012 +1100
@@ -13,5 +13,12 @@
 de la liste :
 %endif%
 
-%subs%
-
+%iftype all normal%
+- %listsubs%
+%endif%
+%iftype all digest%
+- %digestsubs%
+%endif%
+%iftype all nomail%
+- %nomailsubs%
+%endif%
diff -r dee698fbb0d9 -r 330a9d3c551c fr/moderate-post
--- a/fr/moderate-post	Tue Jan 24 13:18:25 2012 +1100
+++ b/fr/moderate-post	Tue Feb 21 11:49:55 2012 +1100
@@ -41,5 +41,5 @@
 Content-Transfer-Encoding: 8bit
 Content-Disposition: inline; filename="message.eml"
 
-$originalmail1000000000$
+%originalmail%
 --=_$random0$$random1$_=--
diff -r dee698fbb0d9 -r 330a9d3c551c fr/wait-post
--- a/fr/wait-post	Tue Jan 24 13:18:25 2012 +1100
+++ b/fr/wait-post	Tue Feb 21 11:49:55 2012 +1100
@@ -32,5 +32,5 @@
 Content-Transfer-Encoding: 8bit
 Content-Disposition: inline; filename="message.eml"
 
-$originalmail1000000000$
+%originalmail%
 --=_$random0$$random1$_=--
diff -r dee698fbb0d9 -r 330a9d3c551c gr/deny-post
--- a/gr/deny-post	Tue Jan 24 13:18:25 2012 +1100
+++ b/gr/deny-post	Tue Feb 21 11:49:55 2012 +1100
@@ -10,7 +10,7 @@
 
 %text prologue%
 
-%wrap%Το μήνυμα με διεύθυνση αποστολέα $posteraddr$ και θέμα "$subject" δεν παραλήφθηκε από τη λίστα ταχυδρομείου
+%wrap%Το μήνυμα με διεύθυνση αποστολέα $posteraddr$ και θέμα "$subject$" δεν παραλήφθηκε από τη λίστα ταχυδρομείου
 %ifreason maxmailsize%
   καθώς ξεπερνά το μέγιστο επιτρεπτό μέγεθος των $maxmailsize$ bytes.
 %endif%
@@ -54,8 +54,8 @@
 Content-Disposition: inline; filename="message.eml"
 
 %ifreason maxmailsize%
-$originalmail100$
+%originalmail 300%
 %else%
-$originalmail1000000000$
+%originalmail%
 %endif%
 --=_$random0$$random1$_=--
diff -r dee698fbb0d9 -r 330a9d3c551c gr/finish-sub
--- a/gr/finish-sub	Tue Jan 24 13:18:25 2012 +1100
+++ b/gr/finish-sub	Tue Feb 21 11:49:55 2012 +1100
@@ -25,7 +25,7 @@
 %iftype digest% μέλος με λήψη συνοπτικών περιλήψεων των νέων μηνυμάτων. %endif%
 %iftype nomail% μέλος χωρίς λήψη των μηνυμάτων άλλων χρηστών (nomail subscription). %endif%
 
-Η διεύθυνση email με την οποία έχετε εγγραφεί είναι η $reqaddr$.
+Η διεύθυνση email με την οποία έχετε εγγραφεί είναι η $subaddr$.
 
 %ifcontrol closedlist%
 %wrap%
diff -r dee698fbb0d9 -r 330a9d3c551c gr/list
--- a/gr/list	Tue Jan 24 13:18:25 2012 +1100
+++ b/gr/list	Tue Feb 21 11:49:55 2012 +1100
@@ -12,5 +12,12 @@
 %iftype nomail% χωρίς αποστολή ενημερώτικών email (nomail subscription): %endif%
 %endif%
 
-%subs%
-
+%iftype all normal%
+- %listsubs%
+%endif%
+%iftype all digest%
+- %digestsubs%
+%endif%
+%iftype all nomail%
+- %nomailsubs%
+%endif%
diff -r dee698fbb0d9 -r 330a9d3c551c gr/moderate-post
--- a/gr/moderate-post	Tue Jan 24 13:18:25 2012 +1100
+++ b/gr/moderate-post	Tue Feb 21 11:49:55 2012 +1100
@@ -42,5 +42,5 @@
 Content-Transfer-Encoding: 8bit
 Content-Disposition: inline; filename="message.eml"
 
-$originalmail1000000000$
+%originalmail%
 --=_$random0$$random1$_=--
diff -r dee698fbb0d9 -r 330a9d3c551c gr/wait-post
--- a/gr/wait-post	Tue Jan 24 13:18:25 2012 +1100
+++ b/gr/wait-post	Tue Feb 21 11:49:55 2012 +1100
@@ -32,5 +32,5 @@
 Content-Transfer-Encoding: 8bit
 Content-Disposition: inline; filename="message.eml"
 
-$originalmail1000000000$
+%originalmail%
 --=_$random0$$random1$_=--
diff -r dee698fbb0d9 -r 330a9d3c551c it/deny-post
--- a/it/deny-post	Tue Jan 24 13:18:25 2012 +1100
+++ b/it/deny-post	Tue Feb 21 11:49:55 2012 +1100
@@ -10,7 +10,7 @@
 
 %text prologue%
 
-%wrap%Non è stato possibile consegnare alla lista il messaggio da $posteraddr$ con oggetto "$subject"
+%wrap%Non è stato possibile consegnare alla lista il messaggio da $posteraddr$ con oggetto "$subject$"
 %ifreason maxmailsize%
   perché ha superato la dimensione massima consentita di $maxmailsize$
   byte.
@@ -59,8 +59,8 @@
 Content-Disposition: inline; filename="message.eml"
 
 %ifreason maxmailsize%
-$originalmail100$
+%originalmail 300%
 %else%
-$originalmail1000000000$
+%originalmail%
 %endif%
 --=_$random0$$random1$_=--
diff -r dee698fbb0d9 -r 330a9d3c551c it/finish-sub
--- a/it/finish-sub	Tue Jan 24 13:18:25 2012 +1100
+++ b/it/finish-sub	Tue Feb 21 11:49:55 2012 +1100
@@ -26,7 +26,7 @@
 %iftype nomail% no-mail %endif%
 della lista.
 
-L'indirizzo di posta elettronica con cui ti sei iscritto/a è $reqaddr$.
+L'indirizzo di posta elettronica con cui ti sei iscritto/a è $subaddr$.
 
 %ifcontrol closedlist%
 %wrap%
diff -r dee698fbb0d9 -r 330a9d3c551c it/list
--- a/it/list	Tue Jan 24 13:18:25 2012 +1100
+++ b/it/list	Tue Feb 21 11:49:55 2012 +1100
@@ -13,5 +13,12 @@
 della lista:
 %endif%
 
-%subs%
-
+%iftype all normal%
+- %listsubs%
+%endif%
+%iftype all digest%
+- %digestsubs%
+%endif%
+%iftype all nomail%
+- %nomailsubs%
+%endif%
diff -r dee698fbb0d9 -r 330a9d3c551c it/moderate-post
--- a/it/moderate-post	Tue Jan 24 13:18:25 2012 +1100
+++ b/it/moderate-post	Tue Feb 21 11:49:55 2012 +1100
@@ -45,5 +45,5 @@
 Content-Transfer-Encoding: 8bit
 Content-Disposition: inline; filename="message.eml"
 
-$originalmail1000000000$
+%originalmail%
 --=_$random0$$random1$_=--
diff -r dee698fbb0d9 -r 330a9d3c551c it/wait-post
--- a/it/wait-post	Tue Jan 24 13:18:25 2012 +1100
+++ b/it/wait-post	Tue Feb 21 11:49:55 2012 +1100
@@ -34,5 +34,5 @@
 Content-Transfer-Encoding: 8bit
 Content-Disposition: inline; filename="message.eml"
 
-$originalmail1000000000$
+%originalmail%
 --=_$random0$$random1$_=--
diff -r dee698fbb0d9 -r 330a9d3c551c zh-cn/deny-post
--- a/zh-cn/deny-post	Tue Jan 24 13:18:25 2012 +1100
+++ b/zh-cn/deny-post	Tue Feb 21 11:49:55 2012 +1100
@@ -10,7 +10,7 @@
 
 %text prologue%
 
-%wrap%来自 $posteraddr$ 题为《$subject》的邮件无法投递到列表，
+%wrap%来自 $posteraddr$ 题为《$subject$》的邮件无法投递到列表，
 %ifreason maxmailsize%
   因为超出了所允许的最大邮件尺寸 $maxmailsize$
   字节。
@@ -58,8 +58,8 @@
 Content-Disposition: inline; filename="message.eml"
 
 %ifreason maxmailsize%
-$originalmail100$
+%originalmail 300%
 %else%
-$originalmail1000000000$
+%originalmail%
 %endif%
 --=_$random0$$random1$_=--
diff -r dee698fbb0d9 -r 330a9d3c551c zh-cn/finish-sub
--- a/zh-cn/finish-sub	Tue Jan 24 13:18:25 2012 +1100
+++ b/zh-cn/finish-sub	Tue Feb 21 11:49:55 2012 +1100
@@ -26,7 +26,7 @@
 %iftype nomail% 无邮件 %endif%
 版本。
 
-您订阅所用的电子邮箱地址为 $reqaddr$。
+您订阅所用的电子邮箱地址为 $subaddr$。
 
 %ifcontrol closedlist%
 %wrap%
diff -r dee698fbb0d9 -r 330a9d3c551c zh-cn/list
--- a/zh-cn/list	Tue Jan 24 13:18:25 2012 +1100
+++ b/zh-cn/list	Tue Feb 21 11:49:55 2012 +1100
@@ -13,5 +13,12 @@
 版本的订阅者:
 %endif%
 
-%subs%
-
+%iftype all normal%
+- %listsubs%
+%endif%
+%iftype all digest%
+- %digestsubs%
+%endif%
+%iftype all nomail%
+- %nomailsubs%
+%endif%
diff -r dee698fbb0d9 -r 330a9d3c551c zh-cn/moderate-post
--- a/zh-cn/moderate-post	Tue Jan 24 13:18:25 2012 +1100
+++ b/zh-cn/moderate-post	Tue Feb 21 11:49:55 2012 +1100
@@ -44,5 +44,5 @@
 Content-Transfer-Encoding: 8bit
 Content-Disposition: inline; filename="message.eml"
 
-$originalmail1000000000$
+%originalmail%
 --=_$random0$$random1$_=--
diff -r dee698fbb0d9 -r 330a9d3c551c zh-cn/wait-post
--- a/zh-cn/wait-post	Tue Jan 24 13:18:25 2012 +1100
+++ b/zh-cn/wait-post	Tue Feb 21 11:49:55 2012 +1100
@@ -33,5 +33,5 @@
 Content-Transfer-Encoding: 8bit
 Content-Disposition: inline; filename="message.eml"
 
-$originalmail1000000000$
+%originalmail%
 --=_$random0$$random1$_=--