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.4 -r1.5
--- openacs-4/packages/acs-lang/www/admin/package-list.adp	22 Oct 2003 11:17:50 -0000	1.4
+++ openacs-4/packages/acs-lang/www/admin/package-list.adp	11 Dec 2003 21:39:53 -0000	1.5
@@ -6,9 +6,11 @@
 Search <formwidget id="search_locale"> for <formwidget id="q"> <input type="submit" value="Search">
 </formtemplate>
 
-<if @locale_enabled_p@>
+<include src="/packages/acs-lang/lib/conflict-link" locale="@current_locale@" />
+
+<if @locale_enabled_p@ and @site_wide_admin_p@>
   <p>
-    <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>
+    <b>&raquo;</b> <a href="@import_all_url@" title="Imports all messages for this locale from the catalog files">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>