Index: openacs-4/packages/forums/catalog/forums.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/catalog/forums.en_US.ISO-8859-1.xml,v
diff -u -N -r1.39 -r1.39.2.1
--- openacs-4/packages/forums/catalog/forums.en_US.ISO-8859-1.xml	14 Mar 2008 21:37:42 -0000	1.39
+++ openacs-4/packages/forums/catalog/forums.en_US.ISO-8859-1.xml	2 Jun 2008 18:05:15 -0000	1.39.2.1
@@ -24,6 +24,7 @@
   <msg key="charter_max_chars">Charter exceeds maximum length (4000 characters)</msg>
   <msg key="closed">closed</msg>
   <msg key="collapse">Collapse</msg>
+  <msg key="collapse_message">Collapse message</msg>
   <msg key="Confirm">Confirm?</msg>
   <msg key="Confirm_Delete">Confirm Delete:</msg>
   <msg key="Confirm_Move_to">Confirm Move to</msg>
@@ -53,6 +54,7 @@
   <msg key="Enter_a_list_of_email">Enter a list of email addresses, optionally with first and last names. They will be subscribed to this forum. As an example:</msg>
   <msg key="Entire_Thread">Entire Thread</msg>
   <msg key="expand">Expand</msg>
+  <msg key="expand_message">Expand message</msg>
   <msg key="First_Post">First Post</msg>
   <msg key="Flat">Flat</msg>
   <msg key="flat">Flat</msg>
Index: openacs-4/packages/forums/catalog/forums.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/catalog/forums.es_ES.ISO-8859-1.xml,v
diff -u -N -r1.18 -r1.18.2.1
--- openacs-4/packages/forums/catalog/forums.es_ES.ISO-8859-1.xml	10 Dec 2007 09:12:34 -0000	1.18
+++ openacs-4/packages/forums/catalog/forums.es_ES.ISO-8859-1.xml	2 Jun 2008 18:05:15 -0000	1.18.2.1
@@ -15,6 +15,7 @@
   <msg key="Attachments">Archivos adjuntos:</msg>
   <msg key="Author">Autor</msg>
   <msg key="Available_Forums">Foros disponibles</msg>
+  <msg key="Available_Messages">Mensajes disponibles</msg>
   <msg key="Back_to_thread_label">Regresar a %forum.name%</msg>
   <msg key="Back_to_thread_link">&lt;a href=&quot;%thread_url%&quot;&gt;Volver&lt;/a&gt; a %forum.name%</msg>
   <msg key="Body">Cuerpo del mensaje</msg>
@@ -24,6 +25,7 @@
   <msg key="charter_max_chars">La tem�tica no puede superar el l�mite de   4000 caracteres</msg>
   <msg key="closed">cerrado</msg>
   <msg key="collapse">Contraer</msg>
+  <msg key="collapse_message">Colapsar mensaje</msg>
   <msg key="Confirm">�Es correcto?</msg>
   <msg key="Confirm_Delete">Confirmaci�n para eliminar:</msg>
   <msg key="Confirm_Move_to">Confirmar mover mensaje</msg>
@@ -53,6 +55,7 @@
   <msg key="Enter_a_list_of_email">Ingrese una lista de correos electr�nicos, si desea agregue nombres y apellidos. Ellos ser�n suscritos autom�ticamente a este foro. Por ejemplo:</msg>
   <msg key="Entire_Thread">Hilo completo</msg>
   <msg key="expand">Expandir</msg>
+  <msg key="expand_message">Expandir mensaje</msg>
   <msg key="First_Post">Primer mensaje</msg>
   <msg key="Flat">Sin hilos</msg>
   <msg key="flat">Plano</msg>
@@ -98,6 +101,7 @@
   <msg key="Manage">Administrar</msg>
   <msg key="Manage_Forum">Administrar Foro de Discusi�n:</msg>
   <msg key="ManageModerate">Administrar/Moderar</msg>
+  <msg key="mark_all_as_read">Marcar todos como le�dos</msg>
   <msg key="Message_ID">Mensaje ID</msg>
   <msg key="Message_Subject">T�tulo</msg>
   <msg key="Moderate">Moderar</msg>
@@ -143,6 +147,7 @@
   <msg key="Post_a_Message">Enviar un mensaje</msg>
   <msg key="Post_a_New_Message">Enviar un nuevo mensaje</msg>
   <msg key="Post_a_Reply">Enviar una respuesta</msg>
+  <msg key="post_anonymously">Postear de forma an�nima</msg>
   <msg key="Post_to_Forum">Enviar al foro:</msg>
   <msg key="Posted">Enviados</msg>
   <msg key="Posted_by">Enviado por</msg>
Index: openacs-4/packages/forums/lib/message/row.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/row.adp,v
diff -u -N -r1.15.2.1 -r1.15.2.2
--- openacs-4/packages/forums/lib/message/row.adp	19 Mar 2008 22:21:45 -0000	1.15.2.1
+++ openacs-4/packages/forums/lib/message/row.adp	2 Jun 2008 18:05:15 -0000	1.15.2.2
@@ -29,7 +29,7 @@
     </if>
     <div class="details">
   <div style="float: left; padding-right: 4px;">
-    <a id="toggle@message.message_id@" class="dynexpanded" href="javascript:void(forums_toggle(@message.message_id@))"><img src="/resources/forums/Collapse16.gif" width="16" height="16" alt="+"></a>
+    <a id="toggle@message.message_id@" class="dynexpanded" href="javascript:void(forums_toggle(@message.message_id@))" title="#forums.collapse_message#"><img src="/resources/forums/Collapse16.gif" width="16" height="16" alt="#forums.collapse#"></a>
   </div>
   <if @display_subject_p@ true>
     <if @preview@ nil>
Index: openacs-4/packages/forums/lib/message/thread-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/thread-chunk.tcl,v
diff -u -N -r1.9 -r1.9.2.1
--- openacs-4/packages/forums/lib/message/thread-chunk.tcl	23 Dec 2007 14:50:15 -0000	1.9
+++ openacs-4/packages/forums/lib/message/thread-chunk.tcl	2 Jun 2008 18:05:15 -0000	1.9.2.1
@@ -144,7 +144,7 @@
         # this is needed to make the javascript work
         lappend one_children_list "null"
     }
-    append response_arrays_stub "  replies\[$one_parent_id\] = new Array([join $one_children_list ","]);\n"
+    append response_arrays_stub "  forums_replies\[$one_parent_id\] = new Array([join $one_children_list ","]);\n"
 }
 append response_arrays_stub "-->
 </script>
Index: openacs-4/packages/forums/www/message-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-view.tcl,v
diff -u -N -r1.44.2.4 -r1.44.2.5
--- openacs-4/packages/forums/www/message-view.tcl	21 Mar 2008 18:24:31 -0000	1.44.2.4
+++ openacs-4/packages/forums/www/message-view.tcl	2 Jun 2008 18:05:16 -0000	1.44.2.5
@@ -100,7 +100,14 @@
 template::head::add_css -href /resources/forums/forums.css -media all -lang $lang
 template::head::add_css -href /resources/forums/print.css -media print -lang $lang
  
+# set vars for i18n
+template::head::add_script -type "text/javascript" -script [subst {
+    var collapse_alt_text='[_ forums.collapse]';
+    var expand_alt_text='[_ forums.expand]';
+    var collapse_link_title='[_ forums.collapse_message]';
+    var expand_link_title='[_ forums.expand_message]';}] -order 1
+
 # js scripts
-template::head::add_script -type "text/javascript" -src "/resources/forums/forums.js"
+template::head::add_script -type "text/javascript" -src "/resources/forums/forums.js" -order 2
 
 set page_title "#forums.Thread_title#"
Index: openacs-4/packages/forums/www/resources/forums.js
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/resources/forums.js,v
diff -u -N -r1.6.2.2 -r1.6.2.3
--- openacs-4/packages/forums/www/resources/forums.js	19 Mar 2008 22:21:46 -0000	1.6.2.2
+++ openacs-4/packages/forums/www/resources/forums.js	2 Jun 2008 18:05:16 -0000	1.6.2.3
@@ -1,5 +1,5 @@
-var forums_collapse_symbol = '<img src="/resources/forums/Collapse16.gif" width="16" height="16" ALT="-" border="0">';
-var forums_expand_symbol = '<img src="/resources/forums/Expand16.gif" width="16" height="16" ALT="+" border="0">';
+var forums_collapse_symbol = '<img src="/resources/forums/Collapse16.gif" width="16" height="16" ALT="' + collapse_alt_text +'" style="border:0">';
+var forums_expand_symbol = '<img src="/resources/forums/Expand16.gif" width="16" height="16" ALT="' + expand_alt_text + '" style="border:0">';
 var forums_replies = new Array();
 
 // toggle visibility
@@ -29,9 +29,11 @@
     }
     if (s) {
         content.className = "dynexpanded";
+        link.title = collapse_link_title;
         symbol = forums_collapse_symbol;
     } else {
         content.className = "dyncollapsed";
+        link.title = expand_link_title;
         symbol = forums_expand_symbol;
     }