Index: openacs-4/packages/acs-lang/catalog/acs-lang.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.en_US.ISO-8859-1.xml,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/acs-lang/catalog/acs-lang.en_US.ISO-8859-1.xml	12 Mar 2004 13:45:04 -0000	1.17
+++ openacs-4/packages/acs-lang/catalog/acs-lang.en_US.ISO-8859-1.xml	9 May 2004 14:57:57 -0000	1.18
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-lang" package_version="5.0.4" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="acs-lang" package_version="5.1.0" locale="en_US" charset="ISO-8859-1">
 
   <msg key="available-in-this-language">Available in English</msg>
   <description key="available-in-this-language">The language referred to in the message body should be the language of the locale, not a localized version of &quot;English&quot;.</description>
 
+  <msg key="change-locale">Change Locale</msg>
   <msg key="English">English</msg>
   <msg key="French">French</msg>
   <msg key="German">German</msg>
+  <msg key="Locale_for">Locale for %package_name%</msg>
   <msg key="localization-abday">{Sun} {Mon} {Tue} {Wed} {Thu} {Fri} {Sat}</msg>
   <msg key="localization-abmon">{Jan} {Feb} {Mar} {Apr} {May} {Jun} {Jul} {Aug} {Sep} {Oct} {Nov} {Dec}</msg>
   <msg key="localization-am_str">AM</msg>
@@ -49,5 +51,12 @@
   <msg key="localization-positive_sign"></msg>
   <msg key="localization-t_fmt">%r</msg>
   <msg key="localization-thousands_sep">,</msg>
+  <msg key="Resolve_message_conflicts">Resolve message conflicts</msg>
   <msg key="Spanish">Spanish</msg>
+  <msg key="this-language">English</msg>
+  <msg key="Translated_messages_on_this_page">Translated messages on this page (%locale%)</msg>
+  <msg key="Your_locale_for_package">Your locale setting for %package_name%. If set, this will override the site-wide setting in this particular application.</msg>
+  <msg key="Your_locale_site_wide">Your locale setting for the whole site</msg>
+  <msg key="Your_Preferred_Locale">Your Preferred Locale</msg>
+  <msg key="Your_timezone">Your Timezone</msg>
 </message_catalog>
Index: openacs-4/packages/acs-lang/lib/conflict-link.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/lib/conflict-link.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/acs-lang/lib/conflict-link.adp	30 Jan 2004 14:53:05 -0000	1.3
+++ openacs-4/packages/acs-lang/lib/conflict-link.adp	9 May 2004 14:59:38 -0000	1.4
@@ -1,5 +1,6 @@
 <if @conflict_count@ gt 0>
   <ul class="action-links">
-    <li><a href="@message_conflicts_url@">Resolve message conflicts</a></li>
+    <li><a href="@message_conflicts_url@">#acs-lang.Resolve_message_conflicts#</a></li>
   </ul>
 </if>
+
Index: openacs-4/packages/acs-lang/lib/messages-to-translate.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/lib/messages-to-translate.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-lang/lib/messages-to-translate.adp	25 Sep 2003 16:20:15 -0000	1.1
+++ openacs-4/packages/acs-lang/lib/messages-to-translate.adp	9 May 2004 14:59:38 -0000	1.2
@@ -1,7 +1,8 @@
 <if @display_p@>
   <hr />
 
-  <h3>Translated messages on this page (@locale@)</h3>
+  <h3>#acs-lang.Translated_messages_on_this_page#</h3>
 
   <p><listtemplate name="messages"></listtemplate></p>
 </if>
+
Index: openacs-4/packages/acs-lang/www/change-locale-include.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/change-locale-include.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-lang/www/change-locale-include.tcl	9 May 2004 13:48:12 -0000	1.11
+++ openacs-4/packages/acs-lang/www/change-locale-include.tcl	9 May 2004 14:57:58 -0000	1.12
@@ -57,30 +57,31 @@
 
 if { $package_level_locales_p } {
     element create locale site_wide_explain -datatype text -widget inform -label "&nbsp;" \
-        -value "Your locale setting for the whole site."
+        -value "[_ acs-lang.Your_locale_site_wide]"
 }
 
 element create locale site_wide_locale \
     -datatype text \
     -widget select \
     -optional \
-    -label "Your Preferred Locale" \
+    -label "[_ acs-lang.Your_Preferred_Locale]" \
     -options $list_of_locales
 
 if { $package_level_locales_p } {
+    set package_name [apm_instance_name_from_id $package_id]
     element create locale package_level_explain -datatype text -widget inform -label "&nbsp;" \
-            -value "Your locale setting for [apm_instance_name_from_id $package_id]. If set, this will override the site-wide setting in this particular application."
+            -value "[_ acs-lang.Your_locale_for_package]"
     
     element create locale package_level_locale -datatype text -widget select -optional \
-            -label "Locale for [apm_instance_name_from_id $package_id]" \
+            -label "[_ acs-lang.Locale_for]" \
             -options $list_of_package_locales
 }
 
 if { $use_timezone_p } {
     set timezone_options [db_list_of_lists all_timezones {}]
 
     element create locale timezone -datatype text -widget select -optional \
-        -label "Your Timezone" \
+        -label "[_ acs-lang.Your_timezone]" \
         -options $timezone_options
 }
 
Index: openacs-4/packages/acs-lang/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/index.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/acs-lang/www/index.adp	15 Apr 2004 12:43:18 -0000	1.8
+++ openacs-4/packages/acs-lang/www/index.adp	9 May 2004 14:57:58 -0000	1.9
@@ -4,10 +4,8 @@
 
 <if @admin_p@>
   <div style="float: right;">
-    <a href="admin" class="button">Administration</a>
+    <a href="admin" class="button">#acs-kernel.common_Administration#</a>
   </div>
 </if>
 
-<include src="/packages/acs-lang/www/change-locale-include" return_url="@return_url;noquote@" return_p="@return_p;noquote@">
-
-	
\ No newline at end of file
+<include src="/packages/acs-lang/www/change-locale-include" return_url="@return_url;noquote@" return_p="@return_p;noquote@">
\ No newline at end of file