From: Ben Schmidt Date: Tue, 21 Feb 2012 00:49:55 +0000 (+1100) Subject: Fix directive and substitution errors in non-English texts. X-Git-Tag: RELEASE_1_4_0rc1~28^2~30 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82be5cd768e053c68c71e12757dbcaef1682673f;p=thirdparty%2Fmlmmj.git Fix directive and substitution errors in non-English texts. --- diff --git a/de/deny-post b/de/deny-post index 3799cc6b..a1060cf3 100644 --- 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 67facf3f..044d402f 100644 --- 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 c2ec4209..52b979a4 100644 --- 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 d6fe39ee..d549feaa 100644 --- 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 44452253..5355c913 100644 --- 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 a95953f9..e89cce3b 100644 --- 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 35ee2d38..5665f4eb 100644 --- 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 fa12ed93..d614382a 100644 --- 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 fbc1e210..a9236d89 100644 --- 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 96b4867c..0eb986d9 100644 --- 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 5ffd38fb..b00f4144 100644 --- 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 f90c34ce..f2641391 100644 --- 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 468c83bb..3b6b4669 100644 --- 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 e751e685..8b162afe 100644 --- 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 76529ace..2ae28a36 100644 --- 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 2e966575..fc459a76 100644 --- 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 d9bd749e..f5884cb3 100644 --- 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 11733866..c0bcb64a 100644 --- 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 668476b5..4d5e2837 100644 --- 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 d9254d32..11bdc883 100644 --- 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 067ac935..7865c2ef 100644 --- 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 41e9bdc0..a6a82e9d 100644 --- 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 09556255..eb563252 100644 --- 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 c394aa27..a26303e4 100644 --- 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 60667f34..0f5735b5 100644 --- 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 526063a9..e0a18889 100644 --- 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 141439bc..db05b65d 100755 --- a/zh-cn/deny-post +++ b/zh-cn/deny-post @@ -10,7 +10,7 @@ Content-Transfer-Encoding: 8bit %text prologue% -%wrap%来自 $posteraddr$ 题为《$subject》的邮件无法投递到列表， +%wrap%来自 $posteraddr$ 题为《$subject$》的邮件无法投递到列表， %ifreason maxmailsize% 因为超出了所允许的最大邮件尺寸 $maxmailsize$ 字节。 @@ -58,8 +58,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/zh-cn/finish-sub b/zh-cn/finish-sub index 8451d000..232e2e10 100755 --- a/zh-cn/finish-sub +++ b/zh-cn/finish-sub @@ -26,7 +26,7 @@ Subject: 欢迎加入 $list$@$domain$ %iftype nomail% 无邮件 %endif% 版本。 -您订阅所用的电子邮箱地址为 $reqaddr$。 +您订阅所用的电子邮箱地址为 $subaddr$。 %ifcontrol closedlist% %wrap% diff --git a/zh-cn/list b/zh-cn/list index 015de792..ee8a21b1 100755 --- a/zh-cn/list +++ b/zh-cn/list @@ -13,5 +13,12 @@ Subject: $list$@$domain$ 的订阅者列表 版本的订阅者: %endif% -%subs% - +%iftype all normal% +- %listsubs% +%endif% +%iftype all digest% +- %digestsubs% +%endif% +%iftype all nomail% +- %nomailsubs% +%endif% diff --git a/zh-cn/moderate-post b/zh-cn/moderate-post index 2ad3ce21..22df3956 100755 --- a/zh-cn/moderate-post +++ b/zh-cn/moderate-post @@ -44,5 +44,5 @@ Content-Type: message/rfc822 Content-Transfer-Encoding: 8bit Content-Disposition: inline; filename="message.eml" -$originalmail1000000000$ +%originalmail% --=_$random0$$random1$_=-- diff --git a/zh-cn/wait-post b/zh-cn/wait-post index 1dacd62b..53cb639b 100755 --- a/zh-cn/wait-post +++ b/zh-cn/wait-post @@ -33,5 +33,5 @@ Content-Type: message/rfc822 Content-Transfer-Encoding: 8bit Content-Disposition: inline; filename="message.eml" -$originalmail1000000000$ +%originalmail% --=_$random0$$random1$_=--