Index: openacs-4/packages/acs-lang/tcl/lang-catalog-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-catalog-procs.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-lang/tcl/lang-catalog-procs.xql	7 Oct 2002 14:32:45 -0000	1.1
+++ openacs-4/packages/acs-lang/tcl/lang-catalog-procs.xql	21 Oct 2002 11:39:12 -0000	1.2
@@ -1,27 +1,49 @@
 <?xml version="1.0"?>
 <queryset>
 
-  <fullquery name="lang::catalog::load_all.all_enabled_packages">
+  <fullquery name="lang::catalog::import_from_all_files.all_enabled_not_loaded_packages">
     <querytext>
       select package_key
       from   apm_package_types
       where  exists (select 1 
                      from   apm_package_versions
                      where  installed_p = 't'
                      and    enabled_p = 't')
+       and not exists (select 1
+                       from lang_message_keys
+                       where package_key = apm_package_types.package_key)
     </querytext>
   </fullquery>
 
+  <fullquery name="lang::catalog::export_package_to_files.get_locales_for_package">
+    <querytext>
+        select distinct locale
+        from lang_messages
+        where package_key = :package_key
+    </querytext>
+  </fullquery>
+
+  <fullquery name="lang::catalog::export_package_to_files.get_messages">
+    <querytext>
+        select message_key, message
+        from lang_messages
+        where package_key = :package_key
+        and locale = :locale
+    </querytext>
+  </fullquery>
+
   <fullquery name="lang::catalog::translate.get_untranslated_messages">
     <querytext>
-      select key,
+      select message_key,
+             package_key,
              message 
       from   lang_messages lm1 
       where  locale = :default_locale
-      and    not exists (select 1 
+      and    not exists (select message_key, package_key
                          from   lang_messages lm2 
                          where  locale != :default_locale
-                         and    lm1.key = lm2.key)
+                         and    lm1.message_key = lm2.message_key
+                         and    lm1.package_key = lm2.package_key)
     </querytext>
   </fullquery>