From 9513d12137d961d2b950d16e70ea36c8dbc47d83 Mon Sep 17 00:00:00 2001 From: "A.M. Kuchling" Date: Sat, 7 Jun 2008 08:21:07 -0400 Subject: Patch #1578766 from Thijs Kinkhorst: use newer template variable for site owner address --- templates/ko/newlist.txt | 2 +- templates/ru/newlist.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/ko/newlist.txt b/templates/ko/newlist.txt index cdda0280..1a7893ad 100644 --- a/templates/ko/newlist.txt +++ b/templates/ko/newlist.txt @@ -32,4 +32,4 @@ E 또한 메일링 리스트 가입자의 옵션(Digest 여부, 배달 금지 등등)을 여러분이 설정할 수 있습니다. -기타 다른 질문은 mailman-owner@%(hostname)s 으로 하여 주시기 바랍니다. +기타 다른 질문은 %(siteowner)s 으로 하여 주시기 바랍니다. diff --git a/templates/ru/newlist.txt b/templates/ru/newlist.txt index f119188d..2f0eef11 100644 --- a/templates/ru/newlist.txt +++ b/templates/ru/newlist.txt @@ -37,4 +37,4 @@ 饉景博陸旽境. 洞� 凜妗鞠� � 譚戇터� 槌 賈領旽 憫컨潼, 鞫妗죽�� 筋糖賈 饉 좔瑙撞 -mailman-owner@%(hostname)s. + %(siteowner)s. -- cgit v1.2.3 From 661ee57c2aff497afac2e5126101b0735d2833cc Mon Sep 17 00:00:00 2001 From: "A.M. Kuchling" Date: Sat, 7 Jun 2008 08:24:15 -0400 Subject: Patch #1578740 from Thijs Kinkhorst: add #! line to fblast.py --- tests/fblast.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/fblast.py b/tests/fblast.py index 50368b3b..092e4209 100644 --- a/tests/fblast.py +++ b/tests/fblast.py @@ -1,3 +1,4 @@ +#! /usr/bin/env python """Throw email at Mailman as fast as you can. This is not a unit test, it's a functional test, so you can't run it within -- cgit v1.2.3 From 4e8d03db82c3ac02c89ad180c38669bc724b71ae Mon Sep 17 00:00:00 2001 From: "A.M. Kuchling" Date: Sat, 7 Jun 2008 08:26:49 -0400 Subject: Update NEWS for 1578740 and 1578766 changes --- NEWS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/NEWS b/NEWS index cfd4ad95..240d1bd3 100644 --- a/NEWS +++ b/NEWS @@ -38,6 +38,11 @@ Here is a history of user visible changes to Mailman. - Added 's' to %(listname) in templates/ia/admlogin.html and templates/sl/help.txt (1682990). + - Use newer template variable for site-owner address in + templates/ko/newlist.txt and templates/ru/newlist.txt (1578766). + + - Add #! line to fblast.py test script (1578740). + Miscellaneous - Brad Knowles' mailman daily status report script updated to 0.0.18. -- cgit v1.2.3 From be3395c6c0791ea0461f678622369df26fc305c4 Mon Sep 17 00:00:00 2001 From: "A.M. Kuchling" Date: Sat, 7 Jun 2008 08:41:42 -0400 Subject: Patch #1433262: corrections to Spanish translations --- NEWS | 3 +++ messages/es/LC_MESSAGES/mailman.po | 6 +++--- templates/es/options.html | 10 +++++----- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/NEWS b/NEWS index 240d1bd3..468c1710 100644 --- a/NEWS +++ b/NEWS @@ -41,6 +41,9 @@ Here is a history of user visible changes to Mailman. - Use newer template variable for site-owner address in templates/ko/newlist.txt and templates/ru/newlist.txt (1578766). + - Corrections to Spanish translation submitted by Wikimedia Foundation + (1433262). + - Add #! line to fblast.py test script (1578740). Miscellaneous diff --git a/messages/es/LC_MESSAGES/mailman.po b/messages/es/LC_MESSAGES/mailman.po index 26aaf50c..dcea3863 100644 --- a/messages/es/LC_MESSAGES/mailman.po +++ b/messages/es/LC_MESSAGES/mailman.po @@ -7658,7 +7658,7 @@ msgstr "; fue inhabilitado por alg #: Mailman/HTMLFormatter.py:146 msgid "Note: your list delivery is currently disabled%(reason)s." -msgstr "Nota: Actualmente tiene inhabilitada la entrega de correo %(reason)s." +msgstr "Nota: Actualmente tiene inhabilitada la entrega de correo%(reason)s." #: Mailman/HTMLFormatter.py:149 msgid "Mail delivery" @@ -7681,8 +7681,8 @@ msgstr "" "

%(note)s\n" "\n" "

Puede que haya inhabilitado la recepci�n de los\n" -" mensajes deliveradamente, o puede que se haya activado debido\n" -" a los rebotes que est� produciendo su direcci�n\n" +" mensajes deliberadamente, o puede que se haya activado debido\n" +" a los mensajes de error que producen los env�os a su direcci�n\n" " de correo electr�nico. En cualquier caso, para habilitar\n" " de nuevo la recepci�n de los mensajes de la lista cambie\n" " la opci�n %(link)s de abajo. Contacte con %(mailto)s si\n" diff --git a/templates/es/options.html b/templates/es/options.html index 1b154881..9ad31909 100644 --- a/templates/es/options.html +++ b/templates/es/options.html @@ -116,7 +116,7 @@

¿Ha olvidado su clave?

Pulse este botón para hacer que se le envíe por correo - electrónico a la direcciónn con la que está + electrónico a la dirección con la que está subscrito.

@@ -148,7 +148,7 @@

- Sus opciones de subscripción para la lista + Sus opciones de subscripción para la lista
@@ -248,7 +248,7 @@ subscrito. Dele con el ratón a Listar el resto de mis subscripciones< - ¿En qué idioma deseas ver los mensajes de la lista?

+ ¿En qué idioma desea ver los mensajes de la lista?

@@ -302,9 +302,9 @@ subscrito. Dele con el ratón a Listar el resto de mis subscripciones< No para recibirlas.

Si la lista tiene subscriptores con los mensajes - personalizados, y eliges que sí deseas recibir copias, + personalizados activados, y escogi� recibir copias, cada copia tendr� una cabecera X-Mailman-Copy: - yes incluida en �l. + yes. No
-- cgit v1.2.3 From 23d9e95c70dcba13cc4ad040cb979d03290e8147 Mon Sep 17 00:00:00 2001 From: "A.M. Kuchling" Date: Sat, 7 Jun 2008 08:51:54 -0400 Subject: Patch 916196 from Ralf Doeblitz: fix link and spacing error in German translation --- NEWS | 2 ++ messages/de/LC_MESSAGES/mailman.po | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 468c1710..21b5e0dc 100644 --- a/NEWS +++ b/NEWS @@ -44,6 +44,8 @@ Here is a history of user visible changes to Mailman. - Corrections to Spanish translation submitted by Wikimedia Foundation (1433262). + - Corrections to German translation submitted by Ralf Doeblitz (916196). + - Add #! line to fblast.py test script (1578740). Miscellaneous diff --git a/messages/de/LC_MESSAGES/mailman.po b/messages/de/LC_MESSAGES/mailman.po index 76f5999c..385dd837 100644 --- a/messages/de/LC_MESSAGES/mailman.po +++ b/messages/de/LC_MESSAGES/mailman.po @@ -6273,7 +6273,7 @@ msgid "" msgstr "" "Soll Mailman das Zustellungshandling f�r normale Mailinglisten " "personalisieren? Diese Option kann interessant f�r reine Ank�ndigungslisten " -"sein, lesen sie aber auf alle F�lle die Details durch, bevor Sie sich hieran die Finger " "verbrennen." @@ -7362,7 +7362,7 @@ msgstr "" "nicht mit Sammelnachrichten.\n" "

Optional kann auch der Nachrichtentext auf Vorkommen von Subject: und Keyword: Header durchsucht werden. Spezifizieren Sie " -"hierzu die Optiontopics_bodylines_limit." # Mailman/Gui/Topics.py:57 -- cgit v1.2.3