2.1] Rev 1093: Merged A.M. Kuchling's Small Fixes branch.

noreply Sat, 07 Jun 2008 11:36:50 -0700

------------------------------------------------------------
revno: 1093
committer: Mark Sapiro <[EMAIL PROTECTED]>
branch nick: 2.1
timestamp: Sat 2008-06-07 10:02:40 -0700
message:
  Merged A.M. Kuchling's Small Fixes branch.
modified:
  NEWS
  messages/de/LC_MESSAGES/mailman.po
  messages/es/LC_MESSAGES/mailman.po
  templates/es/options.html
  templates/ko/newlist.txt
  templates/ru/newlist.txt
  tests/fblast.py
    ------------------------------------------------------------
    revno: 1089.1.5
    committer: A.M. Kuchling <[EMAIL PROTECTED]>
    branch nick: small-fixes
    timestamp: Sat 2008-06-07 08:51:54 -0400
    message:
      Patch 916196 from Ralf Doeblitz: fix link and spacing error in German 
translation
    modified:
      NEWS
      messages/de/LC_MESSAGES/mailman.po
    ------------------------------------------------------------
    revno: 1089.1.4
    committer: A.M. Kuchling <[EMAIL PROTECTED]>
    branch nick: small-fixes
    timestamp: Sat 2008-06-07 08:41:42 -0400
    message:
      Patch #1433262: corrections to Spanish translations
    modified:
      NEWS
      messages/es/LC_MESSAGES/mailman.po
      templates/es/options.html
    ------------------------------------------------------------
    revno: 1089.1.3
    committer: A.M. Kuchling <[EMAIL PROTECTED]>
    branch nick: small-fixes
    timestamp: Sat 2008-06-07 08:26:49 -0400
    message:
      Update NEWS for 1578740 and 1578766 changes
    modified:
      NEWS
    ------------------------------------------------------------
    revno: 1089.1.2
    committer: A.M. Kuchling <[EMAIL PROTECTED]>
    branch nick: small-fixes
    timestamp: Sat 2008-06-07 08:24:15 -0400
    message:
      Patch #1578740 from Thijs Kinkhorst: add #! line to fblast.py
    modified:
      tests/fblast.py
    ------------------------------------------------------------
    revno: 1089.1.1
    committer: A.M. Kuchling <[EMAIL PROTECTED]>
    branch nick: small-fixes
    timestamp: Sat 2008-06-07 08:21:07 -0400
    message:
      Patch #1578766 from Thijs Kinkhorst: use newer template variable for site 
owner address
    modified:
      templates/ko/newlist.txt
      templates/ru/newlist.txt


=== modified file 'NEWS'
--- a/NEWS      2008-06-06 23:26:10 +0000
+++ b/NEWS      2008-06-07 12:51:54 +0000
@@ -38,6 +38,16 @@
     - 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).
+
+    - 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
 
     - Brad Knowles' mailman daily status report script updated to 0.0.18.

=== modified file 'messages/de/LC_MESSAGES/mailman.po'
--- a/messages/de/LC_MESSAGES/mailman.po        2008-06-06 18:38:58 +0000
+++ b/messages/de/LC_MESSAGES/mailman.po        2008-06-07 17:02:40 +0000
@@ -6273,7 +6273,7 @@
 msgstr ""
 "Soll Mailman das Zustellungshandling f�male Mailinglisten "
 "personalisieren? Diese Option kann interessant f�ne Ank�ngslisten "
-"sein, lesen sie aber auf alle F�e die <ahref=\"?VARHELP=nondigest/"
+"sein, lesen sie aber auf alle F�e die <a href=\"?VARHELP=nondigest/"
 "personalize\"> Details</a> durch, bevor Sie sich hieran die Finger "
 "verbrennen."
 
@@ -7349,7 +7349,7 @@
 "\">topics_bodylines_limit</a>\n"
 "             configuration variable."
 msgstr ""
-"Der Themenfilter kategorisiert jede eingehende E-Mailnachricht gem� < a "
+"Der Themenfilter kategorisiert jede eingehende E-Mailnachricht gem� <a "
 "href=\"http://www.python.org/doc/current/lib/module-re.html\";>Filterregeln "
 "mit regul�n Ausdr�/a>, die Sie weiter unten festlegen k�n. Wenn "
 "die <code>Subject:</code> oder <code>Keywords:</code> Header der Nachricht "
@@ -7362,7 +7362,7 @@
 "nicht mit Sammelnachrichten.\n"
 " <p>Optional kann auch der Nachrichtentext auf Vorkommen von <code>Subject:</"
 "code> und <code>Keyword:</code> Header durchsucht werden. Spezifizieren Sie "
-"hierzu die Option<a href=\"?VARHELP=topics/topics_bodylines_limit"
+"hierzu die Option <a href=\"?VARHELP=topics/topics_bodylines_limit"
 "\">topics_bodylines_limit</a>."
 
 # Mailman/Gui/Topics.py:57

=== modified file 'messages/es/LC_MESSAGES/mailman.po'
--- a/messages/es/LC_MESSAGES/mailman.po        2008-06-06 18:38:58 +0000
+++ b/messages/es/LC_MESSAGES/mailman.po        2008-06-07 12:41:42 +0000
@@ -7658,7 +7658,7 @@
 
 #: 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 @@
 "<p>%(note)s\n"
 "\n"
 "            <p>Puede que haya inhabilitado la recepci�e los\n"
-"            mensajes deliveradamente, o puede que se haya activado debido\n"
-"            a los rebotes que est�roduciendo su direcci�"
+"            mensajes deliberadamente, o puede que se haya activado debido\n"
+"            a los mensajes de error que producen los env� a su direcci�"
 "            de correo electr�o. En cualquier caso, para habilitar\n"
 "            de nuevo la recepci�e los mensajes de la lista cambie\n"
 "            la opci�(link)s de abajo. Contacte con %(mailto)s si\n"

=== modified file 'templates/es/options.html'
--- a/templates/es/options.html 2005-06-08 21:33:19 +0000
+++ b/templates/es/options.html 2008-06-07 12:41:42 +0000
@@ -116,7 +116,7 @@
         <h3>&iquest;Ha olvidado su clave?</h3>
         </center>
         Pulse este bot&oacute;n para hacer que se le env&iacute;e por correo
-        electr&oacute;nico a la direcci&oacute;nn con la que est&aacute;
+        electr&oacute;nico a la direcci&oacute;n con la que est&aacute;
         subscrito.
         <p><MM-Umbrella-Notice>
         <center>
@@ -148,7 +148,7 @@
 <p>
 <TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="5">
     <TR><TD WIDTH="100%" BGCOLOR="#FFF0D0"><FONT COLOR="#000000">
-        <B>Sus opciones de subscripci&oacuten para la lista <MM-List-Name></B>
+        <B>Sus opciones de subscripci&oacute;n para la lista <MM-List-Name></B>
        </FONT></TD></TR>
 </table>
 
@@ -248,7 +248,7 @@
         </td></tr>
 
     <tr><TD BGCOLOR="#cccccc">
-        <strong>&iquest;En qu&eacute; idioma deseas ver los mensajes de la 
lista?</strong><p>
+        <strong>&iquest;En qu&eacute; idioma desea ver los mensajes de la 
lista?</strong><p>
         </td><td bgcolor="#cccccc">
         <MM-list-langs>
          </td></tr>
@@ -302,9 +302,9 @@
                <em>No</em> para recibirlas.
 
                <p>Si la lista tiene subscriptores con los mensajes
-               personalizados, y eliges que s&iacute; deseas recibir copias,
+               personalizados activados, y escogi�cibir copias,
                cada copia tendr�na cabecera <tt>X-Mailman-Copy:
-               yes</tt> incluida en �
+               yes</tt>.
 
         </td><td bgcolor="#cccccc">
         <mm-receive-duplicates-button>No<br>

=== modified file 'templates/ko/newlist.txt'
--- a/templates/ko/newlist.txt  2003-01-02 05:25:50 +0000
+++ b/templates/ko/newlist.txt  2008-06-07 12:21:07 +0000
@@ -32,4 +32,4 @@
 �����ϸ� ����Ʈ ����� �ɼ�Digest ���� �� ������
 ����������� ����ϴ�
 
-�� �ٸ� ���� [EMAIL PROTECTED](hostname)s ������ ��ñ�ٶ�.
+�� �ٸ� ���� %(siteowner)s ������ ��ñ�ٶ�.

=== modified file 'templates/ru/newlist.txt'
--- a/templates/ru/newlist.txt  2003-01-02 05:25:50 +0000
+++ b/templates/ru/newlist.txt  2008-06-07 12:21:07 +0000
@@ -37,4 +37,4 @@
 ������.
 
 �����������������, ���� ��� � ���
[EMAIL PROTECTED](hostname)s.
+    %(siteowner)s.

=== modified file 'tests/fblast.py'
--- a/tests/fblast.py   2003-03-31 22:06:51 +0000
+++ b/tests/fblast.py   2008-06-07 12:24:15 +0000
@@ -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



--
Stable, maintained release series
https://code.launchpad.net/~mailman-coders/mailman/2.1

You are receiving this branch notification because you are subscribed to it.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe: 
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org

[Mailman-checkins] [Branch ~mailman-coders/mailman/2.1] Rev 1093: Merged A.M. Kuchling's Small Fixes branch.

Reply via email to