Index: openacs-4/packages/acs-lang/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/index.tcl,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/acs-lang/www/admin/index.tcl	10 Jan 2007 21:22:04 -0000	1.9
+++ openacs-4/packages/acs-lang/www/admin/index.tcl	7 Apr 2011 16:28:27 -0000	1.10
@@ -37,7 +37,13 @@
 #
 #####
 
-set num_messages [db_string num_messages { select count(*) from lang_message_keys }]
+set default_locale "en_US"
+db_1row counts {
+    select count(*) as num_messages
+    from lang_messages 
+    where locale = :default_locale 
+      and deleted_p = 'f'
+}
 
 db_multirow -extend { 
     escaped_locale
@@ -56,7 +62,7 @@
            l.default_p as default_p,
            l.enabled_p as enabled_p,
            (select count(*) from ad_locales l2 where l2.language = l.language) as num_locales_for_language,
-           (select count(*) from lang_messages lm2 where lm2.locale = l.locale) as num_translated
+           (select count(*) from lang_messages lm2 where lm2.locale = l.locale and lm2.deleted_p = 'f') as num_translated
     from   ad_locales l
     order  by locale_label
 } {
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 -N -r1.14 -r1.15
--- openacs-4/packages/acs-lang/www/admin/message-list.tcl	18 Apr 2008 06:48:43 -0000	1.14
+++ openacs-4/packages/acs-lang/www/admin/message-list.tcl	7 Apr 2011 16:28:27 -0000	1.15
@@ -62,19 +62,17 @@
             (select count(*) 
              from lang_messages 
              where package_key = :package_key 
-             and locale = :locale 
+             and locale = :default_locale 
              and deleted_p = 't') as num_deleted
     from dual
 }
 set num_untranslated [expr {$num_messages - $num_translated}]
-set num_messages_pretty [lc_numeric $num_messages]
+set num_messages_pretty [lc_numeric [expr {$num_messages + $num_deleted}]]
 set num_translated_pretty [lc_numeric $num_translated]
 set num_untranslated_pretty [lc_numeric $num_untranslated]
+set num_deleted_pretty [lc_numeric $num_deleted]
 
 
-
-
-
 #####
 #
 # Handle filtering
@@ -139,7 +137,7 @@
 multirow append show_opts "all" "All" $num_messages_pretty
 multirow append show_opts "translated" "Translated" $num_translated_pretty
 multirow append show_opts "untranslated" "Untranslated" $num_untranslated_pretty
-multirow append show_opts "deleted" "Deleted" $num_deleted
+multirow append show_opts "deleted" "Deleted" $num_deleted_pretty
 
 multirow extend show_opts url selected_p 
 
Index: openacs-4/packages/acs-lang/www/admin/package-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/package-list.tcl,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/acs-lang/www/admin/package-list.tcl	18 Apr 2008 06:48:43 -0000	1.9
+++ openacs-4/packages/acs-lang/www/admin/package-list.tcl	7 Apr 2011 16:28:27 -0000	1.10
@@ -54,10 +54,12 @@
            (select count(*) 
             from   lang_messages lm 
             where  lm.package_key = q.package_key
-            and    lm.locale = :current_locale) as num_translated
+            and    lm.locale = :current_locale
+            and    lm.deleted_p = 'f') as num_translated
     from   (select lmk.package_key,
                    count(message_key) as num_messages
-            from   lang_message_keys lmk
+            from   lang_messages lmk
+            where  lmk.locale = :default_locale and lmk.deleted_p = 'f' 
             group  by package_key) q
     order  by package_key
 } {