Index: openacs-4/packages/acs-lang/www/admin/export-locale-from-files.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/Attic/export-locale-from-files.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-lang/www/admin/export-locale-from-files.adp	22 Oct 2003 11:17:50 -0000	1.1
@@ -0,0 +1,11 @@
+<master>
+ <property name="title">@page_title;noquote@</property>
+ <property name="context">@context;noquote@</property>
+
+<p>
+  Export finished.
+</p>
+
+<p>
+  <b>&raquo;</b> <a href="@return_url@">Return to the locale page</a>
+</p>
Index: openacs-4/packages/acs-lang/www/admin/export-locale-from-files.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/Attic/export-locale-from-files.tcl,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/acs-lang/www/admin/export-locale-from-files.tcl	22 Oct 2003 11:17:50 -0000	1.1
@@ -0,0 +1,16 @@
+ad_page_contract {
+    Export all catalog messages for a given locale to 
+    the file system.
+
+    @author Lars Pind (lars@collaboraid.biz)
+} {
+    locale
+}
+
+set locale_label [ad_locale_get_label $locale]
+set page_title "Export all messages for locale $locale"
+set return_url [export_vars -base package-list { locale }]
+set context [list [list $return_url $locale_label] $page_title]
+
+lang::catalog::export -locales [list $locale]
+
Index: openacs-4/packages/acs-lang/www/admin/import-locale-from-files.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/import-locale-from-files.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-lang/www/admin/import-locale-from-files.adp	18 Sep 2003 11:57:58 -0000	1.1
+++ openacs-4/packages/acs-lang/www/admin/import-locale-from-files.adp	22 Oct 2003 11:17:50 -0000	1.2
@@ -2,4 +2,10 @@
  <property name="title">@page_title;noquote@</property>
  <property name="context">@context;noquote@</property>
 
-Import finished. You may return to <a href="@locale_page_url@">the locale page</a>.
\ No newline at end of file
+<p>
+  Import finished.
+</p>
+
+<p>
+  <b>&raquo;</b> <a href="@return_url@">Return to the locale page</a>
+</p>
Index: openacs-4/packages/acs-lang/www/admin/import-locale-from-files.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/import-locale-from-files.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-lang/www/admin/import-locale-from-files.tcl	16 Oct 2003 10:50:12 -0000	1.2
+++ openacs-4/packages/acs-lang/www/admin/import-locale-from-files.tcl	22 Oct 2003 11:17:50 -0000	1.3
@@ -9,9 +9,11 @@
     locale
 }
 
-set page_title "Import of messages for locale $locale"
-set context [list $page_title]
+set locale_label [ad_locale_get_label $locale]
+set page_title "Import all messages for locale $locale"
+set return_url [export_vars -base package-list { locale }]
+set context [list [list $return_url $locale_label] $page_title]
 
 lang::catalog::import -locales [list $locale]
 
-set locale_page_url [export_vars -base package-list { locale }]
+
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 -r1.3 -r1.4
--- openacs-4/packages/acs-lang/www/admin/message-list.tcl	18 Aug 2003 10:31:41 -0000	1.3
+++ openacs-4/packages/acs-lang/www/admin/message-list.tcl	22 Oct 2003 11:17:50 -0000	1.4
@@ -28,7 +28,7 @@
 set default_locale_label [ad_locale_get_label $default_locale]
 
 set page_title $package_key
-set context [list [list "package-list?[export_vars { locale }]" $locale_label] $page_title]
+set context [list [list [export_vars -base package-list { locale }] $locale_label] $page_title]
 
 set site_wide_admin_p [permission::permission_p \
                            -party_id [ad_conn user_id] \
Index: openacs-4/packages/acs-lang/www/admin/package-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/package-list.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-lang/www/admin/package-list.adp	18 Sep 2003 11:57:58 -0000	1.3
+++ openacs-4/packages/acs-lang/www/admin/package-list.adp	22 Oct 2003 11:17:50 -0000	1.4
@@ -8,8 +8,11 @@
 
 <if @locale_enabled_p@>
   <p>
-    <b>&raquo;</b> <a href="import-locale-from-files?locale=@current_locale@" title="Imports all messages for this locale from the catalog files"  onclick="return confirm('Importing messages for this locale from the filesystem should typically only be done once. If you already have translated messages in this locale those may be overwritten by the import, so be very cautious.');">Import all messages for this locale</a>
+    <b>&raquo;</b> <a href="@import_all_url@" title="Imports all messages for this locale from the catalog files"  onclick="return confirm('Importing messages for this locale from the filesystem should typically only be done once. If you already have translated messages in this locale those may be overwritten by the import, so be very cautious.');">Import all messages for this locale</a>
   </p>
+  <p>
+    <b>&raquo;</b> <a href="@export_all_url@" title="Export all messages for this locale to the catalog files">Export all messages for this locale</a>
+  </p>
 </if>
 
 <table cellpadding="0" cellspacing="0" border="0">
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 -r1.2 -r1.3
--- openacs-4/packages/acs-lang/www/admin/package-list.tcl	18 Sep 2003 11:57:58 -0000	1.2
+++ openacs-4/packages/acs-lang/www/admin/package-list.tcl	22 Oct 2003 11:17:50 -0000	1.3
@@ -112,3 +112,8 @@
         {label "Search for"}
     }
 }
+
+
+set import_all_url [export_vars -base import-locale-from-files { { locale $current_locale } }]
+set export_all_url [export_vars -base export-locale-from-files { { locale $current_locale } }]
+