Index: openacs-4/packages/acs-lang/www/admin/import-messages.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/import-messages.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/acs-lang/www/admin/import-messages.adp	9 Dec 2003 13:41:52 -0000	1.1.2.1
+++ openacs-4/packages/acs-lang/www/admin/import-messages.adp	9 Feb 2004 16:37:49 -0000	1.1.2.2
@@ -21,6 +21,14 @@
   deleted: @message_count.deleted@.
 </p>
 
+<if @message_count.errors@ not nil>
+<p>
+  The following errors were produced:
+
+  @errors_list;noquote@
+</p>
+</if>
+
 <if @conflict_count@ gt 0>
   <font color="red">There are @conflict_count@ message conflicts in the database.</font> 
 
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.2 -r1.1.2.3
--- openacs-4/packages/acs-lang/www/admin/import-messages.tcl	11 Dec 2003 12:42:03 -0000	1.1.2.2
+++ openacs-4/packages/acs-lang/www/admin/import-messages.tcl	9 Feb 2004 16:37:49 -0000	1.1.2.3
@@ -23,4 +23,10 @@
                         -package_key $package_key \
                         -locale $locale]
 
+set errors_list "<ul>
+  <li>
+    [join $message_count(errors) "</li><li>"]
+</ul>
+"
+
 set conflict_url [export_vars -base message-conflicts { package_key locale }]
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/acs-lang/www/admin/message-conflict-revert.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
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.3 -r1.1.2.4
--- openacs-4/packages/acs-lang/www/admin/message-conflicts.tcl	12 Dec 2003 13:35:16 -0000	1.1.2.3
+++ openacs-4/packages/acs-lang/www/admin/message-conflicts.tcl	9 Feb 2004 16:37:49 -0000	1.1.2.4
@@ -24,7 +24,15 @@
     -name messages \
     -multirow messages \
     -no_data "There are no conflicts" \
+    -sub_class narrow \
     -elements {
+        edit {
+            label ""
+            display_template {
+                <img src="/shared/images/Edit16.gif" border="0" width="16" height="16">
+            }
+            link_url_col edit_url
+        }
         package_key {
             label "Package"
         }
@@ -34,31 +42,36 @@
         locale {
             label "Locale"
         }
+        accept {
+            label ""
+            display_template "Accept new"
+            link_url_col accept_url
+        }
         message {
-            label "Message"
-            link_url_col edit_url
-            display_eval {[string_truncate -len 50 -- $message]}
+            label "New Message"
+            display_col message_truncated
         }
-        upgrade_status {
-            label "Status"
+        old_message {
+            label "Old Message"
+            display_col old_message_truncated
         }
-        accept {
+        revert {
             label ""
-            display_template {
-                Mark resolved
-            }
-            link_url_col accept_url
-            link_html {title "Click to accept current state of message and consider conflict resolved."}
+            display_template "Revert to old"
+            link_url_col revert_url
         }
+        upgrade_status {
+            label "Status"
+        }
     } -filters {
         locale {
             label "Locale"
-            where_clause "locale = :locale"
+            where_clause "lm.locale = :locale"
             values {[db_list_of_lists locales {select distinct locale, locale from lang_messages where conflict_p = 't'}]}
         }
         package_key {
             label "Package"
-            where_clause "package_key = :package_key"
+            where_clause "lm.package_key = :package_key"
             values {[db_list_of_lists packages {
                 select pt.pretty_name, 
                        pt.package_key 
@@ -71,7 +84,7 @@
         }
         upgrade_status {
             label "Status"
-            where_clause "upgrade_status = :upgrade_status"
+            where_clause "lm.upgrade_status = :upgrade_status"
             values {[db_list_of_lists upgrade_statuses {
                 select distinct upgrade_status, upgrade_status
                 from lang_messages
@@ -80,17 +93,34 @@
         }
     }
 
-db_multirow -unclobber -extend { edit_url accept_url } messages select_messages "
-    select package_key,
-           locale,
-           message_key,
-           message,
-           deleted_p,
-           upgrade_status
-    from lang_messages
-    where conflict_p = 't'
+db_multirow -unclobber -extend { edit_url accept_url revert_url message_truncated old_message_truncated } messages select_messages "
+    select lm.package_key,
+           lm.locale,
+           lm.message_key,
+           lm.message,
+           lma.old_message,
+           lm.deleted_p,
+           lm.upgrade_status
+    from lang_messages lm,
+         lang_messages_audit lma
+    where lm.conflict_p = 't'
+      and lm.package_key = lma.package_key
+      and lm.message_key = lma.message_key
+      and lm.locale = lma.locale
+      and lma.audit_id = (select max(audit_id)
+                          from lang_messages_audit lma2
+                          where lma2.package_key = lm.package_key
+                            and lma2.message_key = lm.message_key
+                            and lma2.locale = lm.locale
+                          )
     [template::list::filter_where_clauses -and -name messages]
+    order by lm.package_key, lm.message_key
 " {
     set edit_url [export_vars -base "edit-localized-message" { package_key locale message_key }]
+
     set accept_url [export_vars -base "message-conflict-resolve" { package_key locale message_key {return_url [ad_return_url]}}]
+    set revert_url [export_vars -base "message-conflict-revert" { package_key locale message_key {return_url [ad_return_url]}}]
+
+    set message_truncated [string_truncate -len 150 -- $message]
+    set old_message_truncated [string_truncate -len 150 -- $old_message]
 }