Index: openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml,v
diff -u -N -r1.47.2.8 -r1.47.2.9
--- openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml	21 Mar 2007 09:49:22 -0000	1.47.2.8
+++ openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml	22 Mar 2007 16:31:21 -0000	1.47.2.9
@@ -232,6 +232,7 @@
   <msg key="Full_Access">Full Access</msg>
   <msg key="General_Information">General Information</msg>
   <msg key="General_Site_Help">General Site Help</msg>
+  <msg key="Go">Go</msg>
   <msg key="goto_admin_pretty_name">Go to %admin_pretty_name%</msg>
   <msg key="goto_communities_pretty_name_portal">Go to %communities.pretty_name% portal</msg>
   <msg key="goto_current_clubs">Go to current communities</msg>
@@ -527,6 +528,8 @@
   <msg key="Personal_home_page">Personal home page:</msg>
   <msg key="Personal_Options">Personal Options</msg>
   <msg key="Plain_Text">Plain Text</msg>
+  <msg key="Please_type_a_keyword">Please type a keyword
+</msg>
   <msg key="portal_templates">Portal Templates</msg>
   <msg key="Portrait">Portrait:</msg>
   <msg key="Portrait_1">Portrait</msg>
@@ -575,6 +578,10 @@
   <msg key="Screen_name">Screen name:</msg>
   <msg key="Search">Search</msg>
   <msg key="search">search</msg>
+  <msg key="Search_departments_with">Search department with
+</msg>
+  <msg key="Search_subjects_with">Search subjects with
+</msg>
   <msg key="Search_Text">Search Text:</msg>
   <msg key="Search_Users">Search Users</msg>
   <msg key="seconds">seconds.</msg>
Index: openacs-4/packages/dotlrn/catalog/dotlrn.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.es_ES.ISO-8859-1.xml,v
diff -u -N -r1.18.2.1 -r1.18.2.2
--- openacs-4/packages/dotlrn/catalog/dotlrn.es_ES.ISO-8859-1.xml	22 Mar 2007 10:13:58 -0000	1.18.2.1
+++ openacs-4/packages/dotlrn/catalog/dotlrn.es_ES.ISO-8859-1.xml	22 Mar 2007 16:31:21 -0000	1.18.2.2
@@ -220,6 +220,7 @@
   <msg key="Full_Access">Acceso ilimitado</msg>
   <msg key="General_Information">Informaci�n general</msg>
   <msg key="General_Site_Help">Ayuda general</msg>
+  <msg key="Go">Buscar</msg>
   <msg key="goto_admin_pretty_name">Ir a %admin_pretty_name%</msg>
   <msg key="goto_communities_pretty_name_portal">Ir al portal de %communities.pretty_name%</msg>
   <msg key="goto_current_clubs">Ir a mis comunidades</msg>
@@ -482,6 +483,7 @@
   <msg key="Personal_home_page">P�gina personal:</msg>
   <msg key="Personal_Options">Opciones personales</msg>
   <msg key="Plain_Text">Texto plano</msg>
+  <msg key="Please_type_a_keyword">Entrar cadena a buscar</msg>
   <msg key="portal_templates">Plantillas de portales</msg>
   <msg key="Portrait">Foto:</msg>
   <msg key="Portrait_1">Portaretrato</msg>
@@ -518,6 +520,9 @@
   <msg key="Screen_name">Nick:</msg>
   <msg key="Search">Buscar</msg>
   <msg key="search">buscar</msg>
+  <msg key="Search_departments_with">Buscar departamento que contenga</msg>
+  <msg key="Search_subjects_with">Buscar asignaturas que contengan
+</msg>
   <msg key="Search_Text">Cadena a buscar:</msg>
   <msg key="Search_Users">Buscar usuarios</msg>
   <msg key="seconds">segundos.</msg>
Index: openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp,v
diff -u -N -r1.41 -r1.41.2.1
--- openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp	15 Dec 2006 22:45:22 -0000	1.41
+++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp	22 Mar 2007 16:31:22 -0000	1.41.2.1
@@ -21,15 +21,15 @@
 
 <if @user_can_browse_p@ and @self_registration_p@>
   <small>[&nbsp;<a href="@dotlrn_url@/manage-memberships" title="#dotlrn.lt_JoinDrop_a_Class_or_C#">#dotlrn.lt_JoinDrop_a_Class_or_C#</a>&nbsp;]</small>
-  <br></br>
+  <br>
 </if>
 
 <if @communities:rowcount@ gt 0>
 
 <multiple name="communities">
 @communities.previous_type_ul_tags;noquote@
 
-<ul class="mktree" style="padding-left: 5px;"><li id="dotlrn-main-@communities.simple_community_type@" remember="1">
+<ul class="mktree" style="padding-left: 5px;"><li id="dotlrn-main-@communities.simple_community_type@">
 <h3 style="display: inline; margin: 5px 0 0 0;">
   <if @communities.simple_community_type@ eq "dotlrn_class_instance">
     <%= [parameter::get -localize -parameter class_instances_pretty_plural] %>
Index: openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl,v
diff -u -N -r1.14 -r1.14.2.1
--- openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl	8 Aug 2006 21:26:24 -0000	1.14
+++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl	22 Mar 2007 16:31:22 -0000	1.14.2.1
@@ -109,7 +109,7 @@
 # Add the dhtml tree javascript to the HEAD.
 global dotlrn_master__header_stuff
 append dotlrn_master__header_stuff {
-     <script src="/resources/acs-templating/mktree.js" language="javascript"></SCRIPT>
+     <script type="text/javascript" src="/resources/acs-templating/mktree.js" language="javascript"></SCRIPT>
      <link rel="stylesheet" href="/resources/acs-templating/mktree.css" media="all">
 }
 
Index: openacs-4/packages/dotlrn/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/index.adp,v
diff -u -N -r1.29 -r1.29.2.1
--- openacs-4/packages/dotlrn/www/admin/index.adp	15 Dec 2006 22:45:22 -0000	1.29
+++ openacs-4/packages/dotlrn/www/admin/index.adp	22 Mar 2007 16:31:22 -0000	1.29.2.1
@@ -42,12 +42,13 @@
   <li><a href="edit-preapproved-emails" title="#dotlrn.edit_approved_email_servers#">#dotlrn.edit_approved_email_servers#</a></li>
   <li><a href="@parameters_url@" title="#dotlrn.edit_parameters#">#dotlrn.edit_parameters#</a></li>
   <li><a href="@parameters_d_url@" title="#dotlrn.edit_community_parameters#">#dotlrn.edit_community_parameters#</a></li>
-  <li><a href="toolbar-actions?action=@action@&return_url=@return_url@" title="@dotlrn_toolbar_action@">@dotlrn_toolbar_action@</a></li>
-  <p>
+  <li><a href="@toolbar_actions_url@" title="@dotlrn_toolbar_action@">@dotlrn_toolbar_action@</a></li>
+    </ul>
+
   <if @oacs_site_wide_admin_p@ true>
-    <li><a href="/acs-admin/" title="#dotlrn.goto_oacs_swa#">OpenACS Site-Wide Administration</a></li>
+      <ul>
+        <li><a href="/acs-admin/" title="#dotlrn.goto_oacs_swa#">OpenACS Site-Wide Administration</a></li>
+      </ul>
   </if>
-  </p>
-</ul>
 
 
Index: openacs-4/packages/dotlrn/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/index.tcl,v
diff -u -N -r1.19 -r1.19.2.1
--- openacs-4/packages/dotlrn/www/admin/index.tcl	15 Dec 2006 22:45:23 -0000	1.19
+++ openacs-4/packages/dotlrn/www/admin/index.tcl	22 Mar 2007 16:31:22 -0000	1.19.2.1
@@ -49,4 +49,6 @@
 
 set return_url [ad_conn url]
 
+set toolbar_actions_url [export_vars -base toolbar-actions {action return_url}]
+
 ad_return_template
Index: openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml,v
diff -u -N -r1.35.2.2 -r1.35.2.3
--- openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml	21 Mar 2007 09:58:23 -0000	1.35.2.2
+++ openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml	22 Mar 2007 16:31:22 -0000	1.35.2.3
@@ -40,6 +40,7 @@
   <msg key="edit">edit</msg>
   <msg key="Edit_Folder">Edit Folder</msg>
   <msg key="Edit_URL">Edit URL</msg>
+  <msg key="File">File</msg>
   <msg key="file">file</msg>
   <msg key="file_delete_page_title">Delete %title%</msg>
   <msg key="File_deleted">File deleted</msg>
Index: openacs-4/packages/file-storage/catalog/file-storage.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/catalog/file-storage.es_ES.ISO-8859-1.xml,v
diff -u -N -r1.18.2.2 -r1.18.2.3
--- openacs-4/packages/file-storage/catalog/file-storage.es_ES.ISO-8859-1.xml	22 Mar 2007 10:14:00 -0000	1.18.2.2
+++ openacs-4/packages/file-storage/catalog/file-storage.es_ES.ISO-8859-1.xml	22 Mar 2007 16:31:22 -0000	1.18.2.3
@@ -40,6 +40,7 @@
   <msg key="edit">editar</msg>
   <msg key="Edit_Folder">Editar carpeta</msg>
   <msg key="Edit_URL">Editar URL</msg>
+  <msg key="File">Fichero</msg>
   <msg key="file">Archivo</msg>
   <msg key="file_delete_page_title">Eliminar %title%</msg>
   <msg key="File_deleted">Archivo borrado</msg>
Index: openacs-4/packages/forums-portlet/catalog/forums-portlet.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-portlet/catalog/forums-portlet.en_US.ISO-8859-1.xml,v
diff -u -N -r1.17.2.2 -r1.17.2.3
--- openacs-4/packages/forums-portlet/catalog/forums-portlet.en_US.ISO-8859-1.xml	21 Mar 2007 06:27:19 -0000	1.17.2.2
+++ openacs-4/packages/forums-portlet/catalog/forums-portlet.en_US.ISO-8859-1.xml	22 Mar 2007 16:31:22 -0000	1.17.2.3
@@ -11,5 +11,5 @@
   <msg key="New_Forum">New Forum</msg>
   <msg key="No_Forums">No Forums</msg>
   <msg key="pretty_name">Forums</msg>
-  <msg key="resources_acs-subsite_new_gif">&lt;img src=&quot;/resources/acs-subsite/new.gif&quot; /&gt;</msg>
+  <msg key="resources_acs-subsite_new_gif">&lt;img src=&quot;/resources/acs-subsite/new.gif&quot; alt=&quot;New messages&quot;&gt;</msg>
 </message_catalog>
Index: openacs-4/packages/forums-portlet/catalog/forums-portlet.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/forums-portlet/catalog/forums-portlet.es_ES.ISO-8859-1.xml,v
diff -u -N -r1.11.2.1 -r1.11.2.2
--- openacs-4/packages/forums-portlet/catalog/forums-portlet.es_ES.ISO-8859-1.xml	22 Mar 2007 10:14:00 -0000	1.11.2.1
+++ openacs-4/packages/forums-portlet/catalog/forums-portlet.es_ES.ISO-8859-1.xml	22 Mar 2007 16:31:22 -0000	1.11.2.2
@@ -11,5 +11,5 @@
   <msg key="New_Forum">Foro nuevo</msg>
   <msg key="No_Forums">Sin Foros</msg>
   <msg key="pretty_name">Foros</msg>
-  <msg key="resources_acs-subsite_new_gif">&lt;img src=&quot;/resources/acs-subsite/new.gif&quot; /&gt;</msg>
+  <msg key="resources_acs-subsite_new_gif">&lt;img src=&quot;/resources/acs-subsite/new.gif&quot; alt=&quot;Nuevos mensajes&quot;&gt;</msg>
 </message_catalog>
Index: openacs-4/packages/fs-portlet/www/fs-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-portlet.tcl,v
diff -u -N -r1.21.2.2 -r1.21.2.3
--- openacs-4/packages/fs-portlet/www/fs-portlet.tcl	19 Feb 2007 10:43:58 -0000	1.21.2.2
+++ openacs-4/packages/fs-portlet/www/fs-portlet.tcl	22 Mar 2007 16:31:22 -0000	1.21.2.3
@@ -93,15 +93,15 @@
 	    display_template {
 		<if @folders.type@ eq "folder">
 		  <a href="@folders.url@?folder_id=@folders.object_id@">
-		  <img border="0" src="/resources/file-storage/folder.gif" height="16" width="16">
+		  <img border="0" src="/resources/file-storage/folder.gif" height="16" width="16" alt="#file-storage.Folder#">
                   </a> 
 		</if>
 		<elseif @folders.type@ eq "url">
-		    <a href="@folders.url@url-goto?url_id=@folders.object_id@"><img border="0" src="/resources/file-storage/file.gif"></a>
+		    <a href="@folders.url@url-goto?url_id=@folders.object_id@"><img border="0" src="/resources/file-storage/file.gif" alt="#file-storage.File#"></a>
 		</elseif>
 		<else>
 		   <a href="@folders.url@download/@folders.file_upload_name@?version_id=@folders.live_revision@">
-		   <img border="0" src="/resources/file-storage/file.gif"></a>
+		   <img border="0" src="/resources/file-storage/file.gif" alt="#file-storage.File#"></a>
 		</else>
 	    }
 	}