Fix directive and substitution errors in non-English texts.

diff --git a/de/deny-post b/de/deny-post
index 3799cc6be07d5e76199823a55e286bfb330a4ebb..a1060cf36a6fcf6ef9907bc4ed7f13f2224673d3 100644 (file)
--- a/de/deny-post
+++ b/de/deny-post
@@ -10,7 +10,7 @@ Content-Transfer-Encoding: 8bit
 
 %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-Transfer-Encoding: 8bit
 Content-Disposition: inline; filename="message.eml"
 
 %ifreason maxmailsize%
-$originalmail100$
+%originalmail 300%
 %else%
-$originalmail1000000000$
+%originalmail%
 %endif%
 --=_$random0$$random1$_=--
\ No newline at end of file

diff --git a/de/finish-sub b/de/finish-sub
index 67facf3ff9aa2c5f4b2d143841d4d1c15285fd79..044d402fffd38750cc5c766de1a6d71953e259ed 100644 (file)
--- a/de/finish-sub
+++ b/de/finish-sub
@@ -26,7 +26,7 @@ Subject: Herzlich Willkommen bei $list$@$domain$
 %iftype nomail% No-Mail-Version %endif%
 der Liste.
 
-Ihre Abonnement-Adresse lautet $reqaddr$.
+Ihre Abonnement-Adresse lautet $subaddr$.
 
 %ifcontrol closedlist%
 %wrap%

diff --git a/de/list b/de/list
index c2ec420972e7c912a8d0df731549f92281d86319..52b979a4d0b465eaeea5b02e16d0884911b16956 100644 (file)
--- a/de/list
+++ b/de/list
@@ -13,4 +13,12 @@ für die
 der Liste:
 %endif%
 
-%subs%
+%iftype all normal%
+- %listsubs%
+%endif%
+%iftype all digest%
+- %digestsubs%
+%endif%
+%iftype all nomail%
+- %nomailsubs%
+%endif%

diff --git a/de/moderate-post b/de/moderate-post
index d6fe39ee1aea372017a1c3ab128bf9afaecdb227..d549feaa42aa02de9791be6bef07b51c32d22739 100644 (file)
--- a/de/moderate-post
+++ b/de/moderate-post
@@ -46,5 +46,5 @@ Content-Type: message/rfc822
 Content-Transfer-Encoding: 8bit
 Content-Disposition: inline; filename="message.eml"
 
-$originalmail1000000000$
+%originalmail%
 --=_$random0$$random1$_=--

diff --git a/de/wait-post b/de/wait-post
index 44452253b3fb78233d4c837c8f5ba8391957d730..5355c913bd10f375c6e9f7da269ecf8481cbba9f 100644 (file)
--- a/de/wait-post
+++ b/de/wait-post
@@ -33,5 +33,5 @@ Content-Type: message/rfc822
 Content-Transfer-Encoding: 8bit
 Content-Disposition: inline; filename="message.eml"
 
-$originalmail1000000000$
+%originalmail%
 --=_$random0$$random1$_=--

diff --git a/en/list b/en/list
index a95953f994c8764f80fcc177aa072759bd19ca4d..e89cce3bc2293b50c49fe6bd53bc801392b1be75 100644 (file)
--- a/en/list
+++ b/en/list
@@ -22,4 +22,3 @@ version of the list:
 %iftype all nomail%
 - %nomailsubs%
 %endif%
-

diff --git a/fi/deny-post b/fi/deny-post
index 35ee2d385a08b17d8c78e17e9071e188cb92fd12..5665f4eb086d516733d58af77b24d521c4cc9b61 100644 (file)
--- a/fi/deny-post
+++ b/fi/deny-post
@@ -10,7 +10,7 @@ Content-Transfer-Encoding: 8bit
 
 %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-Transfer-Encoding: 8bit
 Content-Disposition: inline; filename="message.eml"
 
 %ifreason maxmailsize%
-$originalmail100$
+%originalmail 300%
 %else%
-$originalmail1000000000$
+%originalmail%
 %endif%
 --=_$random0$$random1$_=--

diff --git a/fi/finish-sub b/fi/finish-sub
index fa12ed93802d1d5bf212802054113207a08e0940..d614382a63fb53085fc3f549dd55df90dbe7008e 100644 (file)
--- a/fi/finish-sub
+++ b/fi/finish-sub
@@ -25,7 +25,7 @@ Subject: Tervetuloa postituslistalle $list$@$domain$
 %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 --git a/fi/list b/fi/list
index fbc1e210bbde0951eaa4be5213e3083db0c94878..a9236d89de9f580736747dc5545f12cabf46ed64 100644 (file)
--- a/fi/list
+++ b/fi/list
@@ -11,5 +11,12 @@ kaikista tilaajista:
 %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 --git a/fi/moderate-post b/fi/moderate-post
index 96b4867cc63c57230fae8346035fadf654bc769d..0eb986d95d27b3e151b95c2017624d10d16f6bbe 100644 (file)
--- a/fi/moderate-post
+++ b/fi/moderate-post
@@ -46,5 +46,5 @@ Content-Type: message/rfc822
 Content-Transfer-Encoding: 8bit
 Content-Disposition: inline; filename="message.eml"
 
-$originalmail1000000000$
+%originalmail%
 --=_$random0$$random1$_=--

diff --git a/fi/wait-post b/fi/wait-post
index 5ffd38fbff961139486f674c62b269f3fef344ec..b00f4144e4237cd9f0b91c241054c2776f29af30 100644 (file)
--- a/fi/wait-post
+++ b/fi/wait-post
@@ -34,5 +34,5 @@ Content-Type: message/rfc822
 Content-Transfer-Encoding: 8bit
 Content-Disposition: inline; filename="message.eml"
 
-$originalmail1000000000$
+%originalmail%
 --=_$random0$$random1$_=--

diff --git a/fr/deny-post b/fr/deny-post
index f90c34ce59976b5bd255278b71a2329747328e6d..f264139119bf274719f40ef51aa2c3859713a3c6 100644 (file)
--- a/fr/deny-post
+++ b/fr/deny-post
@@ -10,7 +10,7 @@ Content-Transfer-Encoding: 8bit
 
 %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-Transfer-Encoding: 8bit
 Content-Disposition: inline; filename="message.eml"
 
 %ifreason maxmailsize%
-$originalmail100$
+%originalmail 300%
 %else%
-$originalmail1000000000$
+%originalmail%
 %endif%
 --=_$random0$$random1$_=--

diff --git a/fr/finish-sub b/fr/finish-sub
index 468c83bbbdb1fbe7af5d0475b0487219fe1687de..3b6b46695790768fbc07992c8ef2993c6c377218 100644 (file)
--- a/fr/finish-sub
+++ b/fr/finish-sub
@@ -26,7 +26,7 @@ Subject: Bienvenue à $list$@$domain$
 %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 --git a/fr/list b/fr/list
index e751e685f9a2729d78f11cf942042d67c6056533..8b162afea664e5d1387d7ca830ba0e8e19b89b47 100644 (file)
--- a/fr/list
+++ b/fr/list
@@ -13,5 +13,12 @@ Subject: Inscrits à $list$@$domain$
 de la liste :
 %endif%
 
-%subs%
-
+%iftype all normal%
+- %listsubs%
+%endif%
+%iftype all digest%
+- %digestsubs%
+%endif%
+%iftype all nomail%
+- %nomailsubs%
+%endif%

diff --git a/fr/moderate-post b/fr/moderate-post
index 76529acea52872aa489efce40157d3bfab09bef6..2ae28a36dd93de28ae99ef7720d094a4ccb9e438 100644 (file)
--- a/fr/moderate-post
+++ b/fr/moderate-post
@@ -41,5 +41,5 @@ Content-Type: message/rfc822
 Content-Transfer-Encoding: 8bit
 Content-Disposition: inline; filename="message.eml"
 
-$originalmail1000000000$
+%originalmail%
 --=_$random0$$random1$_=--

diff --git a/fr/wait-post b/fr/wait-post
index 2e9665757d1d1860f1b76a884df487b8da160f48..fc459a76306222a80507ae84d84f0f3e57d09d19 100644 (file)
--- a/fr/wait-post
+++ b/fr/wait-post
@@ -32,5 +32,5 @@ Content-Type: message/rfc822
 Content-Transfer-Encoding: 8bit
 Content-Disposition: inline; filename="message.eml"
 
-$originalmail1000000000$
+%originalmail%
 --=_$random0$$random1$_=--

diff --git a/gr/deny-post b/gr/deny-post
index d9bd749e8122aabc7085dc29ef4b45af7bbe67d1..f5884cb39893519698c77c86d9f5221b7a34d63b 100644 (file)
--- a/gr/deny-post
+++ b/gr/deny-post
@@ -10,7 +10,7 @@ Content-Transfer-Encoding: 8bit
 
 %text prologue%
 
-%wrap%Το μήνυμα με διεύθυνση αποστολέα $posteraddr$ και θέμα "$subject" δεν παραλήφθηκε από τη λίστα ταχυδρομείου
+%wrap%Το μήνυμα με διεύθυνση αποστολέα $posteraddr$ και θέμα "$subject$" δεν παραλήφθηκε από τη λίστα ταχυδρομείου
 %ifreason maxmailsize%
   καθώς ξεπερνά το μέγιστο επιτρεπτό μέγεθος των $maxmailsize$ bytes.
 %endif%
@@ -54,8 +54,8 @@ Content-Transfer-Encoding: 8bit
 Content-Disposition: inline; filename="message.eml"
 
 %ifreason maxmailsize%
-$originalmail100$
+%originalmail 300%
 %else%
-$originalmail1000000000$
+%originalmail%
 %endif%
 --=_$random0$$random1$_=--

diff --git a/gr/finish-sub b/gr/finish-sub
index 1173386632149afe403177c7734aa7f7cdd358e1..c0bcb64a23e0a3a3f3905fdc1ddc48621923078a 100644 (file)
--- a/gr/finish-sub
+++ b/gr/finish-sub
@@ -25,7 +25,7 @@ Subject: Καλωσορίσατε στη $list$@$domain$
 %iftype digest% μέλος με λήψη συνοπτικών περιλήψεων των νέων μηνυμάτων. %endif%
 %iftype nomail% μέλος χωρίς λήψη των μηνυμάτων άλλων χρηστών (nomail subscription). %endif%
 
-Η διεύθυνση email με την οποία έχετε εγγραφεί είναι η $reqaddr$.
+Η διεύθυνση email με την οποία έχετε εγγραφεί είναι η $subaddr$.
 
 %ifcontrol closedlist%
 %wrap%

diff --git a/gr/list b/gr/list
index 668476b51c549a89be434b6154ab92578275a00d..4d5e283759027ac5299c750c4e4fac26354b3ee9 100644 (file)
--- a/gr/list
+++ b/gr/list
@@ -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 --git a/gr/moderate-post b/gr/moderate-post
index d9254d32069a6c0c86915d258e0847dc71bef305..11bdc88326b31fe134f8a909647e62978a849527 100644 (file)
--- a/gr/moderate-post
+++ b/gr/moderate-post
@@ -42,5 +42,5 @@ Content-Type: message/rfc822
 Content-Transfer-Encoding: 8bit
 Content-Disposition: inline; filename="message.eml"
 
-$originalmail1000000000$
+%originalmail%
 --=_$random0$$random1$_=--

diff --git a/gr/wait-post b/gr/wait-post
index 067ac935a94b32ff09a8a0f10e57008d13b20891..7865c2ef41305b510752a872dde7a59941492835 100644 (file)
--- a/gr/wait-post
+++ b/gr/wait-post
@@ -32,5 +32,5 @@ Content-Type: message/rfc822
 Content-Transfer-Encoding: 8bit
 Content-Disposition: inline; filename="message.eml"
 
-$originalmail1000000000$
+%originalmail%
 --=_$random0$$random1$_=--

diff --git a/it/deny-post b/it/deny-post
index 41e9bdc08a4b5dc03a460395f3c2ccff513e7e41..a6a82e9d8e43faf7d74470ee099e2b1ba12978a7 100644 (file)
--- a/it/deny-post
+++ b/it/deny-post
@@ -10,7 +10,7 @@ Content-Transfer-Encoding: 8bit
 
 %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-Transfer-Encoding: 8bit
 Content-Disposition: inline; filename="message.eml"
 
 %ifreason maxmailsize%
-$originalmail100$
+%originalmail 300%
 %else%
-$originalmail1000000000$
+%originalmail%
 %endif%
 --=_$random0$$random1$_=--

diff --git a/it/finish-sub b/it/finish-sub
index 09556255622b02a689dd8ececfcc5dac06723e4f..eb5632527575b38c121dc8ffc6de7fa6d3a30577 100644 (file)
--- a/it/finish-sub
+++ b/it/finish-sub
@@ -26,7 +26,7 @@ Subject: Benvenuto/a in $list$@$domain$
 %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 --git a/it/list b/it/list
index c394aa27ed5132b4d17ef30ab2c615ac1dfeca9e..a26303e4d02c011462b2680622547ae2c2205012 100644 (file)
--- a/it/list
+++ b/it/list
@@ -13,5 +13,12 @@ alla versione
 della lista:
 %endif%
 
-%subs%
-
+%iftype all normal%
+- %listsubs%
+%endif%
+%iftype all digest%
+- %digestsubs%
+%endif%
+%iftype all nomail%
+- %nomailsubs%
+%endif%

diff --git a/it/moderate-post b/it/moderate-post
index 60667f34f4dd977484fa41628e18d958760039ca..0f5735b5b988f9b0fb0f239b1d829c9af3c5c745 100644 (file)
--- a/it/moderate-post
+++ b/it/moderate-post
@@ -45,5 +45,5 @@ Content-Type: message/rfc822
 Content-Transfer-Encoding: 8bit
 Content-Disposition: inline; filename="message.eml"
 
-$originalmail1000000000$
+%originalmail%
 --=_$random0$$random1$_=--

diff --git a/it/wait-post b/it/wait-post
index 526063a9b116432320afdb8c904ab9c16922dd99..e0a18889dca103481a25610d03539fd714cad384 100644 (file)
--- a/it/wait-post
+++ b/it/wait-post
@@ -34,5 +34,5 @@ Content-Type: message/rfc822
 Content-Transfer-Encoding: 8bit
 Content-Disposition: inline; filename="message.eml"
 
-$originalmail1000000000$
+%originalmail%
 --=_$random0$$random1$_=--

diff --git a/zh-cn/deny-post b/zh-cn/deny-post
index 141439bcc76c0609848f1087ad525d1a0590806c..db05b65d6c4938a90285f9740cd7b9c9efa0ce19 100755 (executable)
--- a/zh-cn/deny-post
+++ b/zh-cn/deny-post
@@ -10,7 +10,7 @@ Content-Transfer-Encoding: 8bit
 \r
 %text prologue%\r
 \r
-%wrap%来自 $posteraddr$ 题为《$subject》的邮件无法投递到列表，\r
+%wrap%来自 $posteraddr$ 题为《$subject$》的邮件无法投递到列表，\r
 %ifreason maxmailsize%\r
   因为超出了所允许的最大邮件尺寸 $maxmailsize$\r
   字节。\r
@@ -58,8 +58,8 @@ Content-Transfer-Encoding: 8bit
 Content-Disposition: inline; filename="message.eml"\r
 \r
 %ifreason maxmailsize%\r
-$originalmail100$\r
+%originalmail 300%\r
 %else%\r
-$originalmail1000000000$\r
+%originalmail%\r
 %endif%\r
 --=_$random0$$random1$_=--\r

diff --git a/zh-cn/finish-sub b/zh-cn/finish-sub
index 8451d0003b394a7c2a53811eff03c29bb1ab6d42..232e2e10c1b596952dd8fec551737a36c0c14c3b 100755 (executable)
--- a/zh-cn/finish-sub
+++ b/zh-cn/finish-sub
@@ -26,7 +26,7 @@ Subject: 欢迎加入 $list$@$domain$
 %iftype nomail% 无邮件 %endif%\r
 版本。\r
 \r
-您订阅所用的电子邮箱地址为 $reqaddr$。\r
+您订阅所用的电子邮箱地址为 $subaddr$。\r
 \r
 %ifcontrol closedlist%\r
 %wrap%\r

diff --git a/zh-cn/list b/zh-cn/list
index 015de7929230d209de12726eb6639840753003bf..ee8a21b167c0ab3724d4336fe6086388ce05c290 100755 (executable)
--- a/zh-cn/list
+++ b/zh-cn/list
@@ -13,5 +13,12 @@ Subject: $list$@$domain$ 的订阅者列表
 版本的订阅者:\r
 %endif%\r
 \r
-%subs%\r
-\r
+%iftype all normal%\r
+- %listsubs%\r
+%endif%\r
+%iftype all digest%\r
+- %digestsubs%\r
+%endif%\r
+%iftype all nomail%\r
+- %nomailsubs%\r
+%endif%\r

diff --git a/zh-cn/moderate-post b/zh-cn/moderate-post
index 2ad3ce2100b28133dd4a070c17edbfc792493c50..22df3956ff1dc54ba72c43c3e28bb74e0ccb5d00 100755 (executable)
--- a/zh-cn/moderate-post
+++ b/zh-cn/moderate-post
@@ -44,5 +44,5 @@ Content-Type: message/rfc822
 Content-Transfer-Encoding: 8bit\r
 Content-Disposition: inline; filename="message.eml"\r
 \r
-$originalmail1000000000$\r
+%originalmail%\r
 --=_$random0$$random1$_=--\r

diff --git a/zh-cn/wait-post b/zh-cn/wait-post
index 1dacd62beea776a3c2dd25f2999f0f2f53d23c90..53cb639bcafdc2614c2c88b906f7cb5fcbb73713 100755 (executable)
--- a/zh-cn/wait-post
+++ b/zh-cn/wait-post
@@ -33,5 +33,5 @@ Content-Type: message/rfc822
 Content-Transfer-Encoding: 8bit\r
 Content-Disposition: inline; filename="message.eml"\r
 \r
-$originalmail1000000000$\r
+%originalmail%\r
 --=_$random0$$random1$_=--\r