Index: openacs-4/packages/acs-admin/www/users/merge-final.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/merge-final.tcl,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/acs-admin/www/users/merge-final.tcl	4 Jun 2006 00:45:20 -0000	1.2
+++ openacs-4/packages/acs-admin/www/users/merge-final.tcl	14 Dec 2006 22:49:12 -0000	1.2.2.1
@@ -32,7 +32,7 @@
 if { !$merge_p } {
     ad_returnredirect "/acs-admin/users"
 } else {
-    set final_results [callback MergePackageUser -from_user_id $from_user_id -to_user_id $to_user_id]
+    set final_results [callback merge::MergePackageUser -from_user_id $from_user_id -to_user_id $to_user_id]
 
     set results "<ul>"
     foreach item $final_results {
Index: openacs-4/packages/acs-admin/www/users/merge.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/users/merge.tcl,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/acs-admin/www/users/merge.tcl	4 Jun 2006 00:45:20 -0000	1.2
+++ openacs-4/packages/acs-admin/www/users/merge.tcl	14 Dec 2006 22:49:12 -0000	1.2.2.1
@@ -38,7 +38,7 @@
     set one_item_object_url  "[site_node::get_url_from_object_id -object_id $object_id]"
 }
 
-set user_id_one_items [callback MergeShowUserInfo -user_id $user_id ]
+set user_id_one_items [callback merge::MergeShowUserInfo -user_id $user_id ]
 if { ![empty_string_p $user_id_one_items] } {
     set user_id_one_items_html "<ul><li><b>Packages User Information </b><ul>"
     foreach pkg_list $user_id_one_items {
@@ -69,7 +69,7 @@
     set two_item_object_url "[site_node::get_url_from_object_id -object_id $object_id]"
 }
 
-set user_id_two_items [callback MergeShowUserInfo -user_id $user_id_from_search ]
+set user_id_two_items [callback merge::MergeShowUserInfo -user_id $user_id_from_search ]
 if { ![empty_string_p $user_id_two_items] } {
     set user_id_two_items_html "<ul><li><b>Packages User Information </b><ul>"
     foreach pkg_list $user_id_two_items {
Index: openacs-4/packages/acs-lang/catalog/acs-lang.en_AU.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/catalog/acs-lang.en_AU.ISO-8859-1.xml,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/acs-lang/catalog/acs-lang.en_AU.ISO-8859-1.xml	4 Jun 2006 00:45:39 -0000	1.2
+++ openacs-4/packages/acs-lang/catalog/acs-lang.en_AU.ISO-8859-1.xml	14 Dec 2006 22:49:12 -0000	1.2.2.1
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="acs-lang" package_version="5.2.3b2" locale="en_AU" charset="ISO-8859-1">
+<message_catalog package_key="acs-lang" package_version="5.3.0d1" locale="en_AU" charset="ISO-8859-1">
 
   <msg key="available-in-this-language">Available in English</msg>
   <msg key="change-locale">Change locale</msg>
@@ -39,5 +39,5 @@
   <msg key="localization-t_fmt">%r</msg>
   <msg key="localization-thousands_sep">,</msg>
   <msg key="Spanish">Spanish</msg>
-  <msg key="this-language">English</msg>
+  <msg key="this-language">English (AU)</msg>
 </message_catalog>
Index: openacs-4/packages/search/catalog/search.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/catalog/search.es_ES.ISO-8859-1.xml,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/search/catalog/search.es_ES.ISO-8859-1.xml	5 Jun 2006 00:02:40 -0000	1.3
+++ openacs-4/packages/search/catalog/search.es_ES.ISO-8859-1.xml	14 Dec 2006 22:49:13 -0000	1.3.2.1
@@ -2,27 +2,34 @@
 <message_catalog package_key="search" package_version="5.3.0d1" locale="es_ES" charset="ISO-8859-1">
 
   <msg key="Advanced_Search">B�squeda Avanzada</msg>
+  <msg key="and_not_needed">El operador &quot;&lt;b&gt;AND&lt;/b&gt;&quot; no es necesario, por defecto se toman en cuenta todos los t�rminos para realizar la b�squeda.</msg>
   <msg key="anytime">cualquier hora</msg>
   <msg key="Date_Range">Rango de Fechas</msg>
   <msg key="details">detalles</msg>
+  <msg key="Display">Mostrar</msg>
   <msg key="Feeling_Lucky">Me siento afortunado</msg>
   <msg key="lt_bstopwordsb_is_a_very">&quot;&lt;b&gt;%stopwords%&lt;/b&gt;&quot; es una palabra muy com�n y no ha sido tomada en cuenta para la b�squeda.</msg>
   <msg key="lt_FtsEngineDriver_not_a">�FtsEngineDriver no disponible!</msg>
   <msg key="lt_Make_sure_all_words_a">Aseg�rese que todas las palabras est�n escritas correctamente.</msg>
+  <msg key="lt_No_pages_were_found_c">No se encontraron p�ginas que contengan &quot;&lt;b&gt;%query%&lt;/b&gt;&quot;.</msg>
+  <msg key="lt_The_following_words_a">Las siguientes palabras son muy comunes y no han sido incluidas en la b�squeda: &lt;strong&gt;%stopwords;noquote%&lt;/strong&gt;.</msg>
   <msg key="lt_Try_different_keyword">Int�ntelo con otras palabras.</msg>
   <msg key="lt_Try_more_general_keyw">Int�ntelo con palabras m�s gen�ricas.</msg>
   <msg key="lt_Try_your_query_on_stw">Intente realizar la b�squeda sobre %stw;noquote%</msg>
   <msg key="lt_You_must_specify_some">Debe especificar algunas palabras.</msg>
   <msg key="Next">Siguiente</msg>
+  <msg key="no_driver_contact_webmaster">Buscar no est� habilitado. Por favor, contacte el webmaster para que lo active.</msg>
   <msg key="past_3_months">�ltimos 3 meses</msg>
   <msg key="past_6_months">�ltimos 6 meses</msg>
   <msg key="past_year">a�o anterior</msg>
   <msg key="Previous">Anterior</msg>
   <msg key="Result_page">P�gina de resultados:</msg>
   <msg key="results">resultados</msg>
+  <msg key="Results_count">&lt;b&gt;%low% - %high%&lt;/b&gt; resultados de &lt;b&gt;%count%&lt;/b&gt;. La b�squeda se realiz� en %elapsed% segundos.</msg>
   <msg key="Search">Buscar</msg>
   <msg key="Searched_for_query">B�squedas para: &lt;b&gt;%query%&lt;/b&gt;</msg>
   <msg key="Suggestions">Sugerencias:</msg>
+  <msg key="Tip_In_most_browsers_return">Nota: En la mayor�a de los navegadores, puede pulsar simplemente el &quot;intro&quot; en lugar de hacer click sobre el bot�n de b�squeda.</msg>
   <msg key="Try_fewer_keywords">Int�ntelo con m�s palabras.</msg>
   <msg key="Untitled">Sin t�tulo</msg>
 </message_catalog>
Index: openacs-4/packages/search/catalog/search.nl_NL.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/catalog/search.nl_NL.ISO-8859-1.xml,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/search/catalog/search.nl_NL.ISO-8859-1.xml	5 Jun 2006 00:02:40 -0000	1.3
+++ openacs-4/packages/search/catalog/search.nl_NL.ISO-8859-1.xml	14 Dec 2006 22:49:13 -0000	1.3.2.1
@@ -2,27 +2,35 @@
 <message_catalog package_key="search" package_version="5.3.0d1" locale="nl_NL" charset="ISO-8859-1">
 
   <msg key="Advanced_Search">Geavanceerd zoeken</msg>
+  <msg key="and_not_needed">&quot;&lt;b&gt;AND&lt;/b&gt;&quot;-operator is onnodig -- we gebruiken standaard alle zoektermen.</msg>
   <msg key="anytime">eender wanneer</msg>
   <msg key="Date_Range">Datumbereik</msg>
   <msg key="details">details</msg>
+  <msg key="Display">Tonen</msg>
   <msg key="Feeling_Lucky">Doe een gok</msg>
   <msg key="lt_bstopwordsb_is_a_very">&quot;&lt;b&gt;%stopwords%&lt;/b&gt;&quot; is een zeer veel voorkomend woord en is niet in de zoekopdracht meegenomen.</msg>
   <msg key="lt_FtsEngineDriver_not_a">FtsEngineDriver niet beschikbaar</msg>
   <msg key="lt_Make_sure_all_words_a">Let op dat alle woorden correct gespeld zijn.</msg>
+  <msg key="lt_No_pages_were_found_c">Geen pagina's die &quot;&lt;b&gt;%query%&lt;/b&gt;&quot; bevatten.</msg>
+  <msg key="lt_The_following_words_a">De volgende woorden komen zeer veel voor en zijn niet in de zoekopdracht meegenomen:
+&lt;strong&gt;%stopwords;noquote%&lt;/strong&gt;.</msg>
   <msg key="lt_Try_different_keyword">Probeer andere kernwoorden.</msg>
   <msg key="lt_Try_more_general_keyw">Probeer meer algemene kernwoorden.</msg>
   <msg key="lt_Try_your_query_on_stw">Probeer je zoekvraag op: %stw;noquote%</msg>
   <msg key="lt_You_must_specify_some">Je moet een aantal kernwoorden opgeven.</msg>
   <msg key="Next">Volgende</msg>
+  <msg key="no_driver_contact_webmaster">Volgende</msg>
   <msg key="past_3_months">afgelopen 3 maanden</msg>
   <msg key="past_6_months">afgelopen 6 maanden</msg>
   <msg key="past_year">afgelopen jaar</msg>
   <msg key="Previous">Vorige</msg>
   <msg key="Result_page">Resultaatpagina:</msg>
   <msg key="results">Resultaten</msg>
+  <msg key="Results_count">Resultaten &lt;b&gt;%low% - %high%&lt;/b&gt; uit ongeveer &lt;b&gt;%count%&lt;/b&gt;. Zoektocht vergde %elapsed% seconds.</msg>
   <msg key="Search">Zoeken</msg>
   <msg key="Searched_for_query">Gezocht naar: %query%</msg>
   <msg key="Suggestions">Suggesties:</msg>
+  <msg key="Tip_In_most_browsers_return">Tip: In de meeste browsers kunt u gewoon op return drukken in plaats van op de zoekknop.</msg>
   <msg key="Try_fewer_keywords">Probeer minder kernwoorden.</msg>
   <msg key="Untitled">Naamloos</msg>
 </message_catalog>
Index: openacs-4/packages/search/catalog/search.pl_PL.utf-8.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/search/catalog/search.pl_PL.utf-8.xml,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/search/catalog/search.pl_PL.utf-8.xml	5 Jun 2006 00:02:40 -0000	1.3
+++ openacs-4/packages/search/catalog/search.pl_PL.utf-8.xml	14 Dec 2006 22:49:13 -0000	1.3.2.1
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <message_catalog package_key="search" package_version="5.3.0d1" locale="pl_PL" charset="utf-8">
 
+  <msg key="lt_No_pages_were_found_c">Nie znaleziono stron zawierających &quot;&lt;b&gt;%query%&lt;/b&gt;&quot;.</msg>
   <msg key="lt_Try_different_keyword">Spróbuj z innymi słowami kluczowymi.</msg>
   <msg key="lt_Try_more_general_keyw">Spróbuj bardziej ogólnych słów kluczowych.</msg>
   <msg key="lt_You_must_specify_some">Musisz podać jakieś słowa kluczowe.</msg>