Index: openacs-4/packages/acs-templating/catalog/acs-templating.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/catalog/acs-templating.en_US.ISO-8859-1.xml,v
diff -u -N -r1.17.2.2 -r1.17.2.3
--- openacs-4/packages/acs-templating/catalog/acs-templating.en_US.ISO-8859-1.xml	2 Mar 2007 06:05:54 -0000	1.17.2.2
+++ openacs-4/packages/acs-templating/catalog/acs-templating.en_US.ISO-8859-1.xml	22 Mar 2007 11:53:49 -0000	1.17.2.3
@@ -14,10 +14,16 @@
   <msg key="Element_is_required">%label% is required</msg>
   <msg key="Element_is_too_long_Plural">%label% is %excess_no_bytes% characters too long.</msg>
   <msg key="Element_is_too_long_Singular">%label% is one character too long.</msg>
+  <msg key="Enhanced_Text">Enhanced Text
+</msg>
   <msg key="Enter_your_search_text">Enter your search text here</msg>
+  <msg key="Fixed_width_Text">Fixed-width Text</msg>
+  <msg key="Format">Format
+</msg>
   <msg key="Formats">Formats</msg>
   <msg key="hours">hours</msg>
   <msg key="Hours_must_be_between_0_and_23">Hours must be between 0 and 23</msg>
+  <msg key="HTML">HTML</msg>
   <msg key="HTMLArea_action_cancel">Cancel</msg>
   <msg key="HTMLArea_ImageAlignment">Alignment</msg>
   <msg key="HTMLArea_ImageAlignmentBottom">Bottom</msg>
@@ -80,6 +86,7 @@
   <msg key="Only_myself">Only myself</msg>
   <msg key="Page">Page</msg>
   <msg key="Page_Size">Page Size</msg>
+  <msg key="Plain_Text">Plain Text</msg>
   <msg key="Previous_with_arrow">&lt;&lt; Previous</msg>
   <msg key="required">required</msg>
   <msg key="reverse_sort_order_of_label">Reverse the sort order of %label%</msg>
Index: openacs-4/packages/acs-templating/catalog/acs-templating.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/catalog/acs-templating.es_ES.ISO-8859-1.xml,v
diff -u -N -r1.10.2.1 -r1.10.2.2
--- openacs-4/packages/acs-templating/catalog/acs-templating.es_ES.ISO-8859-1.xml	22 Mar 2007 10:13:57 -0000	1.10.2.1
+++ openacs-4/packages/acs-templating/catalog/acs-templating.es_ES.ISO-8859-1.xml	22 Mar 2007 11:53:49 -0000	1.10.2.2
@@ -14,10 +14,17 @@
   <msg key="Element_is_required">%label% es obligatorio</msg>
   <msg key="Element_is_too_long_Plural">%label% es %excess_no_bytes% caracteres demasiado largo.</msg>
   <msg key="Element_is_too_long_Singular">%label% es un caracater muy largo.</msg>
+  <msg key="Enhanced_Text">Texto Enriquecido</msg>
   <msg key="Enter_your_search_text">Introduzca el texto a buscar</msg>
+  <msg key="Fixed_width_Text">Preformateado
+</msg>
+  <msg key="Format">Formato
+</msg>
   <msg key="Formats">Formatos</msg>
   <msg key="hours">horas</msg>
   <msg key="Hours_must_be_between_0_and_23">La hora debe estar comprendida entre 0 y 23</msg>
+  <msg key="HTML">HTML
+</msg>
   <msg key="HTMLArea_action_cancel">Cancelar</msg>
   <msg key="HTMLArea_ImageAlignment">Alineaci�n</msg>
   <msg key="HTMLArea_ImageAlignmentBottom">Inferior</msg>
@@ -80,6 +87,7 @@
   <msg key="Only_myself">S�lo yo</msg>
   <msg key="Page">P�gina</msg>
   <msg key="Page_Size">Tama�o de P�gina</msg>
+  <msg key="Plain_Text">Texto Plano</msg>
   <msg key="Previous_with_arrow">&lt;&lt; Anterior</msg>
   <msg key="required">obligatorio</msg>
   <msg key="reverse_sort_order_of_label">Invertir el orden de %label%</msg>
Index: openacs-4/packages/acs-templating/tcl/richtext-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/richtext-procs.tcl,v
diff -u -N -r1.25.2.3 -r1.25.2.4
--- openacs-4/packages/acs-templating/tcl/richtext-procs.tcl	19 Mar 2007 15:26:36 -0000	1.25.2.3
+++ openacs-4/packages/acs-templating/tcl/richtext-procs.tcl	22 Mar 2007 11:53:50 -0000	1.25.2.4
@@ -51,12 +51,11 @@
 ad_proc -public template::util::richtext::format_options {} {
     Returns a formatting option list
 } {
-    return { 
-        {"Enhanced Text" text/enhanced}
-        {"Plain Text" text/plain}
-        {"Fixed-width Text" text/fixed-width}
-        {"HTML" text/html}
-    }
+    return [list \
+                [list [_ acs-templating.Enhanced_Text] text/enhanced] \
+                [list [_ acs-templating.Plain_Text] text/plain] \
+                [list [_ acs-templating.Fixed_width_Text] text/fixed-width] \
+                [list [_ acs-templating.HTML] text/html]]
 }
 
 ad_proc -public template::data::validate::richtext {
@@ -266,13 +265,13 @@
       if { $htmlarea_p } {
           append output "<input name=\"$element(id).format\" value=\"text/html\" type=\"hidden\">"
       } else {
-          append output "<br/>Format: [menu $element(id).format [template::util::richtext::format_options] $format attributes]"
+          append output "<br/>[_ acs-templating.Format]: [menu $element(id).format [template::util::richtext::format_options] $format attributes]"
       }
           
       # Spell-checker
       array set spellcheck [template::util::spellcheck::spellcheck_properties -element_ref element]
       if { $spellcheck(render_p) } {
-          append output " Spellcheck: [menu "$element(id).spellcheck" [nsv_get spellchecker lang_options] $spellcheck(selected_option) attributes]"
+          append output " [_ acs-templating.Spellcheck]: [menu "$element(id).spellcheck" [nsv_get spellchecker lang_options] $spellcheck(selected_option) attributes]"
       }
   } else {
       # Display mode
@@ -434,12 +433,12 @@
 	# which the richtext widget won't work but which do have js enabled 
 	# should output since we need the format widget (this for Safari among 
 	# some others)
-	set noscript_output "$output <br/>Format: $format_menu\n"
+          set noscript_output "$output <br/>[_ acs-templating.Format]: $format_menu\n"
 
 	set output "<script type='text/javascript'><!--\nwriteRichText('$element(id)','$contents',500,200,true,false,'<input name=\"$element(id).format\" value=\"text/html\" type=\"hidden\">','[string map {\n \\n \r {} "'" "&\#39"} $output]'); //--></script><noscript id=\"rte-noscr-$element(id)\">$noscript_output</noscript>"
       } elseif {$richtextEditor eq "xinha"} {
 	append output "<script>document.write(\"<input name='$element(id).format' value='text/html' type='hidden'>\");</script>\n"
-	append output "<noscript><br/>Format: $format_menu</noscript>\n"
+          append output "<noscript><br/>[_ acs-templating.Format]: $format_menu</noscript>\n"
 	
 	# we have a xinha richtext widget, specified by "options {editor xinha}"
 	# The following options are supported: 
@@ -490,14 +489,14 @@
         } else {
 	    append output ""
 	}
-      append output "<br/>Format: $format_menu"
+        append output "<br/>[_ acs-templating.Format]: $format_menu"
     }
 
     # Spell-checker
     array set spellcheck [template::util::spellcheck::spellcheck_properties \
 			      -element_ref element]
     if { $spellcheck(render_p) } {
-      append output " Spellcheck: " \
+        append output " [_  acs-templating.Spellcheck]: " \
 	  [menu "$element(id).spellcheck" [nsv_get spellchecker lang_options] \
 	       $spellcheck(selected_option) attributes]
     }