Index: openacs-4/packages/acs-lang/www/admin/batch-editor.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/batch-editor.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/acs-lang/www/admin/batch-editor.adp	27 Oct 2014 16:39:38 -0000	1.7
+++ openacs-4/packages/acs-lang/www/admin/batch-editor.adp	19 Jun 2015 17:58:53 -0000	1.8
@@ -1,6 +1,14 @@
 <master>
   <property name="doc(title)">@page_title@</property>
   <property name="context">@context;noquote@</property>
+  <property name="head">
+  <style type="text/css">
+  table.plain {background: #dddddd; border-spacing: 1px; border-collapse: separate;}
+  table.plain tr {background: white;}
+  table.plain td.high {text-align: left; padding: 2px; background: #ffffaa;}
+  table.plain th, table.plain td {text-align: left; padding: 2px;}
+  </style>
+  </property>
 
 <p>
   Show: 
@@ -16,47 +24,43 @@
 </if>
 <else>
   <if @pagination:rowcount@ ne "1">
-    <p>
-      <table cellspacing="1" cellpadding="2" bgcolor="#dddddd">
+      <table class="plain">
         <multiple name="pagination">
-          <tr bgcolor="white">
+          <tr>
             <group column="group">    
               <if @pagination.selected@ eq "1">
-                <td align="left" bgcolor="#ffffa"><b>@pagination.text@</b>
+                <td class="high"><b>@pagination.text@</b>
               </if>
               <else>
-                <td align="left">
+                <td>
                 <a href="@pagination.url@" title="@pagination.hint@">@pagination.text@</a>
               </else>
               </td>
             </group>
           </tr>
         </multiple>
       </table>
-    </p>
   </if>
 
   <!-- TODO: Remove 'style' when we've merged 4.6.4 back onto HEAD -->
   <formtemplate id="batch_editor"></formtemplate>
 
   <if @pagination:rowcount@ ne "1">
-    <p>
-      <table cellspacing="1" cellpadding="2" bgcolor="#dddddd">
+      <table class="plain">
         <multiple name="pagination">
-          <tr bgcolor="white">
+          <tr>
             <group column="group">    
               <if @pagination.selected@ eq "1">
-                <td align="left" bgcolor="#ffffa"><b>@pagination.text@</b>
+                <td class="high"><b>@pagination.text@</b>
               </if>
               <else>
-                <td align="left">
+                <td>
                 <a href="@pagination.url@" title="@pagination.hint@">@pagination.text@</a>
               </else>
               </td>
             </group>
           </tr>
         </multiple>
       </table>
-    </p>
   </if>
 </else>
Index: openacs-4/packages/acs-lang/www/admin/batch-editor.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/batch-editor.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-lang/www/admin/batch-editor.tcl	14 May 2007 20:30:23 -0000	1.8
+++ openacs-4/packages/acs-lang/www/admin/batch-editor.tcl	19 Jun 2015 17:58:53 -0000	1.9
@@ -17,8 +17,8 @@
 set default_locale_label [lang::util::get_label $default_locale]
 
 set page_title "Batch edit messages"
-set context [list [list "package-list?[export_vars { locale }]" $locale_label] \
-                 [list "message-list?[export_vars { locale package_key show }]" $package_key] \
+set context [list [list [export_vars -base package-list {locale}] $locale_label] \
+                 [list [export_vars -base message-list {locale package_key show}] $package_key] \
                  $page_title]
 
 
@@ -156,24 +156,24 @@
     ad_form -extend -name batch_editor -form \
         [list [list "message_key_$count:text(hidden)" {value $message_key}]]
     
-    set message_url "edit-localized-message?[export_vars { locale package_key message_key show }]"
+    set message_url [export_vars -base edit-localized-message { locale package_key message_key show }]
 
-	# Adding section
-	set section_name "$package_key.$message_key"
-	if { ![info exists sections($section_name)] } {
-		set sec [list "-section" $section_name {legendtext "$section_name"}]
-		ad_form -extend -name batch_editor -form [list $sec]
-		set sections($section_name) "$section_name"
-	}
+    # Adding section
+    set section_name "$package_key.$message_key"
+    if { ![info exists sections($section_name)] } {
+	set sec [list "-section" $section_name {legendtext "$section_name"}]
+	ad_form -extend -name batch_editor -form [list $sec]
+	set sections($section_name) "$section_name"
+    }
 
     ad_form -extend -name batch_editor -form \
         [list [list "message_key_pretty_$count:text(inform)" \
                    {label "Message Key"} \
-                   {value "<a href=\"$message_url\">$package_key.$message_key</a>"}]]
+                   {value "<a href=\"[ns_quotehtml $message_url]\">$package_key.$message_key</a>"}]]
     
     if { $description ne "" } {
         set description_edit_url "edit-description?[export_vars { locale package_key message_key show }]"
-        set description "[ad_text_to_html -- $description] [subst { (<a href="$description_edit_url">edit</a>)}]"
+        set description "[ad_text_to_html -- $description] [subst { (<a href="[ns_quotehtml $description_edit_url]">edit</a>)}]"
 
         ad_form -extend -name batch_editor -form \
             [list [list "description_$count:text(inform),optional" \
Index: openacs-4/packages/acs-lang/www/admin/edit-localized-message.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/edit-localized-message.adp,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/acs-lang/www/admin/edit-localized-message.adp	27 Oct 2014 16:39:38 -0000	1.14
+++ openacs-4/packages/acs-lang/www/admin/edit-localized-message.adp	19 Jun 2015 17:58:53 -0000	1.15
@@ -4,7 +4,7 @@
  <property name="focus">message.message</property>
 
 <!-- TODO: Remove 'style' when we've merged 4.6.4 back onto HEAD -->
-<formtemplate id="message"></formtemplate>
+<formtemplate id="message_form"></formtemplate>
 
 <h2>Audit Trail</h2>
 
Index: openacs-4/packages/acs-lang/www/admin/edit-localized-message.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/edit-localized-message.tcl,v
diff -u -r1.19 -r1.20
--- openacs-4/packages/acs-lang/www/admin/edit-localized-message.tcl	14 Jun 2015 00:11:01 -0000	1.19
+++ openacs-4/packages/acs-lang/www/admin/edit-localized-message.tcl	19 Jun 2015 17:58:53 -0000	1.20
@@ -51,7 +51,7 @@
 set delete_url [export_vars -base message-delete { locale package_key message_key show {return_url {[ad_return_url]}} }]
 
 
-ad_form -name message -form {
+ad_form -name message_form -form {
     {locale:text(hidden),optional {value $current_locale}}
     {package_key:text(hidden),optional {value $package_key}}
     {message_key:text(hidden),optional {value $message_key}}
@@ -69,17 +69,17 @@
 } 
 
 if { $default_locale ne $current_locale } {
-    ad_form -extend -name message -form {
+    ad_form -extend -name message_form -form {
         {original_message:text(inform)
             {label "$default_locale_label Message"}
         }
     }
 }
     
-ad_form -extend -name message -form {
+ad_form -extend -name message_form -form {
     {message:text(textarea)
         {label "$locale_label Message"} 
-        {html { rows 6 cols 40 }}
+        {html { rows 6 cols 40 } }
     }
     {comment:text(textarea),optional
         {label "Comment"}
@@ -122,12 +122,12 @@
     } else {
         set message $original_message
     }
-    set original_message [ad_quotehtml $original_message]
+    set original_message [ns_quotehtml $original_message]
 
     if { $description eq "" } {
-        set description [subst {(<a href="$description_edit_url">add description</a>)}]
+        set description [subst {(<a href="[ns_quotehtml $description_edit_url]">add description</a>)}]
     } else {
-        set description "[ad_text_to_html -- $description] [subst { (<a href="$description_edit_url">edit</a>)}]"
+        set description "[ad_text_to_html -- $description] [subst { (<a href="[ns_quotehtml $description_edit_url]">edit</a>)}]"
     }
 
     # Augment the audit trail with info on who created the first message
@@ -162,7 +162,11 @@
             }
         } 
 
-        set first_translated_message "<ul> <li>First translated by [acs_community_member_link -user_id $creation_user_id -label $creation_user_name] on $creation_date</li></ul>"
+        set first_translated_message [subst {
+	    <ul> <li>First translated by
+	    [acs_community_member_link -user_id $creation_user_id -label $creation_user_name] on $creation_date
+	    </li></ul>
+	}]
     } else {
         set first_translated_message ""
     }
@@ -182,7 +186,7 @@
     lang::message::register -comment $comment $locale $package_key $message_key $message
 
     if { $return_url eq "" } {
-        set return_url "[ad_conn url]?[export_vars { locale package_key message_key show }]"
+        set return_url [export_vars -base [ad_conn url] { locale package_key message_key show }]
     }
     ad_returnredirect $return_url
     ad_script_abort
Index: openacs-4/packages/acs-lang/www/admin/message-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-list.adp,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/acs-lang/www/admin/message-list.adp	27 Oct 2014 16:39:39 -0000	1.13
+++ openacs-4/packages/acs-lang/www/admin/message-list.adp	19 Jun 2015 17:58:53 -0000	1.14
@@ -3,10 +3,10 @@
   <property name="context">@context;noquote@</property>
   <div style="float: right;">
     <formtemplate id="locale_form">
+      @form_vars;noquote@
       <table cellspacing="2" cellpadding="2" border="0">
         <tr class="form-element"><td class="form-label">Language</td>
         <td class="form-widget"><formwidget id="locale"></td></tr>
-        @form_vars;noquote@
         <tr class="form-element">
         <td align="left" colspan="2"><formwidget id="formbutton:ok"></td></tr>
       </table>
@@ -60,7 +60,7 @@
           <multiple name="messages">
             <tr style="background: #EEEEEE">
               <td>
-                <a href="@messages.edit_url@" title="Edit or comment on translation"><img src="/shared/images/Edit16.gif" border="0" width="16" height="16"></a>
+                <a href="@messages.edit_url@" title="Edit or comment on translation"><img src="/shared/images/Edit16.gif" width="16" height="16" alt="edit"></a>
               </td>
               <td>
                 <a href="@messages.edit_url@" title="Edit or comment on translation">@messages.message_key_pretty@</a>
@@ -79,7 +79,7 @@
               </if>
               <if @messages.translated_message@ not nil>
                 <td>
-                  <a href="@messages.delete_url@" title="Delete this messages"><img src="/shared/images/Delete16.gif" border="0" width="16" height="16"></a>
+                  <a href="@messages.delete_url@" title="Delete this messages"><img src="/shared/images/Delete16.gif" alt="delete" width="16" height="16"></a>
                 </td>
              </if>
             </tr>
Index: openacs-4/packages/acs-lang/www/admin/message-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-list.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/acs-lang/www/admin/message-list.tcl	7 Apr 2011 16:28:27 -0000	1.15
+++ openacs-4/packages/acs-lang/www/admin/message-list.tcl	19 Jun 2015 17:58:53 -0000	1.16
@@ -38,7 +38,7 @@
 # We let you create new messages keys if you're in the default locale
 set create_p [string equal $current_locale $default_locale]
 
-set new_message_url "localized-message-new?[export_vars { locale package_key }]"
+set new_message_url [export_vars -base localized-message-new { locale package_key }]