Index: openacs-4/packages/acs-lang/www/admin/import-messages.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/import-messages.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/acs-lang/www/admin/import-messages.tcl	9 Dec 2003 13:41:52 -0000	1.1.2.1
+++ openacs-4/packages/acs-lang/www/admin/import-messages.tcl	11 Dec 2003 12:42:03 -0000	1.1.2.2
@@ -15,10 +15,9 @@
     ad_script_abort
 }
 
-set locales [list $locale]
 array set message_count [lang::catalog::import \
                              -package_key $package_key \
-                             -locales $locales]
+                             -locales $locale]
 
 set conflict_count [lang::message::conflict_count \
                         -package_key $package_key \
Index: openacs-4/packages/acs-lang/www/admin/message-conflicts.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-conflicts.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/acs-lang/www/admin/message-conflicts.adp	9 Dec 2003 13:41:52 -0000	1.1.2.1
+++ openacs-4/packages/acs-lang/www/admin/message-conflicts.adp	11 Dec 2003 12:42:03 -0000	1.1.2.2
@@ -1,5 +1,6 @@
 <master>
   <property name="title">@page_title@</property>
+  <property name="context">@context;noquote@</property>
 
 <p>
   This page lists conflicts resulting from message catalog imports that need manual resolution by a translator
Index: openacs-4/packages/acs-lang/www/admin/message-conflicts.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/message-conflicts.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/acs-lang/www/admin/message-conflicts.tcl	9 Dec 2003 13:41:52 -0000	1.1.2.1
+++ openacs-4/packages/acs-lang/www/admin/message-conflicts.tcl	11 Dec 2003 12:42:03 -0000	1.1.2.2
@@ -8,7 +8,16 @@
     package_key:optional
 }
 
+foreach optional_var {locale package_key} {
+    if { [info exists $optional_var] } {
+        if { [empty_string_p [set $optional_var]] } {
+            unset $optional_var
+        }
+    }
+}
+
 set page_title "I18N Message Conflicts"
+set context [list $page_title]
 
 list::create \
     -name messages \