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 -N -r1.29 -r1.30
--- openacs-4/packages/acs-lang/catalog/acs-lang.en_US.ISO-8859-1.xml	7 Jun 2008 20:28:53 -0000	1.29
+++ openacs-4/packages/acs-lang/catalog/acs-lang.en_US.ISO-8859-1.xml	8 Apr 2011 11:57:15 -0000	1.30
@@ -1,15 +1,50 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <message_catalog package_key="acs-lang" locale="en_US" charset="ISO-8859-1">
 
+  <msg key="Actions">Actions</msg>
+  <msg key="Administration_of_Localization">Administration of Localization</msg>
+  <msg key="all_packages">all packages</msg>
+  <msg key="Are_you_sure_you_want_to_export_all_I18N_messages_to_catalog_files">Are you sure you want to export all I18N messages to catalog files?</msg>
+  <msg key="Are_you_sure_you_want_to_import_all_I18N_messages_from_catalog_files">Are you sure you want to import all I18N messages from catalog files?</msg>
   <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="Can_be_two_character">Can be two-character for language only or five-character full locale</msg>
+  <msg key="Catalog_files_are_stored_in_the_directory">Catalog files are stored in the directory</msg>
   <msg key="change-locale">Change locale</msg>
+  <msg key="Change_system_locale">Change system locale</msg>
+  <msg key="Change_system_timezone">Change system timezone</msg>
+  <msg key="Create_New_Locale">Create New Locale</msg>
+  <msg key="Current_system_locale_is">Current system locale is  &lt;strong&gt;%system_locale%: %system_locale_label%&lt;/strong&gt;</msg>
+  <msg key="Current_system_timezone_is">Current system timezone is &lt;strong&gt;%timezone%&lt;/strong&gt;</msg>
+  <msg key="Default_Locale_For_Language">Default Locale for Language</msg>
+  <msg key="Delete_this_locale">Delete this locale</msg>
+  <msg key="Disable_this_locale">Disable this locale</msg>
+  <msg key="Edit_definition_of_locale">Edit definition of locale</msg>
+  <msg key="Edit_localized_messages_for">Edit localized messages for %locales.locale_label%</msg>
+  <msg key="Edit_this_message">Edit this message</msg>
+  <msg key="Enable_this_locale">Enable this locale</msg>
+  <msg key="Enabled">Enabled</msg>
   <msg key="English">English</msg>
   <msg key="Error_changing_locale">Error changing locale</msg>
+  <msg key="Export_all_messages">Export all messages</msg>
+  <msg key="Export_all_messages__title">Export all messages for this locale to catalog files</msg>
+  <msg key="Export_all_messages_for_this_locale">Export all messages for this locale</msg>
+  <msg key="Export_complete">Export complete</msg>
+  <msg key="Export_messages_system-wide_to_catalog_files">Export messages system-wide to catalog files</msg>
+  <msg key="Export_results_for">Export results for</msg>
   <msg key="French">French</msg>
   <msg key="German">German</msg>
+  <msg key="Import_all_messages">Import all messages</msg>
+  <msg key="Import_all_messages__title">Import all messages for this locale from catalog files</msg>
+  <msg key="Import_all_messages_for_this_locale">Import all messages for this locale</msg>
+  <msg key="Imports_messages_system-wide_from_catalog_files">Imports messages system-wide from catalog files</msg>
+  <msg key="Include_package_key_as">Include package key, as in package-key.message-key</msg>
+  <msg key="Installed_Locales">Installed Locales</msg>
+  <msg key="Label">Label</msg>
   <msg key="Locale">Locale</msg>
+  <msg key="locale">locale</msg>
+  <msg key="Locale_">Locale:</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>
@@ -54,12 +89,27 @@
   <msg key="localization-positive_sign">+</msg>
   <msg key="localization-t_fmt">%r</msg>
   <msg key="localization-thousands_sep">,</msg>
+  <msg key="Look_up_message">Look up message</msg>
+  <msg key="Make_this_locale_the_default_locale_for_language">Make this locale the default locale for language '%locales.language%'</msg>
+  <msg key="Message_key">Message key</msg>
+  <msg key="Off">Off</msg>
+  <msg key="On">On</msg>
+  <msg key="Package">Package</msg>
+  <msg key="Package_">Package:</msg>
   <msg key="Resolve_message_conflicts">Resolve message conflicts</msg>
+  <msg key="Return">Return</msg>
   <msg key="Spanish">Spanish</msg>
+  <msg key="switch_to_this_language">Switch to English</msg>
   <msg key="this-language">English (US)</msg>
   <description key="this-language">The label of the locale, in the locale's language.  This should be different for each locale.  This should not be English unless the locale is &quot;en&quot;.</description>
 
+  <msg key="This_is_the_only_locale_for_this_language">This is the only locale for this language</msg>
+  <msg key="Toggle_translator_mode">Toggle translator mode</msg>
+  <msg key="Total">Total</msg>
+  <msg key="Translated">Translated</msg>
+  <msg key="Translated_Message">Translated Message</msg>
   <msg key="Translated_messages_on_this_page">Translated messages on this page (%locale%)</msg>
+  <msg key="Untranslated">Untranslated</msg>
   <msg key="User_locale_not_set">Your locale %user_locale% couldn't be set, probably because it's not available.</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>
Index: openacs-4/packages/acs-lang/catalog/acs-lang.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.es_ES.ISO-8859-1.xml,v
diff -u -N -r1.24 -r1.25
--- openacs-4/packages/acs-lang/catalog/acs-lang.es_ES.ISO-8859-1.xml	29 Dec 2008 16:00:48 -0000	1.24
+++ openacs-4/packages/acs-lang/catalog/acs-lang.es_ES.ISO-8859-1.xml	8 Apr 2011 11:57:15 -0000	1.25
@@ -1,13 +1,48 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <message_catalog package_key="acs-lang" locale="es_ES" charset="ISO-8859-1">
 
+  <msg key="Actions">Acciones</msg>
+  <msg key="Administration_of_Localization">Administraci�n de Localizaci�n</msg>
+  <msg key="all_packages">todos los paquetes</msg>
+  <msg key="Are_you_sure_you_want_to_export_all_I18N_messages_to_catalog_files">�Est� seguro que desea exportar todos los mensajes a cat�logos?</msg>
+  <msg key="Are_you_sure_you_want_to_import_all_I18N_messages_from_catalog_files">�Est� seguro que desea importar todos los mensajes desde los cat�logos?</msg>
   <msg key="available-in-this-language">Disponible en espa�ol</msg>
+  <msg key="Can_be_two_character">Puede ser 2 caracteres s�lo para el idioma o 5 caracteres para toda la localizaci�n</msg>
+  <msg key="Catalog_files_are_stored_in_the_directory">Los cat�logos est�n en </msg>
   <msg key="change-locale">Cambiar idioma</msg>
+  <msg key="Change_system_locale">Cambiar el idioma del sistema</msg>
+  <msg key="Change_system_timezone">Cambiar la hora del sistema</msg>
+  <msg key="Create_New_Locale">Crear un nuevo idioma</msg>
+  <msg key="Current_system_locale_is">El idioma actual del sistema es &lt;strong&gt;%system_locale%: %system_locale_label%&lt;/strong&gt;</msg>
+  <msg key="Current_system_timezone_is">La zona horaria actual del sistema es &lt;strong&gt;%timezone%&lt;/strong&gt;</msg>
+  <msg key="Default_Locale_For_Language">Configuraci�n regional predeterminada del idioma</msg>
+  <msg key="Delete_this_locale">Borrar este idioma</msg>
+  <msg key="Disable_this_locale">Desactivar este idioma</msg>
+  <msg key="Edit_definition_of_locale">Editar la definici�n del idioma</msg>
+  <msg key="Edit_localized_messages_for">Editar los mensajes de %locales.locale_label%</msg>
+  <msg key="Edit_this_message">Editar este mensaje</msg>
+  <msg key="Enable_this_locale">Activar este idioma</msg>
+  <msg key="Enabled">Activado</msg>
   <msg key="English">Ingl�s</msg>
   <msg key="Error_changing_locale">Error al cambiar de idioma</msg>
+  <msg key="Export_all_messages">Exportar todos los mensajes</msg>
+  <msg key="Export_all_messages__title">Exportar a cat�logos todos los mensajes de este idioma</msg>
+  <msg key="Export_all_messages_for_this_locale">Exportar todos los mensajes para este idioma</msg>
+  <msg key="Export_complete">Exportaci�n completa</msg>
+  <msg key="Export_messages_system-wide_to_catalog_files">Exportar a cat�logos todos los mensajes</msg>
+  <msg key="Export_results_for">Resultados de exportaci�n de</msg>
   <msg key="French">Franc�s</msg>
   <msg key="German">Alem�n</msg>
+  <msg key="Import_all_messages">Importar todos los mensajes</msg>
+  <msg key="Import_all_messages__title">Importar todos los mensajes de idioma desde los cat�logos</msg>
+  <msg key="Import_all_messages_for_this_locale">Importar todos los mensajes para este idioma</msg>
+  <msg key="Imports_messages_system-wide_from_catalog_files">Importar todos los mensajes desde cat�logos</msg>
+  <msg key="Include_package_key_as">Incluya el nombre del paquete, es decir: package-key.message-key</msg>
+  <msg key="Installed_Locales">Idiomas Instalados</msg>
+  <msg key="Label">Etiqueta</msg>
   <msg key="Locale">Idioma</msg>
+  <msg key="locale">idioma</msg>
+  <msg key="Locale_">Idioma:</msg>
   <msg key="Locale_for">Idioma para %package_name%</msg>
   <msg key="localization-abday">{Dom} {Lun} {Mar} {Mi�} {Jue} {Vie} {S�b}</msg>
   <msg key="localization-abmon">{Ene} {Feb} {Mar} {Abr} {May} {Jun} {Jul} {Ago} {Sep} {Oct} {Nov} {Dic}</msg>
@@ -41,10 +76,25 @@
   <msg key="localization-positive_sign">+</msg>
   <msg key="localization-t_fmt">%H:%M</msg>
   <msg key="localization-thousands_sep">.</msg>
+  <msg key="Look_up_message">Buscar mensaje</msg>
+  <msg key="Make_this_locale_the_default_locale_for_language">Establecer como idioma por defecto para el lenguaje '%locales.language%'</msg>
+  <msg key="Message_key">Clave de mensaje</msg>
+  <msg key="Off">Desactivar</msg>
+  <msg key="On">Activar</msg>
+  <msg key="Package">Paquete</msg>
+  <msg key="Package_">Paquete:</msg>
   <msg key="Resolve_message_conflicts">Resolver conflictos de mensajes</msg>
+  <msg key="Return">Volver</msg>
   <msg key="Spanish">Espa�ol</msg>
+  <msg key="switch_to_this_language">Cambiar a Espa�ol</msg>
   <msg key="this-language">Espa�ol (ES)</msg>
+  <msg key="This_is_the_only_locale_for_this_language">Esta es el �nico idioma para este lenguaje</msg>
+  <msg key="Toggle_translator_mode">Establecer el modo traductor</msg>
+  <msg key="Total">Total</msg>
+  <msg key="Translated">Traducido</msg>
+  <msg key="Translated_Message">Mensaje Traducido</msg>
   <msg key="Translated_messages_on_this_page">Mensajes traducidos en esta p�gina (%locale%)</msg>
+  <msg key="Untranslated">Sin traducir</msg>
   <msg key="User_locale_not_set">Su idioma %user_locale% no ha podido ser cambiado, probablemente porque no est� disponible.</msg>
   <msg key="Your_locale_for_package">Su selecci�n de idioma para %package_name%. Si est� activado, sobreescribir� la selecci�n general en esta aplicaci�n en particular.</msg>
   <msg key="Your_locale_site_wide">Su selecci�n de idioma para todo el sitio</msg>
Index: openacs-4/packages/acs-lang/www/admin/export-messages.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/export-messages.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-lang/www/admin/export-messages.adp	18 Apr 2008 06:48:43 -0000	1.5
+++ openacs-4/packages/acs-lang/www/admin/export-messages.adp	8 Apr 2011 11:57:15 -0000	1.6
@@ -1,32 +1,34 @@
 <master>
   <property name="title">@page_title;noquote@</property>
 
-Export results for
-<if @package_key@ nil>
-  <b>all packages</b>
-</if>
-<else>
-package <b>@package_key@</b>
-</else>
-and
-<if @locale@ nil>
-  <b>all locales</b>
-</if>
-<else>
-locale <b>@locale@</b>
-</else>.
+<p>#acs-lang.Export_results_for#</p>
 
+<ul>
+  <li>#acs-lang.Package_# 
+    <strong>
+      <if @package_key@ nil>#acs-lang.all_packages#</if>
+      <else>@package_key@</else>
+    </strong>
+  </li>
+  <li>#acs-lang.Locale_#
+    <strong>
+      <if @locale@ nil>#acs-lang.all_locales#</if>
+      <else>@locale@</else>
+    </strong>
+  </li>
+</ul>
+
 <p>
-  Export complete.
+  #acs-lang.Export_complete#
 </p>
 
 <if @package_key@ not nil>
   <p>
-    Catalog files are stored in the directory <b>@catalog_dir@</b>.
+    #acs-lang.Catalog_files_are_stored_in_the_directory# <strong>@catalog_dir@</strong>
   </p>
 </if>
 
 <ul class="action-links">
-  <li><a href="@return_url@">Return</a></li>
+  <li><a href="@return_url@">#acs-lang.Return#</a></li>
 </ul>
 
Index: openacs-4/packages/acs-lang/www/admin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/index.adp,v
diff -u -N -r1.17 -r1.18
--- openacs-4/packages/acs-lang/www/admin/index.adp	30 Jan 2004 14:53:06 -0000	1.17
+++ openacs-4/packages/acs-lang/www/admin/index.adp	8 Apr 2011 11:57:15 -0000	1.18
@@ -4,73 +4,76 @@
 
 <include src="/packages/acs-lang/lib/conflict-link" />
 
+<h1>@page_title@</h1>
+
+<h2>#acs-lang.Actions#</h2>
 <ul class="action-links">
-  <li>Toggle translator mode: 
-    <if @translator_mode_p@ true><b>On</b> | <a href="translator-mode-toggle">Off</a></if>
-    <else><a href="translator-mode-toggle">On</a> | <b>Off</b></else>
+  <li>#acs-lang.Toggle_translator_mode#: 
+    <if @translator_mode_p@ true><strong>#acs-lang.On#</strong> | <a href="translator-mode-toggle">#acs-lang.Off#</a></if>
+    <else><a href="translator-mode-toggle">#acs-lang.On#</a> | <strong>#acs-lang.Off#</strong></else>
   </li>
 
-  <li><a href="@parameter_url@">Change system locale</a>: Current system locale is <b>@system_locale_label@ [ @system_locale@ ]</b></li>
+  <li><a href="@parameter_url@">#acs-lang.Change_system_locale#</a>: #acs-lang.Current_system_locale_is#</li>
 
 <if @timezone_p@>
-  <li><a href="set-system-timezone">Change system timezone</a>: Current system timezone is <b>@timezone@</b></li>
+  <li><a href="set-system-timezone">#acs-lang.Change_system_timezone#</a>: #acs-lang.Current_system_timezone_is#</li>
 </if>
 
-<li><a href="lookup">Look up message</a></li>
+<li><a href="lookup">#acs-lang.Look_up_message#</a></li>
 
 <if @site_wide_admin_p@>
-  <li><a href="@import_url@" title="Imports messages system-wide from catalog files" onclick="return confirm('Are you sure you want to import all I18N messages from catalog files?');">Import all messages</a></li>
-  <li><a href="@export_url@" title="Export messages system-wide to catalog files" onclick="return confirm('Are you sure you want to export all I18N messages to catalog files?');">Export all messages</a></li>
+  <li><a href="@import_url@" title="#acs-lang.Imports_messages_system-wide_from_catalog_files#" onclick="return confirm('#acs-lang.Are_you_sure_you_want_to_import_all_I18N_messages_from_catalog_files#');">#acs-lang.Import_all_messages#</a></li>
+  <li><a href="@export_url@" title="#acs-lang.Export_messages_system-wide_to_catalog_files#" onclick="return confirm('#acs-lang.Are_you_sure_you_want_to_export_all_I18N_messages_to_catalog_files#');">#acs-lang.Export_all_messages#</a></li>
 </if>
 
 </ul>
 
-<h2>Installed Locales</h2>
+<h2>#acs-lang.Installed_Locales#</h2>
 
 <table cellpadding="0" cellspacing="0" border="0">
  <tr>
   <td style="background: #CCCCCC">
    <table cellpadding="4" cellspacing="1" border="0">
     <tr style="background: #FFFFe4">
      <th></th>
-     <th>Locale</th>
-     <th>Label</th>
-     <th>Translated</th>
-     <th>Untranslated</th>
-     <th>Enabled</th>
-     <th>Default Locale For Language</th>
+     <th>#acs-lang.Locale#</th>
+     <th>#acs-lang.Label#</th>
+     <th>#acs-lang.Translated#</th>
+     <th>#acs-lang.Untranslated#</th>
+     <th>#acs-lang.Enabled#</th>
+     <th>#acs-lang.Default_Locale_For_Language#</th>
      <th></th>
     </tr>
     <multiple name="locales">
      <tr style="background: #EEEEEE">
-      <td><a href="@locales.locale_edit_url@" title="Edit definition of locale"><img src="/shared/images/Edit16.gif" border="0" width="16" height="16"></a></td>
+      <td><a href="@locales.locale_edit_url@" title="#acs-lang.Edit_definition_of_locale#"><img src="/shared/images/Edit16.gif" style="border:0;" width="16" height="16" alt="#acs-lang.Edit_definition_of_locale#"></a></td>
       <td>@locales.locale@</td>
       <td>
-        <a href="@locales.msg_edit_url@" title="Edit localized messages for @locales.locale_label@">@locales.locale_label@</a>
+        <a href="@locales.msg_edit_url@" title="#acs-lang.Edit_localized_messages_for#">@locales.locale_label@</a>
       </td>
       <td align="right"><if @locales.num_translated_pretty@ ne 0>@locales.num_translated_pretty@</if></td>
       <td align="right"><if @locales.enabled_p@ true or @locales.num_translated@ gt 0><if @locales.num_untranslated_pretty@ ne 0>@locales.num_untranslated_pretty@</if></if></td>
       <td align="center">
         <if @locales.enabled_p@ true>
-          <a href="@locales.locale_enabled_p_url@" title="Disable this locale"><img src="/resources/acs-subsite/checkboxchecked.gif" height="13" width="13" border="0" style="background-color: white;"></a>
+          <a href="@locales.locale_enabled_p_url@" title="#acs-lang.Disable_this_locale#"><img src="/resources/acs-subsite/checkboxchecked.gif" height="13" width="13" style="border:0; background-color: white;" alt="#acs-lang.Disable_this_locale#"></a>
         </if>
         <else>
-          <a href="@locales.locale_enabled_p_url@" title="Enable this locale"><img src="/resources/acs-subsite/checkbox.gif" height="13" width="13" border="0" style="background-color: white;"></a>
+          <a href="@locales.locale_enabled_p_url@" title="#acs-lang.Enable_this_locale#"><img src="/resources/acs-subsite/checkbox.gif" height="13" width="13" style="border:0; background-color: white;" alt="#acs-lang.Enable_this_locale#"></a>
         </else>
       </td>
       <td align="center">
           <if @locales.default_p@ eq "t">
             <if @locales.num_locales_for_language@ eq 1>
-              <span style="font-style: italic; color: gray;" title="This is the only locale for this language"></span>
+              <span style="font-style: italic; color: gray;" title="#acs-lang.This_is_the_only_locale_for_this_language#"></span>
             </if>
             <else>
-              @locales.language@: <img src="/shared/images/radiochecked" height="13" width="13" border="0">
+              @locales.language@: <img src="/shared/images/radiochecked" height="13" width="13" style="border:0;" alt="#acs-lang.Default_Locale_For_Language#">
             </else>
           </if>
-          <else>@locales.language@: <a href="@locales.locale_make_default_url@" title="Make this locale the default locale for language '@locales.language@'"><img src="/shared/images/radio" height="13" width="13" border="0"></a></else>
+          <else>@locales.language@: <a href="@locales.locale_make_default_url@" title="#acs-lang.Make_this_locale_the_default_locale_for_language#"><img src="/shared/images/radio" height="13" width="13" style="border:0;" alt="#acs-lang.Make_this_locale_the_default_locale_for_language#"></a></else>
       </td>
       <td>
-        <a href="@locales.locale_delete_url@" title="Delete this locale"><img src="/shared/images/Delete16.gif" border="0" width="16" height="16"></a>
+        <a href="@locales.locale_delete_url@" title="#acs-lang.Delete_this_locale#"><img src="/shared/images/Delete16.gif" style="border:0;" width="16" height="16" alt="#acs-lang.Delete_this_locale#"></a>
       </td>
      </tr>
     </multiple>
@@ -80,5 +83,5 @@
 </table>
 
 <ul class="action-links">
-  <li><a href="locale-new">Create New Locale</a></li>
+  <li><a href="locale-new">#acs-lang.Create_New_Locale#</a></li>
 </ul>
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.10 -r1.11
--- openacs-4/packages/acs-lang/www/admin/index.tcl	7 Apr 2011 16:28:27 -0000	1.10
+++ openacs-4/packages/acs-lang/www/admin/index.tcl	8 Apr 2011 11:57:15 -0000	1.11
@@ -14,7 +14,7 @@
 set system_locale [lang::system::locale -site_wide]
 set system_locale_label [lang::util::get_label $system_locale]
 
-set page_title "Administration of Localization"
+set page_title [_ acs-lang.Administration_of_Localization]
 set context [list]
 
 set site_wide_admin_p [acs_user::site_wide_admin_p]
Index: openacs-4/packages/acs-lang/www/admin/lookup.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/lookup.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/acs-lang/www/admin/lookup.adp	30 Jan 2004 14:53:06 -0000	1.2
+++ openacs-4/packages/acs-lang/www/admin/lookup.adp	8 Apr 2011 11:57:15 -0000	1.3
@@ -3,17 +3,18 @@
   <property name="context">@context;noquote@</property>
   <property name="focus">lookup.key</property>
 
+<h1>#acs-lang.Look_up_message#</h1>
+
 <formtemplate id="lookup"></formtemplate>
 
 <if @message_p@ true>
-  <h2>Translated Message</h2>
-  <if @message@ nil><p><i>blank</i></if>
-  <else><p>@message@</p></else>
+  <h2>#acs-lang.Translated_Message#</h2>
+  <p>@message@</p>
 </if>
 
 <if @edit_url@ not nil>
   <ul class="action-links">
-    <li><a href="@edit_url@">Edit this message</a></li>
+    <li><a href="@edit_url@">#acs-lang.Edit_this_message#</a></li>
   </ul>
 </if>
 
Index: openacs-4/packages/acs-lang/www/admin/lookup.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/lookup.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-lang/www/admin/lookup.tcl	24 Sep 2003 17:20:54 -0000	1.1
+++ openacs-4/packages/acs-lang/www/admin/lookup.tcl	8 Apr 2011 11:57:15 -0000	1.2
@@ -9,17 +9,17 @@
 
 ad_form -name lookup -form {
     {key:text
-        {label "Message key"}
-        {help_text "Include package key, as in package-key.message-key"}
+        {label "[_ acs-lang.Message_key]"}
+        {help_text "[_ acs-lang.Include_package_key_as]"}
         {html {size 50}}
     }
     {locale:text 
-        {label "Locale"}
-        {help_text "Can be two-character for language only or five-character full locale"}
+        {label "[_ acs-lang.Locale]"}
+        {help_text "[_ acs-lang.Can_be_two_character]"}
     }
 } -on_submit {
     # No substitution
-    set message [lang::message::lookup $locale $key {} {} 0]
+    set message [lang::message::lookup $locale $key]
     
     set keyv [split $key "."]
     set package_key [lindex $keyv 0]
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 -N -r1.8 -r1.9
--- openacs-4/packages/acs-lang/www/admin/package-list.adp	18 Apr 2008 06:48:43 -0000	1.8
+++ openacs-4/packages/acs-lang/www/admin/package-list.adp	8 Apr 2011 11:57:15 -0000	1.9
@@ -10,8 +10,8 @@
 
 <if @locale_enabled_p@ and @site_wide_admin_p@>
   <ul class="action-links">
-    <li><a href="@import_all_url@" title="Imports all messages for this locale from the catalog files">Import all messages for this locale</a></li>
-    <li> <a href="@export_all_url@" title="Export all messages for this locale to the catalog files">Export all messages for this locale</a></li>
+    <li><a href="@import_all_url@" title="#acs-lang.Import_all_messages__title#">#acs-lang.Import_all_messages_for_this_locale#</a></li>
+    <li> <a href="@export_all_url@" title="#acs-lang.Export_all_messages__title#">#acs-lang.Export_all_messages_for_this_locale#</a></li>
   </ul>
 </if>
 
@@ -22,10 +22,10 @@
       <table cellpadding="4" cellspacing="1" border="0">
         <tr valign="middle" style="background: #FFFFE4">
           <th></th>
-          <th>Package</th>
-          <th>Translated</th>
-          <th>Untranslated</th>
-          <th>Total</th>
+          <th>#acs-lang.Package#</th>
+          <th>#acs-lang.Translated#</th>
+          <th>#acs-lang.Untranslated#</th>
+          <th>#acs-lang.Total#</th>
         </tr>
         <multiple name="packages">
           <tr style="background: #EEEEEE">