diff options
| author | Mark Sapiro <mark@msapiro.net> | 2015-07-20 20:28:37 -0700 |
|---|---|---|
| committer | Mark Sapiro <mark@msapiro.net> | 2015-07-20 20:28:37 -0700 |
| commit | ec42db5ca3b3b71255390404cc73307d8ff5efca (patch) | |
| tree | ae16e5ae0848bd3b02fa0a75e825651006d392f4 | |
| parent | 5c01d482cc37706251892ea1b620b221da2d2ca4 (diff) | |
| download | mailman2-ec42db5ca3b3b71255390404cc73307d8ff5efca.tar.gz mailman2-ec42db5ca3b3b71255390404cc73307d8ff5efca.tar.xz mailman2-ec42db5ca3b3b71255390404cc73307d8ff5efca.zip | |
Don't show digest options on user's options page for non-digestable lists.
Diffstat (limited to '')
41 files changed, 90 insertions, 2 deletions
diff --git a/Mailman/Cgi/options.py b/Mailman/Cgi/options.py index a094047e..c400e9fb 100644 --- a/Mailman/Cgi/options.py +++ b/Mailman/Cgi/options.py @@ -17,6 +17,7 @@ """Produce and handle the member options.""" +import re import sys import os import cgi @@ -36,6 +37,9 @@ from Mailman.Logging.Syslog import syslog OR = '|' SLASH = '/' SETLANGUAGE = -1 +DIGRE = re.compile( + '<!--Start-Digests-Delete-->.*<!--End-Digests-Delete-->', + re.DOTALL) # Set up i18n _ = i18n._ @@ -873,8 +877,10 @@ You are subscribed to this list with the case-preserved address else: replacements['<mm-case-preserved-user>'] = '' - doc.AddItem(mlist.ParseTags('options.html', replacements, userlang)) - + page_text = mlist.ParseTags('options.html', replacements, userlang) + if not (mlist.digestable or mlist.getMemberOption(user, mm_cfg.Digests)): + page_text = DIGRE.sub('', page_text) + doc.AddItem(page_text) def loginpage(mlist, doc, user, lang): @@ -14,6 +14,10 @@ Here is a history of user visible changes to Mailman. Bug fixes and other patches + - If a list is not digestable an the user is not currently set to + receive digests, the digest options will not be shown on the user's + options page. (LP: #1476298) + - Improved identification of remote clients for logging and subscribe form checking in cases where access is via a proxy server. Thanks to Jim Popovitch. diff --git a/templates/ar/options.html b/templates/ar/options.html index ad61cecd..01dfa0bb 100644 --- a/templates/ar/options.html +++ b/templates/ar/options.html @@ -166,6 +166,7 @@ <mm-global-deliver-button><i>حدد بشكل عام</i> </td></tr> +<!--Start-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>حدد نظام الدفعات</strong><p> إذا فعلت نظام الدفعات ستحصل على الإرسالات بشكل مجموعات @@ -187,6 +188,7 @@ <MM-Plain-Digests-Button>نص عادي<p> <mm-global-mime-button><i>حدد بشكل عام</i> </td></tr> +<!--End-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>هل تريد الحصول على إستلام إرسالاتك الخاصة إلى القائمة؟</strong><p> diff --git a/templates/ast/options.html b/templates/ast/options.html index c38abba6..964365d7 100644 --- a/templates/ast/options.html +++ b/templates/ast/options.html @@ -153,6 +153,7 @@ indiques el deseyu de nun recibir el corréu unviáu a la llista de <mm-global-deliver-button><i>Aplicar globalmente</i> </td></tr> +<!--Start-Digests-Delete--> <tr><td bgcolor="#cccccc"> <strong>Activar mou Digest</strong><p> Si habilites el mou digest, recibirás diariamente los mensaxes unviados a la llista recopilaos nún únicu mensax, @@ -172,6 +173,7 @@ indiques el deseyu de nun recibir el corréu unviáu a la llista de <MM-Plain-Digests-Button>Texto plano<p> <mm-global-mime-button><i>Aplicar globalmente</i> </td></tr> +<!--End-Digests-Delete--> <tr><td bgcolor="#cccccc"> <strong>¿Quies recibir los mensaxes que tú mesmu unvíes a esta llista?</strong><p> diff --git a/templates/ca/options.html b/templates/ca/options.html index 9f2d7202..ad14ded7 100644 --- a/templates/ca/options.html +++ b/templates/ca/options.html @@ -173,6 +173,7 @@ per a veure a quines altres llistes de correu esteu subscrit/a. </p> <mm-global-deliver-button><i>Canvi global</i></p> </td></tr> +<!--Start-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Activació del mode de compilació</strong><p> Si activeu el mode de compilació, rebreu tots els @@ -197,6 +198,7 @@ per a veure a quines altres llistes de correu esteu subscrit/a. </p> <MM-Plain-Digests-Button>Text pla<p> <mm-global-mime-button><i>Canvi global</i> </td></tr> +<!--End-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Voleu rebre els vostres propis missatges a la llista?</strong><p> diff --git a/templates/cs/options.html b/templates/cs/options.html index 2e8f03cc..9ca19ad4 100644 --- a/templates/cs/options.html +++ b/templates/cs/options.html @@ -161,6 +161,7 @@ Vyberte tuto volbu, pokud si nepejete dostvat dn pspvky. <mm-global-deliver-button><i>Nastavit globln</i> </td></tr> +<!--Start-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Zapnut digest reimu</strong><p> Pokud je zapnut digest reim dostanete vechny pspvky v jednom dopise @@ -181,6 +182,7 @@ volbu ist text. Tato volba nem dn vznam, pokud nen digest aktivn.<br> <MM-Plain-Digests-Button>ist text<p> <mm-global-mime-button><i>Nastavit globln</i> </td></tr> +<!--End-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Pejete si dostvat pspvky, kter jste sami zaslali do diff --git a/templates/da/options.html b/templates/da/options.html index 6c739132..45abef8a 100644 --- a/templates/da/options.html +++ b/templates/da/options.html @@ -166,6 +166,7 @@ er medlem af. <mm-global-deliver-button><i>Brug på alle</i> </td></tr> +<!--Start-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Sammendrag-modus</strong><p> Vælger du sammendrag-modus, vil du med jævne mellemrum (normalt en gang om dagen, @@ -189,6 +190,7 @@ er medlem af. <MM-Plain-Digests-Button>Ren tekst<p> <mm-global-mime-button><i>Brug på alle</i> </td></tr> +<!--End-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Modtag dine egne meddelelser til listen?</strong><p> diff --git a/templates/de/options.html b/templates/de/options.html index 1211be21..f57a5013 100755 --- a/templates/de/options.html +++ b/templates/de/options.html @@ -168,6 +168,7 @@ weitern Abonnement Sie haben. <mm-global-deliver-button><i>Global ändern</i> </td></tr> +<!--Start-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Zusammenfassungs Modus</strong><p> Wenn Sie den Zusammenfassungs Modus aktivieren, erhalten Sie die @@ -190,6 +191,7 @@ weitern Abonnement Sie haben. <MM-Plain-Digests-Button>Plain Text<p> <mm-global-mime-button><i>Global ändern</i> </td></tr> +<!--End-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Wollen Sie Ihre eigenen Nachrichten über die Liste zurückerhalten?</strong><p> diff --git a/templates/el/options.html b/templates/el/options.html index 92cc921e..393a84f0 100755 --- a/templates/el/options.html +++ b/templates/el/options.html @@ -173,6 +173,7 @@ <mm-global-deliver-button><i> </i> </td></tr> +<!--Start-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong> </strong><p> , @@ -197,6 +198,7 @@ <MM-Plain-Digests-Button> <p> <mm-global-mime-button><i> </i> </td></tr> +<!--End-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong> ;</strong><p> diff --git a/templates/en/options.html b/templates/en/options.html index 8213b1f4..82af6eff 100644 --- a/templates/en/options.html +++ b/templates/en/options.html @@ -174,6 +174,7 @@ lists you are subscribed to. <mm-global-deliver-button><i>Set globally</i> </td></tr> +<!--Start-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Set Digest Mode</strong><p> If you turn digest mode on, you'll get posts bundled together @@ -195,6 +196,7 @@ lists you are subscribed to. <MM-Plain-Digests-Button>Plain Text<p> <mm-global-mime-button><i>Set globally</i> </td></tr> +<!--End-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Receive your own posts to the list?</strong><p> diff --git a/templates/es/options.html b/templates/es/options.html index 9ad31909..a73747ea 100644 --- a/templates/es/options.html +++ b/templates/es/options.html @@ -179,6 +179,7 @@ subscrito. Dele con el ratón a <em>Listar el resto de mis subscripciones< <mm-global-deliver-button><i>Aplicar globalmente</i> </td></tr> +<!--Start-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Activar modo Digest</strong><p> Si habilita el modo digest, recibirá diariamente los mensajes @@ -202,6 +203,7 @@ subscrito. Dele con el ratón a <em>Listar el resto de mis subscripciones< <MM-Plain-Digests-Button>Texto plano<p> <mm-global-mime-button><i>Aplicar globalmente</i> </td></tr> +<!--End-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>¿Quiere recibir los mensajes que usted mismo diff --git a/templates/et/options.html b/templates/et/options.html index 7bbf6f62..20ab2879 100644 --- a/templates/et/options.html +++ b/templates/et/options.html @@ -171,6 +171,7 @@ listid teie aadressile veel tellitud on. <mm-global-deliver-button><i>rakenda kigile</i> </td></tr> +<!--Start-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Kirjade kttetoimetusviis</strong><p> Kui soovid listi kirju saada kokkuvtetena (tavaliselt @@ -189,6 +190,7 @@ listid teie aadressile veel tellitud on. <MM-Mime-Digests-Button>MIME<br> <MM-Plain-Digests-Button>Lihttekst </td></tr> +<!--End-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Oma kirjad lbi listi?</strong><p> diff --git a/templates/eu/options.html b/templates/eu/options.html index 1a62842d..2d387225 100644 --- a/templates/eu/options.html +++ b/templates/eu/options.html @@ -169,6 +169,7 @@ izenak ikusteko. <mm-global-deliver-button><i>Denak Batera</i> </td></tr> +<!--Start-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Bildumen Aukera Gaitu</strong><p> Aukera hau gaitzen baduzu, mezuak banan banan jaso beharrean, @@ -191,6 +192,7 @@ izenak ikusteko. <MM-Plain-Digests-Button>Testu Hutsa<p> <mm-global-mime-button><i>Denak Batera</i> </td></tr> +<!--End-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Norbere mezuak ere jaso?</strong><p> diff --git a/templates/fa/options.html b/templates/fa/options.html index 93c7d448..c825c158 100644 --- a/templates/fa/options.html +++ b/templates/fa/options.html @@ -149,6 +149,7 @@ <mm-global-deliver-button><i>تغییر سراسری </i> </td></tr> +<!--Start-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>تنظیم حالت یکجا </strong><p> اگر حالت یکجا را فعال کنید، پیامها به صورت دسته جمعی در یک رایانامه به دستتان می رسد.(معمولاً یک بار در روز، ولی احتمالا در لیست های شلوغ، از این هم بیشتر), ولی دیگر رایانامهها به صورت تکتک به محض فرستاده شدن هر پیام برایتان نمیآید. اگر حالت تحویل یکجا را از روشن به خاموش تغییر دهید، ممکن است یک رایانامهی یکجای دیگر نیز به عنوان آخرین دریافت کنید. @@ -165,6 +166,7 @@ <MM-Plain-Digests-Button> متن ساده <p> <mm-global-mime-button><i>تغییر سراسری</i> </td></tr> +<!--End-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>دریافت پیامهای خودتان به فهرست </strong><p> diff --git a/templates/fi/options.html b/templates/fi/options.html index 9df443b6..805850dd 100644 --- a/templates/fi/options.html +++ b/templates/fi/options.html @@ -171,6 +171,7 @@ olet liittynyt. <mm-global-deliver-button><i>Muuta kaikkiin</i> </td></tr> +<!--Start-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Koontitilan asetus</strong><p> Jos asetat koontitilan plle, @@ -191,6 +192,7 @@ olet liittynyt. <MM-Mime-Digests-Button>MIME<br> <MM-Plain-Digests-Button>Teksti </td></tr> +<!--End-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Haluatko saada listalle lhettmsi postit itse?</strong><p> diff --git a/templates/fr/options.html b/templates/fr/options.html index a61b6644..8a2c6e28 100644 --- a/templates/fr/options.html +++ b/templates/fr/options.html @@ -199,6 +199,7 @@ retour des vacances; la remise ne se réactivera pas automatiquement. <mm-global-deliver-button><i>Paramètre global</i> </td></tr> +<!--Start-Digests-Delete--> <tr><td bgcolor="#cccccc"> <strong> Activer le mode Groupé ?</strong><p> Si vous activez le mode groupé, vous recevrez les messages @@ -222,6 +223,7 @@ brut. <MM-Plain-Digests-Button>Texte brut <p> <mm-global-mime-button><i>Paramètre global</i> </td></tr> +<!--End-Digests-Delete--> <tr><td bgcolor="#cccccc"> <strong>Recevez les messages que vous envoyez à la liste ?</strong><p> diff --git a/templates/gl/options.html b/templates/gl/options.html index 5246eb74..d94da95c 100644 --- a/templates/gl/options.html +++ b/templates/gl/options.html @@ -201,6 +201,7 @@ subscrito. Prema <em>Relacionar o resto das subscricións</em> <mm-global-deliver-button><i>Aplicar globalmente</i> </td></tr> +<!--Start-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Activar o modo de compilación</strong> <p> @@ -227,6 +228,7 @@ subscrito. Prema <em>Relacionar o resto das subscricións</em> <MM-Plain-Digests-Button>Texto plano<p> <mm-global-mime-button><i>Aplicar globalmente</i> </td></tr> +<!--End-Digests-Delete--> <tr> <TD BGCOLOR="#cccccc"> diff --git a/templates/he/options.html b/templates/he/options.html index cadbaddc..08adf3f5 100644 --- a/templates/he/options.html +++ b/templates/he/options.html @@ -171,6 +171,7 @@ <mm-global-deliver-button><i>שינוי גלובלי</i> </td></tr> +<!--Start-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>קבע מצב תקצירים</strong><p> אם תדליק את מצב תקצירים, אתה תקבל את המסרים בחבילה @@ -192,6 +193,7 @@ <MM-Plain-Digests-Button>טקסט פשוט<p> <mm-global-mime-button><i>שינוי גלובלי</i> </td></tr> +<!--End-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>לקבל את המסרים של עצמך לרשימה?</strong><p> diff --git a/templates/hr/options.html b/templates/hr/options.html index 69ac6bf4..f35ba4ab 100644 --- a/templates/hr/options.html +++ b/templates/hr/options.html @@ -172,6 +172,7 @@ pretplaeni. <mm-global-deliver-button><i>Postavi globalno</i> </td></tr> +<!--Start-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Postavi Digest Mod</strong><p> Ako ukljuite digest mod, dobijat ete skupljene poruke @@ -193,6 +194,7 @@ pretplaeni. <MM-Plain-Digests-Button>Obian Tekst<p> <mm-global-mime-button><i>Postavi globalno</i> </td></tr> +<!--End-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Primaj vlastite poruke sa liste?</strong><p> diff --git a/templates/hu/options.html b/templates/hu/options.html index 5d62784c..d0693bd9 100644 --- a/templates/hu/options.html +++ b/templates/hu/options.html @@ -167,6 +167,7 @@ megtekintheted, mely levelezlistknak vagy tagja ezen a gpen. <mm-global-deliver-button><i>lltsd mindenhol</i> </td></tr> +<!--Start-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Digest forma megadsa</strong><p> Digest formban a leveleket nem egyesvel kapod, hanem egybefzve @@ -188,6 +189,7 @@ megtekintheted, mely levelezlistknak vagy tagja ezen a gpen. <MM-Plain-Digests-Button>Sima szveg<p> <mm-global-mime-button><i>lltsd mindenhol</i> </td></tr> +<!--End-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>A listra kldtt leveleidrl krsz msolatot?</strong><p> diff --git a/templates/ia/options.html b/templates/ia/options.html index fe7cc8a2..6732ca7f 100644 --- a/templates/ia/options.html +++ b/templates/ia/options.html @@ -174,6 +174,7 @@ de diffusion al quales tu es abonate. <mm-global-deliver-button><i>Cambiar globalmente</i> </td></tr> +<!--Start-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Definir modo digesto</strong><p> Si tu activa le modo digesto, tu recipera le messages combinate in digestos @@ -195,6 +196,7 @@ de diffusion al quales tu es abonate. <MM-Plain-Digests-Button>Texto pur<p> <mm-global-mime-button><i>Cambiar globalmente</i> </td></tr> +<!--End-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Reciper tu proprie messages al lista?</strong><p> diff --git a/templates/it/options.html b/templates/it/options.html index 78da7aa3..99a581a3 100644 --- a/templates/it/options.html +++ b/templates/it/options.html @@ -176,6 +176,7 @@ qui sopra per vedere a quali altre liste sei iscritto. <mm-global-deliver-button><i>Globalmente</i> </td></tr> +<!--Start-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Modo Digest</strong><p> Se abiliti il modo digest, riceverai i messaggi in un unico @@ -199,6 +200,7 @@ qui sopra per vedere a quali altre liste sei iscritto. <MM-Plain-Digests-Button>Testo<p> <mm-global-mime-button><i>Globalmente</i> </td></tr> +<!--End-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Vuoi ricevere una copia dei messaggi che mandi diff --git a/templates/ja/options.html b/templates/ja/options.html index 1f19c2e7..6a54c791 100644 --- a/templates/ja/options.html +++ b/templates/ja/options.html @@ -166,6 +166,7 @@ <mm-global-deliver-button><i></i> </td></tr> +<!--Start-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong> ޤȤɤߥ⡼ɤ</strong> <br> ͭ ֤, ƤΤӤ˥餺٤ƤΥ @@ -187,6 +188,7 @@ <MM-Plain-Digests-Button> ʿʸ <p> <mm-global-mime-button><i></i> </td></tr> +<!--End-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong> ʬƤޤ? </strong><p> diff --git a/templates/ko/options.html b/templates/ko/options.html index 635b1ef4..8c855791 100644 --- a/templates/ko/options.html +++ b/templates/ko/options.html @@ -170,6 +170,7 @@ <mm-global-deliver-button><i>ü </i> </td></tr> +<!--Start-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong> </strong><p> "" ϽŴٸ ûϴ Դϴ. @@ -190,6 +191,7 @@ <MM-Mime-Digests-Button>MIME<br> <MM-Plain-Digests-Button> </td></tr> +<!--End-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>ڽ ǰ?</strong><p> diff --git a/templates/lt/options.html b/templates/lt/options.html index 38951e04..2a8fcaa4 100644 --- a/templates/lt/options.html +++ b/templates/lt/options.html @@ -156,6 +156,7 @@ Paymjus i vliavl pakeiami Js nustatymai visuose <mm-host> forumuose. <mm-global-deliver-button><i>Bendri pakeitimai</i> </td></tr> +<!--Start-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Rinkini siuntimas</strong><p> Jeigu jungsite rinkini siuntim, Jums bus siuntinjami @@ -180,6 +181,7 @@ Paymjus i vliavl pakeiami Js nustatymai visuose <mm-host> forumuose. <MM-Plain-Digests-Button>Vientisas tekstas<p> <mm-global-mime-button><i>Bendri pakeitimai</i> </td></tr> +<!--End-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Ar norite gauti savo sistus forum laikus??</strong> diff --git a/templates/nl/options.html b/templates/nl/options.html index eca4ed09..d6cf6f0c 100644 --- a/templates/nl/options.html +++ b/templates/nl/options.html @@ -166,6 +166,7 @@ lijsten waarvan u lid bent wordt doorgevoerd. Klik hierboven op <mm-global-deliver-button><i>Instellen voor alle lijsten</i> </td></tr> +<!--Start-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Verzamelmail ontvangen</strong><p> Als u deze optie op <em>Aan</em> zet, ontvangt u geen losse berichten op @@ -188,6 +189,7 @@ lijsten waarvan u lid bent wordt doorgevoerd. Klik hierboven op <MM-Plain-Digests-Button>Gewone tekst<p> <mm-global-mime-button><i>Instellen voor alle lijsten</i> </td></tr> +<!--End-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Door uzelf verstuurde berichten ontvangen?</strong><p> diff --git a/templates/no/options.html b/templates/no/options.html index c106a08f..a105e9bc 100644 --- a/templates/no/options.html +++ b/templates/no/options.html @@ -167,6 +167,7 @@ er medlem av. <mm-global-deliver-button><i>Bruk på alle</i> </td></tr> +<!--Start-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Sammendrag-modus</strong><p> Setter du på sammendrag-modus, vil du med jevne mellomrom (vanligvis en gang om dagen, @@ -191,6 +192,7 @@ er medlem av. <MM-Plain-Digests-Button>Ren tekst<p> <mm-global-mime-button><i>Bruk på alle</i> </td></tr> +<!--End-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Motta dine egne meldinger til listen?</strong><p> diff --git a/templates/pl/options.html b/templates/pl/options.html index b7674466..5300165a 100644 --- a/templates/pl/options.html +++ b/templates/pl/options.html @@ -172,6 +172,7 @@ nie jeste pewien na jakie listy jeste zapisany. <mm-global-deliver-button><i>Zmiana globalna</i> </td></tr> +<!--Start-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Tryb Paczek</strong><p> @@ -196,6 +197,7 @@ nie jeste pewien na jakie listy jeste zapisany. <MM-Plain-Digests-Button>Czysty Tekst<p> <mm-global-mime-button><i>Zmiana globalna</i> </td></tr> +<!--End-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Czy chcesz otrzymywa wysane przez siebie wiadomoci?</strong><p> diff --git a/templates/pt/options.html b/templates/pt/options.html index 53d00400..d44a190a 100644 --- a/templates/pt/options.html +++ b/templates/pt/options.html @@ -170,6 +170,7 @@ est inscrito. <mm-global-deliver-button><i>Alterar globalmente</i> </td></tr> +<!--Start-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Escolher modo digest</strong><p> Se activar o modo digest receber as mensagens agrupadas @@ -191,6 +192,7 @@ est inscrito. <MM-Plain-Digests-Button>Texto simples<p> <mm-global-mime-button><i>Alterar globalmente</i> </td></tr> +<!--End-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Receber as suas mensagens para a lista?</strong><p> diff --git a/templates/pt_BR/options.html b/templates/pt_BR/options.html index 09cb478c..de97bf82 100644 --- a/templates/pt_BR/options.html +++ b/templates/pt_BR/options.html @@ -175,6 +175,7 @@ outras listas de discussão que está inscrito. <mm-global-deliver-button><i>Ajustar Globalmente</i> </td></tr> +<!--Start-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Ajustar o Modo Digest</strong><p> Se ativar o modo digest, você receberá postagens concatenadas @@ -198,6 +199,7 @@ outras listas de discussão que está inscrito. <MM-Plain-Digests-Button>Texto Plano<p> <mm-global-mime-button><i>Ajustar Globalmente</i> </td></tr> +<!--End-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Receber suas próprias postagens a esta lista?</strong><p> diff --git a/templates/ro/options.html b/templates/ro/options.html index d29fa239..024345d7 100644 --- a/templates/ro/options.html +++ b/templates/ro/options.html @@ -162,6 +162,7 @@ toate celelalte liste de discuţii la care aveţi abonament. <mm-global-deliver-button><i>Setează global</i> </td></tr> +<!--Start-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Modul de livrare rezumat</strong><p> Dacă activaţi modul rezumat (digest), veţi primi mesajele adunate @@ -184,6 +185,7 @@ toate celelalte liste de discuţii la care aveţi abonament. <MM-Plain-Digests-Button>Text simplu<p> <mm-global-mime-button><i>Setează global</i> </td></tr> +<!--End-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Doriţi să primiţi duplicate ale mesajelor trimise listei?</strong><p> diff --git a/templates/ru/options.html b/templates/ru/options.html index e2f484d3..3cb37cc9 100644 --- a/templates/ru/options.html +++ b/templates/ru/options.html @@ -162,6 +162,7 @@ <mm-global-deliver-button><i>Изменить во всех подписках</i> </td></tr> +<!--Start-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Режим дайджеста</strong><p> Если Вы включите этот режим, то будете получать сообщения в виде дайджеста @@ -183,6 +184,7 @@ <MM-Plain-Digests-Button>Plain Text<p> <mm-global-mime-button><i>Изменить во всех подписках</i> </td></tr> +<!--End-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Получать свои собственные сообщения в список рассылки?</strong><p> diff --git a/templates/sk/options.html b/templates/sk/options.html index d54096c4..999e86f7 100644 --- a/templates/sk/options.html +++ b/templates/sk/options.html @@ -174,6 +174,7 @@ do ktorých ste prihlásený. <mm-global-deliver-button><i>nastaviť globálne</i> </td></tr> +<!--Start-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Dávkové doručovanie pošty (digest)</strong><p> Ak zapnete dávkové doručovanie pošty, budete dostávať príspevky @@ -196,6 +197,7 @@ do ktorých ste prihlásený. <MM-Plain-Digests-Button>čistý text<p> <mm-global-mime-button><i>nastaviť globálne</i> </td></tr> +<!--End-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Odoberať vlastné príspevky do konferencie?</strong><p> diff --git a/templates/sl/options.html b/templates/sl/options.html index f0ea67cf..f0729f1a 100644 --- a/templates/sl/options.html +++ b/templates/sl/options.html @@ -170,6 +170,7 @@ ste e prijavljeni, kliknite <em>Pokai moje ostale naronine</em>. <mm-global-deliver-button><i>Nastavi globalno</i> </td></tr> +<!--Start-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Prejemanje izvlekov</strong><p> e vkljuite nain prejemanja izvlekov, boste prejemali vsa @@ -191,6 +192,7 @@ ste e prijavljeni, kliknite <em>Pokai moje ostale naronine</em>. <MM-Plain-Digests-Button>Navadno besedilo<p> <mm-global-mime-button><i>Nastavi globalno</i> </td></tr> +<!--End-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Ali elite prejemati lastna sporoila?</strong><p> diff --git a/templates/sr/options.html b/templates/sr/options.html index f8f962f5..7abe7d26 100644 --- a/templates/sr/options.html +++ b/templates/sr/options.html @@ -158,6 +158,7 @@ <mm-delivery-disable-button>Искључено <p> <mm-global-deliver-button><i>Глобално</i></td></tr> +<!--Start-Digests-Delete--> <tr> <TD BGCOLOR="#cccccc"> <strong>Преглед порука</strong> <p>Ако ову опцију укључите, добићете све поруке спојене у једно писмо (обично @@ -175,6 +176,7 @@ <MM-Mime-Digests-Button>MIME<br> <MM-Plain-Digests-Button>Обичан тест <p> <mm-global-mime-button><i>Глобално</i></td></tr> +<!--End-Digests-Delete--> <tr> <TD BGCOLOR="#cccccc"> <strong>Сопствене поруке</strong> diff --git a/templates/sv/options.html b/templates/sv/options.html index aaaec7dc..4240dc82 100644 --- a/templates/sv/options.html +++ b/templates/sv/options.html @@ -162,6 +162,7 @@ <i>Använd på alla</i> </td></tr> +<!--Start-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Sammandragsversion</strong><p>Sätter du på alternativet sammandragsversion, kommer du att med jämna mellanrum (till exempel en gång om dagen - det beror på hur mycket som skickas till listan) få en samlingsepost som innehåller alla meddelanden som skickas till listan, istället för att få varje enskilt meddelande. Om du byter från sammandragsversion @@ -178,6 +179,7 @@ <mm-global-mime-button> <i> Använd på alla</i> </td></tr> +<!--End-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"><strong>Ta emot dina egna meddelanden till listan?</strong> <p>Vanligtvis kommer du att få ta emot e-postbrev som du själv skickar till listan. Om du inte vill ta emot dessa, bör du välja <em>Nej</em> här. diff --git a/templates/tr/options.html b/templates/tr/options.html index ac1694b1..4f66238d 100644 --- a/templates/tr/options.html +++ b/templates/tr/options.html @@ -172,6 +172,7 @@ Yukarda <em>Dier yeliklerimi listele</em> dmesine tklayarak <mm-global-deliver-button><i>Global olarak ayarla</i> </td></tr> +<!--Start-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Toplu Mesaj Modunu Ayarla</strong><p> Toplu mesaj modunu aarsanz mesajlar gnderildikleri anda tek tek @@ -194,6 +195,7 @@ Yukarda <em>Dier yeliklerimi listele</em> dmesine tklayarak <MM-Plain-Digests-Button>Dz Yaz<p> <mm-global-mime-button><i>Global olarak ayarla</i> </td></tr> +<!--End-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Mesaja kendi gnderdiiniz mesajlar istiyor musunuz?</strong><p> diff --git a/templates/uk/options.html b/templates/uk/options.html index bd68df25..aa30aab5 100644 --- a/templates/uk/options.html +++ b/templates/uk/options.html @@ -168,6 +168,7 @@ <mm-global-deliver-button><i>Встановити глобально</i> </td></tr> +<!--Start-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Встановлення режиму збірок</strong><p> Якщо ви ввімкнули режим збірок, ви отримуватимете @@ -191,6 +192,7 @@ <MM-Plain-Digests-Button>Звичайний текст<p> <mm-global-mime-button><i>Встановити глобально</i> </td></tr> +<!--End-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Отримувати власні повідомлення надіслані у список?</strong><p> diff --git a/templates/vi/options.html b/templates/vi/options.html index db1adc26..cbcf7759 100644 --- a/templates/vi/options.html +++ b/templates/vi/options.html @@ -150,6 +150,7 @@ <mm-global-deliver-button><i>Đặt toàn cục</i> </td></tr> +<!--Start-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Đặt chế độ nhận bó thư</strong><p> Nếu bạn bật chế độ nhận bó thư, bạn sẽ nhận nhiều bài thư trong một lá thư (thường nhận một thư trên mỗi ngày, nhưng có thể nhận thư nhiều hơn từ hộp thư chung rất bận), thay vào nhận mỗi thư riêng một khi nó được gởi. Nếu bạn tắt chế độ nhận bó thư, có lẽ bạn sẽ nhận một bó thư cuối cùng trước khi bắt đầu nhận lại bài thư riêng. @@ -166,6 +167,7 @@ <MM-Plain-Digests-Button>Thô<p> <mm-global-mime-button><i>Đặt toàn cục</i> </td></tr> +<!--End-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>Nhận bài thư mình đã gởi cho hộp thư không?</strong><p> diff --git a/templates/zh_CN/options.html b/templates/zh_CN/options.html index ed46012e..2da94a5b 100644 --- a/templates/zh_CN/options.html +++ b/templates/zh_CN/options.html @@ -165,6 +165,7 @@ <mm-global-deliver-button><i>设为全局</i> </td></tr> +<!--Start-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>设置摘要模式</strong><p> 如果您将摘要模式打开， 将会把所有信件聚合在一起发送给您， @@ -185,6 +186,7 @@ <MM-Plain-Digests-Button>普通文本<p> <mm-global-mime-button><i>设为全局</i> </td></tr> +<!--End-Digests-Delete--> <tr><TD BGCOLOR="#cccccc"> <strong>接收您自己的信件？</strong><p> diff --git a/templates/zh_TW/options.html b/templates/zh_TW/options.html index 7a0b291b..051b0c72 100644 --- a/templates/zh_TW/options.html +++ b/templates/zh_TW/options.html @@ -106,6 +106,7 @@ <mm-delivery-disable-button> On <p> </a> </td></tr> +<!--Start-Digests-Delete--> <tr><TD BGCOLOR="#dcdcdc"> <strong> 設定摘要模式</strong> <br> 若您選擇摘要模式，您會收到每天集成一封的摘要，而不是每次發言一封。 @@ -119,6 +120,7 @@ <MM-Mime-Digests-Button> MIME <MM-Plain-Digests-Button> 純文字 <p> </td></tr> +<!--End-Digests-Delete--> <tr><TD BGCOLOR="#dcdcdc"> <strong> 您想收到自己寄到論壇的信嗎? </strong><br> <mm-receive-own-mail-button> Yes |