Index: openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml,v
diff -u -r1.24 -r1.25
--- openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml	24 Oct 2007 10:24:00 -0000	1.24
+++ openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml	21 Nov 2007 09:13:26 -0000	1.25
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="xowiki" package_version="0.71" locale="de_DE" charset="ISO-8859-1">
+<message_catalog package_key="xowiki" package_version="0.78" locale="de_DE" charset="ISO-8859-1">
 
   <msg key="admin">Verwalten</msg>
   <msg key="back">Zur�ck</msg>
+  <msg key="categories">Kategorien</msg>
   <msg key="create_new_entry_of_type">Neuen Eintrag vom Typ %type% erstellen</msg>
   <msg key="create_this_page_in_language">Erzeuge diese Seite in der folgenden Sprache:</msg>
   <msg key="delete">L�schen</msg>
Index: openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml,v
diff -u -r1.31 -r1.32
--- openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml	14 Sep 2007 18:58:09 -0000	1.31
+++ openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml	21 Nov 2007 09:13:26 -0000	1.32
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="xowiki" package_version="0.71" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="xowiki" package_version="0.78" locale="en_US" charset="ISO-8859-1">
 
   <msg key="admin">Admin</msg>
   <msg key="back">Back</msg>
+  <msg key="categories">Categories</msg>
   <msg key="copy_entry">Copy Entry</msg>
   <msg key="create_new_entry_of_type">Create new entry of type %type%</msg>
   <msg key="create_this_page_in_language">Create this page in a different language</msg>
Index: openacs-4/packages/xowiki/catalog/xowiki.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/catalog/xowiki.es_ES.ISO-8859-1.xml,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/xowiki/catalog/xowiki.es_ES.ISO-8859-1.xml	29 Jul 2007 21:31:53 -0000	1.7
+++ openacs-4/packages/xowiki/catalog/xowiki.es_ES.ISO-8859-1.xml	21 Nov 2007 09:13:26 -0000	1.8
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="xowiki" package_version="0.59" locale="es_ES" charset="ISO-8859-1">
+<message_catalog package_key="xowiki" package_version="0.78" locale="es_ES" charset="ISO-8859-1">
 
   <msg key="admin">Administrar</msg>
   <msg key="back">Volver</msg>
+  <msg key="categories">Categor�as</msg>
   <msg key="create_this_page_in_language">Crear esta p�gina en un lenguaje diferente</msg>
   <msg key="delete">Borrar</msg>
   <msg key="edit">Editar</msg>
Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl	20 Nov 2007 11:00:04 -0000	1.3
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl	21 Nov 2007 09:13:27 -0000	1.4
@@ -1081,7 +1081,7 @@
         <INPUT name='new_tags' type='text' value="$tags">
       </FORM>
       </span>
-      <span id='[my id]-popular_tags' style='display: none'></span><br/>
+      <span id='[my id]-popular_tags' style='display: none'></span><br />
     }]
     return $content
   }
@@ -1136,7 +1136,7 @@
       lappend entries $entry
     }
     if {[llength $entries]>0} {
-      set content "Categories: [join $entries {, }]"
+      set content "#xowiki.categories#: [join $entries {, }]"
     }
     return $content
   }
Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -r1.187 -r1.188
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	20 Nov 2007 11:00:04 -0000	1.187
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	21 Nov 2007 09:13:27 -0000	1.188
@@ -445,7 +445,7 @@
 
   Page instproc error_in_includelet {arg msg} {
     my instvar name
-    return [my error_during_render "[_ xowiki.error_in_includelet]<br/>\n$msg"]
+    return [my error_during_render "[_ xowiki.error_in_includelet]<br />\n$msg"]
   }
   
   Page ad_instproc resolve_included_page_name {page_name} {
Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v
diff -u -r1.110 -r1.111
--- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	20 Nov 2007 11:00:04 -0000	1.110
+++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl	21 Nov 2007 09:13:27 -0000	1.111
@@ -59,7 +59,7 @@
           "</div>\n"
     }
 
-    append footer [my include my-references]  <br>
+    append footer [my include my-references] 
     
     if {[$package_id get_parameter "show_per_object_categories" 1]} {
       append footer [my include my-categories]  <br>
@@ -190,7 +190,7 @@
         set __adp_stub [acs_root_dir]/packages/xowiki/www/view-default
         set template_code [template::adp_compile -string $template]
         if {[catch {set content [template::adp_eval template_code]} errmsg]} {
-          ns_return 200 text/html "Error in Page $name: $errmsg<br/>$template"
+          ns_return 200 text/html "Error in Page $name: $errmsg<br />$template"
         } else {
           ns_return 200 text/html $content
         }
@@ -992,8 +992,8 @@
     #set lines1 [split $doc1 "\n"]
     #set lines2 [split $doc2 "\n"]
     
-    regsub -all \n $doc1 " <br/>" doc1
-    regsub -all \n $doc2 " <br/>" doc2
+    regsub -all \n $doc1 " <br />" doc1
+    regsub -all \n $doc2 " <br />" doc2
     set lines1 [split $doc1 " "]
     set lines2 [split $doc2 " "]