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.2 -r1.3
--- openacs-4/packages/acs-lang/www/admin/message-conflicts.tcl	11 Dec 2003 21:39:53 -0000	1.2
+++ openacs-4/packages/acs-lang/www/admin/message-conflicts.tcl	26 Jan 2004 15:39:45 -0000	1.3
@@ -6,9 +6,19 @@
 } {
     locale:optional
     package_key:optional
+    upgrade_status: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 \
@@ -59,7 +69,15 @@
                 order  by pretty_name
             }]}
         }
-
+        upgrade_status {
+            label "Status"
+            where_clause "upgrade_status = :upgrade_status"
+            values {[db_list_of_lists upgrade_statuses {
+                select distinct upgrade_status, upgrade_status
+                from lang_messages
+                where conflict_p = 't'
+            }]}
+        }
     }
 
 db_multirow -unclobber -extend { edit_url accept_url } messages select_messages "