Index: openacs-4/packages/categories/categories.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/categories.info,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/categories/categories.info	10 Oct 2009 22:38:09 -0000	1.16
+++ openacs-4/packages/categories/categories.info	20 May 2011 10:41:11 -0000	1.17
@@ -8,15 +8,15 @@
     <singleton-p>f</singleton-p>
     <auto-mount>categories</auto-mount>
 
-    <version name="1.1.2d4" url="http://openacs.org/repository/apm/packages/categories-1.1.2d4">
+    <version name="1.1.2d5" url="http://openacs.org/repository/apm/packages/categories-1.1.2d5">
         <owner url="mailto:timo@timohentschel.de">timo@timohentschel.de</owner>
         <summary>Manage categories in category trees and let users map objects to categories.</summary>
         <release-date>2008-11-06</release-date>
         <description format="text/html">Datamodel for category trees with supporting API and management pages.  Provides a widget for 
         general categorization of arbitrary objects and tracks which package instances use which category trees.  Also supports localization.</description>
         <maturity>0</maturity>
 
-        <provides url="categories" version="1.1.2d4"/>
+        <provides url="categories" version="1.1.2d5"/>
         <requires url="acs-kernel" version="5.5.0"/>
 
         <callbacks>
Index: openacs-4/packages/categories/catalog/categories.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/catalog/categories.de_DE.ISO-8859-1.xml,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/categories/catalog/categories.de_DE.ISO-8859-1.xml	6 Nov 2008 15:50:44 -0000	1.4
+++ openacs-4/packages/categories/catalog/categories.de_DE.ISO-8859-1.xml	20 May 2011 10:41:11 -0000	1.5
@@ -1,9 +1,106 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <message_catalog package_key="categories" locale="de_DE" charset="ISO-8859-1">
 
-  <msg key="cadmin">Management der Kategorien</msg>
+  <msg key="Action">Aktion</msg>
+  <msg key="Action_add_root">Kategorie hinzuf�gen</msg>
+  <msg key="Action_add_root_link_title">Kategorie auf der ersten Ebene hinzuf�gen</msg>
+  <msg key="Action_applications">Anwendungen</msg>
+  <msg key="Action_applications_link_title">Anwendungen</msg>
+  <msg key="Action_change_parent">Zuordnung �ndern</msg>
+  <msg key="Action_copy_tree">Kategorienbaum �bernehmen</msg>
+  <msg key="Action_copy_tree_link_title">Kategorien von einem anderen Baum �bernehmen</msg>
+  <msg key="Action_delete_tree">Kategorienbaum l�schen</msg>
+  <msg key="Action_delete_tree_link_title">Diesen Kategorienbaum l�schen</msg>
+  <msg key="Action_permissions_link_title">Berechtigungen des Kategorienbaums verwalten</msg>
+  <msg key="Action_view_links">Links ansehen</msg>
+  <msg key="Action_view_synonyms">Synonyme ansehen</msg>
+  <msg key="Actions">Aktionen</msg>
+  <msg key="Actions_permissions_link_title">Berechtigungen des Kategorienbaums verwalten</msg>
+  <msg key="Add_category">Kategorie hinzuf�gen</msg>
+  <msg key="Add_subcategory_link_title">Subkategorie hinzuf�gen</msg>
+  <msg key="Add_tree">Kategorienbaum hinzuf�gen</msg>
+  <msg key="Browse">Durchsuchen</msg>
+  <msg key="Browse_link_title">Ausgew�hlte Kategorienb�ume durchsuchen</msg>
+  <msg key="cadmin">Kategorien verwalten</msg>
+  <msg key="Cancel_do_not_unmap">Nein, Zuordnung nicht aufheben</msg>
   <msg key="Categories">Kategorien</msg>
-  <msg key="code_export">Code zum Erstellen der Kategorieb�ume exportieren</msg>
-  <msg key="code_necessary">TCL Code um ausgew�hlte Kategorieb�ume zu importieren</msg>
+  <msg key="Categorize_name">%name% kategorisieren </msg>
+  <msg key="Category">Kategorie</msg>
+  <msg key="checked">ausgew�hlt</msg>
+  <msg key="code_export">Code zum Erstellen der Kategorienb�ume exportieren</msg>
+  <msg key="code_necessary">TCL Code, um ausgew�hlte Kategorieb�ume zu importieren</msg>
+  <msg key="Create_a_new_tree">Neuen Kategorienbaum erstellen</msg>
+  <msg key="Current_categories">Aktuelle Kategorien</msg>
+  <msg key="Delete">L�schen</msg>
+  <msg key="Delete_action_link_title">Ausgew�hlte Kategorien l�schen</msg>
+  <msg key="Delete_category_link_title">Kategorie und alle Subkategorien l�schen</msg>
+  <msg key="Delete_category_tree_title">Kategorienbaum &quot;%tree_name%&quot; l�schen </msg>
+  <msg key="Deprecate">Ausblenden</msg>
+  <msg key="Deprecate_category_link_title">Ausgew�hlte Kategorien ausblenden</msg>
+  <msg key="Deprecated">Ausgeblendet</msg>
+  <msg key="Description">Beschreibung</msg>
+  <msg key="Edit_category">Kategorie bearbeiten</msg>
+  <msg key="Edit_category_link_title">Diese Kategorie bearbeiten</msg>
+  <msg key="Edit_parameters">Einstellungen bearbeiten</msg>
+  <msg key="Edit_tree">Kategorienbaum bearbeiten</msg>
   <msg key="export">Export</msg>
+  <msg key="here">hier</msg>
+  <msg key="Language">Sprache</msg>
+  <msg key="lt_Are_you_sure_you_want">Sind Sie sicher, dass Sie diese Kategorien l�schen wollen:</msg>
+  <msg key="lt_Are_you_sure_you_want_1">Sind Sie sicher, dass Sie diese Kategorien-Links l�schen wollen:</msg>
+  <msg key="lt_Are_you_sure_you_want_2">Sind Sie sicher, dass Sie diese Synonyme l�schen wollen:</msg>
+  <msg key="lt_Are_you_sure_you_want_3">Sind Sie sicher, dass Sie den Kategorienbaum &quot;%tree_name%&quot; l�schen wollen:</msg>
+  <msg key="lt_Are_you_sure_you_want_4">Sind Sie sicher, dass Sie die Zuordnung des Kategorienbaums &quot;%tree_name%&quot; zum Wiki &quot;%object_name%&quot; aufheben wollen?</msg>
+  <msg key="lt_Categories_still_used">Kategorien in Verwendung</msg>
+  <msg key="lt_Category_Administrati">Kategorien verwalten</msg>
+  <msg key="lt_Category_trees_availa">Kategorienb�ume, die zugeordnet werden k�nnen</msg>
+  <msg key="lt_Category_trees_mapped">Kategorienb�ume, die dem Wiki &quot;%object_name%&quot; zugeordnet sind</msg>
+  <msg key="lt_Create_and_map_a_new_">Neuen Kategorienbaum erstellen und zuordnen</msg>
+  <msg key="lt_Explanation_Any_categ">Erkl�rung: Jede Kategorisierung innerhalb der Quellkategorie erfolgt auch in der Zielkategorie.</msg>
+  <msg key="lt_object_count_objects_">%object_count% Objekte auf %page_count% Seiten</msg>
+  <msg key="lt_Search_for_a_category">Kategorie suchen</msg>
+  <msg key="lt_Select_Trees_for_brow">Kategorienb�ume zum Durchsuchen ausw�hlen</msg>
+  <msg key="lt_There_are_instances_w">Es gibt %instances_without_permission% Verwendungen des Kategorienbaums, aber Sie haben keine Berechtigung, diese zu sehen.</msg>
+  <msg key="lt_This_is_a_site_wide_c">Dies ist ein Kategorienbaum, der nur f�r Site-Wide-Administrator/inn/en zug�nglich ist</msg>
+  <msg key="lt_This_tree_is_not_used">Dieser Kategorienbaum wird nicht genutzt.</msg>
+  <msg key="lt_This_tree_is_still_us">Dieser Kategorienbaum wird noch von einigen Anwendungen verwendet. F�r eine Liste, klicken Sie bitte</msg>
+  <msg key="lt_To_deselect_or_select">Um mehrere Kategorien auszuw�hlen, verwenden Sie die Strg-Taste auf Ihrer Tastatur.</msg>
+  <msg key="Map_subtree">Subkategorie zuordnen</msg>
+  <msg key="Map_this_subtree">Diese Subkategorie zuordnen</msg>
+  <msg key="Map_tree">Kategorienbaum zuordnen</msg>
+  <msg key="Mapping_parameters">Zuordnungseinstellungen</msg>
+  <msg key="Mapping_parameters_subtree_title">Einstellungen der Zuordnung von Seiten zum Subkategorienbaum &quot;%tree_name% :: %category_name%&quot;</msg>
+  <msg key="Mapping_parameters_tree_title">Einstellungen der Zuordnung von Seiten zum Kategorienbaum &quot;%tree_name%&quot;</msg>
+  <msg key="multiple">mehrfach</msg>
+  <msg key="No_Cancel">Abbrechen</msg>
+  <msg key="None">Keine</msg>
+  <msg key="OK">OK</msg>
+  <msg key="optional">optional</msg>
+  <msg key="Ordering">Reihenfolge</msg>
+  <msg key="Ordering_update">Reihenfolge aktualisieren</msg>
+  <msg key="Ordering_update_link_title">Reihenfolge entsprechend der Werte aktualisieren</msg>
+  <msg key="Permissions_manage">Zugriffsrechte verwalten</msg>
+  <msg key="Permissions_manage_title">Zugriffsrechte f�r Kategoriebaum &quot;%tree_name%&quot; verwalten</msg>
+  <msg key="required">erforderlich</msg>
+  <msg key="Restore">Wiederherstellen</msg>
+  <msg key="Restore_category_link_title">Ausgew�hlte Kategorien wiederherstellen</msg>
+  <msg key="selected">ausgew�hlt</msg>
+  <msg key="single">einfach</msg>
+  <msg key="Tree_copy">Kategorienbaum �bernehmen</msg>
+  <msg key="Tree_copy_title">Einen Kategorienbaum in &quot;%tree_name%&quot; �bernehmen</msg>
+  <msg key="Tree_map_title">Subkategorie von &quot;%tree_name%&quot; ausw�hlen und zuordnen</msg>
+  <msg key="Tree_Name">Name des Kategorienbaums</msg>
+  <msg key="Tree_view_title">Kategorienbaum &quot;%tree_name%&quot;</msg>
+  <msg key="Trees_you_can_manage">Kategorienb�ume, die Sie verwalten k�nnen</msg>
+  <msg key="Trees_you_can_view">Kategorienb�ume, die Sie ansehen k�nnen</msg>
+  <msg key="Unmap">Zuordnung aufheben</msg>
+  <msg key="unmap">Zuordnung aufheben</msg>
+  <msg key="Usage">Verwendung</msg>
+  <msg key="Usage_title">Anwendungen, die den Kategorienbaum &quot;%tree_name%&quot; verwenden</msg>
+  <msg key="Widget">Optionen</msg>
+  <msg key="Widget_checkbox">Checkbox - User/innen k�nnen eine Seite mehreren Kategorien zuweisen</msg>
+  <msg key="Widget_multiselect">Multiselect - User/innen k�nnen eine Seite mehreren Kategorien zuweisen</msg>
+  <msg key="Widget_radio">Radio</msg>
+  <msg key="Widget_required_category">Muss eine Seite mindestens einer Kategorie zugewiesen werden?</msg>
+  <msg key="Widget_select">Ausw�hlen</msg>
 </message_catalog>
Index: openacs-4/packages/categories/catalog/categories.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/catalog/categories.en_US.ISO-8859-1.xml,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/categories/catalog/categories.en_US.ISO-8859-1.xml	6 Nov 2008 15:50:44 -0000	1.6
+++ openacs-4/packages/categories/catalog/categories.en_US.ISO-8859-1.xml	20 May 2011 10:41:11 -0000	1.7
@@ -1,9 +1,119 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <message_catalog package_key="categories" locale="en_US" charset="ISO-8859-1">
 
+  <msg key="Action">Action</msg>
+  <msg key="Action_add_root">Add root category</msg>
+  <msg key="Action_add_root_link_title">Add category at the root level</msg>
+  <msg key="Action_applications">Applications</msg>
+  <msg key="Action_applications_link_title">Applications</msg>
+  <msg key="Action_change_parent">Change parent</msg>
+  <msg key="Action_copy_tree">Copy tree</msg>
+  <msg key="Action_copy_tree_link_title">Copy categories from other tree</msg>
+  <msg key="Action_delete_tree">Delete tree</msg>
+  <msg key="Action_delete_tree_link_title">Delete this category tree</msg>
+  <msg key="Action_permissions_link_title">Manage permissions for tree</msg>
+  <msg key="Action_view_links">View links</msg>
+  <msg key="Action_view_synonyms">View synonyms</msg>
+  <msg key="Actions">Actions</msg>
+  <msg key="Add_category">Add category</msg>
+  <msg key="Add_subcategory_link_title">Add subcategory</msg>
+  <msg key="Add_tree">Add tree</msg>
+  <msg key="AND__">&gt;AND
+  |</msg>
+  <msg key="Browse">Browse</msg>
+  <msg key="Browse_link_title">Browse through selected category trees</msg>
   <msg key="cadmin">Category Management</msg>
+  <msg key="Cancel_do_not_unmap">Cancel, do not unmap</msg>
   <msg key="Categories">Categories</msg>
+  <msg key="Categorize_name">Categorize %name%</msg>
+  <msg key="Category">Category</msg>
+  <msg key="checked">checked</msg>
   <msg key="code_export">Export code to recreate category trees</msg>
   <msg key="code_necessary">Tcl code to recreate selected category trees</msg>
+  <msg key="Create_a_new_tree">Create a new tree</msg>
+  <msg key="Current_categories">Current categories</msg>
+  <msg key="Delete">Delete</msg>
+  <msg key="Delete_action_link_title">Delete checked categories</msg>
+  <msg key="Delete_category_link_title">Delete category and all subcategories</msg>
+  <msg key="Delete_category_tree_title">Delete Category Tree &quot;%tree_name%&quot;</msg>
+  <msg key="Deprecate">Deprecate</msg>
+  <msg key="Deprecate_category_link_title">Deprecate checked categories</msg>
+  <msg key="Deprecated">Deprecated</msg>
+  <msg key="Description">Description</msg>
+  <msg key="Edit_category">Edit category</msg>
+  <msg key="Edit_category_link_title">Edit this category</msg>
+  <msg key="Edit_parameters">Edit parameters</msg>
+  <msg key="Edit_tree">Edit tree</msg>
   <msg key="export">Export</msg>
+  <msg key="here">here</msg>
+  <msg key="Language">Language</msg>
+  <msg key="lt_Are_you_sure_you_want">Are you sure you want to delete these categories:</msg>
+  <msg key="lt_Are_you_sure_you_want_1">Are you sure you want to delete these category links:</msg>
+  <msg key="lt_Are_you_sure_you_want_2">Are you sure you want to delete these synonyms:</msg>
+  <msg key="lt_Are_you_sure_you_want_3">Are you sure you want to delete the tree &quot;%tree_name%&quot;?</msg>
+  <msg key="lt_Are_you_sure_you_want_4">Are you sure you want to unmap the tree &quot;%tree_name%&quot; from &quot;%object_name%&quot;?</msg>
+  <msg key="lt_Categories_still_used">Categories still used</msg>
+  <msg key="lt_Category_Administrati">Category Administration</msg>
+  <msg key="lt_Category_trees_availa">Category trees available for mapping</msg>
+  <msg key="lt_Category_trees_mapped">Category trees mapped to &quot;%object_name%&quot;</msg>
+  <msg key="lt_Create_and_map_a_new_">Create and map a new category tree</msg>
+  <msg key="lt_Explanation_Any_categ">Explanation: Any categorization made to the source category will
+also be made to the target category.</msg>
+  <msg key="lt_form_varsnoquote__Com">%form_vars;noquote%
+  Combine by
+  [</msg>
+  <msg key="lt_object_count_objects_">%object_count% objects on %page_count% pages</msg>
+  <msg key="lt_Search_for_a_category">Search for a category</msg>
+  <msg key="lt_Select_Trees_for_brow">Select Trees for browsing</msg>
+  <msg key="lt_There_are_instances_w">There are %instances_without_permission% more uses of this tree, but you
+  don't have the permission to see them.</msg>
+  <msg key="lt_This_is_a_site_wide_c">This is a site wide category tree</msg>
+  <msg key="lt_This_tree_is_not_used">This tree is not used.</msg>
+  <msg key="lt_This_tree_is_still_us">This tree is still used by some modules. For a complete list, please go</msg>
+  <msg key="lt_To_deselect_or_select">To deselect or select multiple categories use the Control-Key on your keyboard.</msg>
+  <msg key="Make_it_Local">Make it Local</msg>
+  <msg key="Make_it_Site-Wide">Make it Site-Wide</msg>
+  <msg key="Map_subtree">Map subtree</msg>
+  <msg key="Map_this_subtree">Map this subree</msg>
+  <msg key="Map_tree">Map tree</msg>
+  <msg key="Mapiing_parameters_subtree_title"></msg>
+  <msg key="Mapping_parameters">Mapping Parameters</msg>
+  <msg key="Mapping_parameters_subtree_title">Parameters of mapping to subtree &quot;%tree_name% :: %category_name%&quot;</msg>
+  <msg key="Mapping_parameters_tree_title">Parameters of mapping to tree &quot;%tree_name%&quot;</msg>
+  <msg key="multiple">multiple</msg>
+  <msg key="No_Cancel">No, Cancel</msg>
+  <msg key="None">None</msg>
+  <msg key="OK">OK</msg>
+  <msg key="optional">optional</msg>
+  <msg key="OR_">&gt;OR ]</msg>
+  <msg key="Ordering">Ordering</msg>
+  <msg key="Ordering_update">Update ordering</msg>
+  <msg key="Ordering_update_link_title">Update ordering from values in list</msg>
+  <msg key="Permissions_manage">Manage Permissions</msg>
+  <msg key="Permissions_manage_title">Permissions Managment for tree &quot;%tree_name%&quot;</msg>
+  <msg key="required">required</msg>
+  <msg key="Restore">Restore</msg>
+  <msg key="Restore_category_link_title">Restore checked categories</msg>
+  <msg key="Search_string">Search String</msg>
+  <msg key="selected">selected</msg>
+  <msg key="single">single</msg>
+  <msg key="SiteWide_tree">Site-Wide Tree</msg>
+  <msg key="This_tree_is_local">This tree is local</msg>
+  <msg key="Tree_copy">Tree copy</msg>
+  <msg key="Tree_copy_title">Copy a tree into &quot;%tree_name%&quot;</msg>
+  <msg key="Tree_map_title">Select a subtree of &quot;%tree_name%&quot; to map</msg>
+  <msg key="Tree_Name">Tree Name</msg>
+  <msg key="Tree_view_title">Category Tree &quot;%tree_name%&quot;</msg>
+  <msg key="Trees_you_can_manage">Trees you can manage</msg>
+  <msg key="Trees_you_can_view">Trees you can view</msg>
+  <msg key="Unmap">Unmap</msg>
+  <msg key="unmap">unmap</msg>
+  <msg key="Usage">Usage</msg>
+  <msg key="Usage_title">Modules using Category Tree &quot;%tree_name%&quot;</msg>
+  <msg key="Widget">Widget</msg>
+  <msg key="Widget_checkbox">Checkbox - let users assign multiple categories</msg>
+  <msg key="Widget_multiselect">Multiselect - let users assign multiple categories</msg>
+  <msg key="Widget_radio">Radio</msg>
+  <msg key="Widget_required_category">Require users to assign at least one category?</msg>
+  <msg key="Widget_select">Select</msg>
 </message_catalog>
Index: openacs-4/packages/categories/lib/categorize.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/lib/categorize.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/categories/lib/categorize.adp	10 Mar 2005 18:27:41 -0000	1.1
+++ openacs-4/packages/categories/lib/categorize.adp	20 May 2011 10:41:11 -0000	1.2
@@ -1,6 +1,7 @@
-  <h1>Categorize @name@</h1>
+  <h1>#categories.Categorize_name#</h1>
   <if @catass_list@ not nil>
-    <h2> Current categories</h2>
+    <h2> #categories.Current_categories#</h2>
     <p>@catass_list;noquote@</p>
   </if>
   <formtemplate id="catass"></formtemplate>
+
Index: openacs-4/packages/categories/lib/map.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/lib/map.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/categories/lib/map.adp	10 Mar 2005 18:27:41 -0000	1.1
+++ openacs-4/packages/categories/lib/map.adp	20 May 2011 10:41:11 -0000	1.2
@@ -1 +1 @@
-OK
\ No newline at end of file
+#categories.OK#
Index: openacs-4/packages/categories/lib/tree-form.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/lib/tree-form.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/categories/lib/tree-form.tcl	6 Nov 2008 15:50:44 -0000	1.2
+++ openacs-4/packages/categories/lib/tree-form.tcl	20 May 2011 10:41:11 -0000	1.3
@@ -12,9 +12,9 @@
     -export { locale object_id ctx_id } \
     -form {
     {tree_id:key}
-    {tree_name:text {label "Name"} {html {size 50 maxlength 50}}}
-    {language:text(select) {label "Language"} {options $languages}}
-    {description:text(textarea),optional {label "Description"} {html {rows 5 cols 80}}}
+    {tree_name:text {label "#acs-subsite.Name#"} {html {size 50 maxlength 50}}}
+    {language:text(select) {label "#categories.Language#"} {options $languages}}
+    {description:text(textarea),optional {label "#categories.Description#"} {html {rows 5 cols 80}}}
 } -new_request {
     permission::require_permission -object_id $package_id -privilege category_admin
     set language $locale
Index: openacs-4/packages/categories/www/categories-browse.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/categories-browse.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/categories/www/categories-browse.adp	11 Feb 2004 00:40:14 -0000	1.3
+++ openacs-4/packages/categories/www/categories-browse.adp	20 May 2011 10:41:11 -0000	1.4
@@ -3,28 +3,25 @@
 <property name="context">@context_bar;noquote@</property>
 
 <form action="categories-browse">
-  @form_vars;noquote@
-  Combine by
-  [ <input type=radio name=join value="and"<if @join@ eq "and"> checked</if>>AND
-  | <input type=radio name=join value="or"<if @join@ eq "or"> checked</if>>OR ]
+  #categories.lt_form_varsnoquote__Com# <input type=radio name=join value="and"<if @join@ eq "and"> #categories.checked#</if>#categories.AND__# <input type=radio name=join value="or"<if @join@ eq "or"> #categories.checked#</if>#categories.OR_#
   <br>
   <multiple name=trees>
     @trees.tree_name@:
     <select name=category_ids multiple size=5>
     <group column=tree_id>
-      <option value="@trees.category_id@"<if @trees.selected_p@ eq 1> selected</if>>@trees.indent;noquote@@trees.category_name@
+      <option value="@trees.category_id@"<if @trees.selected_p@ eq 1> #categories.selected#</if>>@trees.indent;noquote@@trees.category_name@
     </group>
     </select>
   </multiple>
   <input type=submit name=button value="Show">
 </form>
 
-To deselect or select multiple categories use the Control-Key on your keyboard.
+#categories.lt_To_deselect_or_select#
 <p>
 
 <!-- pagination context bar -->
 <table cellpadding=4 cellspacing=0 border=0 width="95%">
-<tr><td></td><td align=center>@object_count@ objects on @page_count@ pages</td><td></td></tr>
+<tr><td></td><td align=center>#categories.lt_object_count_objects_#</td><td></td></tr>
 <tr>
   <td align=left width="5%">
     <if @info.previous_group@ not nil>
@@ -57,3 +54,4 @@
 @dimension_bar;noquote@
 <p>
 @items;noquote@
+
Index: openacs-4/packages/categories/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/index.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/categories/www/index.adp	11 Feb 2004 00:40:14 -0000	1.4
+++ openacs-4/packages/categories/www/index.adp	20 May 2011 10:41:11 -0000	1.5
@@ -4,12 +4,13 @@
 
 <if @admin_p@ eq 1>
   <div style="float: right;">
-    <a href="cadmin/" class="button">Category Administration</a>
+    <a href="cadmin/" class="button">#categories.lt_Category_Administrati#</a>
   </div>
 </if>
 
-<h3> Select Trees for browsing </h3>
+<h3> #categories.lt_Select_Trees_for_brow# </h3>
 <listtemplate name="trees"></listtemplate>
 
-<h3> Search for a category </h3>
+<h3> #categories.lt_Search_for_a_category# </h3>
 <formtemplate id="search_form"></formtemplate>
+
Index: openacs-4/packages/categories/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/index.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/categories/www/index.tcl	8 Nov 2008 17:05:38 -0000	1.8
+++ openacs-4/packages/categories/www/index.tcl	20 May 2011 10:41:11 -0000	1.9
@@ -12,7 +12,7 @@
     trees:multirow
 }
 
-set page_title "Categories"
+set page_title "#categories.Categories#"
 set context_bar ""
 
 set user_id [auth::require_login]
@@ -35,17 +35,17 @@
 template::list::create \
     -name trees \
     -key tree_ids \
-    -no_data "None" \
+    -no_data "#categories.None#" \
     -bulk_actions {
-	"Browse" "categories-browse" "Browse through selected category trees"
+	"#categories.Browse#" "categories-browse" "#categories.Browse_link_title#"
     } -elements {
 	tree_name {
-	    label "Name"
+	    label "#acs-subsite.Name#"
 	}
     }
 
 ad_form -name search_form -action . -form {
-    {search_text:text {label "Search String"} {value $search_text} {html {size 50 maxlength 200}}}
+    {search_text:text {label "#categories.Search_string#"} {value $search_text} {html {size 50 maxlength 200}}}
 } -on_submit {
     set query_id [category_synonym::search -search_text [string trim $search_text] -locale $locale]
 } -after_submit {
Index: openacs-4/packages/categories/www/cadmin/category-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-delete.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/categories/www/cadmin/category-delete.adp	5 Feb 2004 18:58:48 -0000	1.4
+++ openacs-4/packages/categories/www/cadmin/category-delete.adp	20 May 2011 10:41:11 -0000	1.5
@@ -4,13 +4,14 @@
 <property name="locale">@locale;noquote@</property>
 
 <p>
-  <b>Are you sure you want to delete these categories:</b>
+  <b>#categories.lt_Are_you_sure_you_want#</b>
 </p>
 
 <listtemplate name="categories"></listtemplate>
 
 <p>
-  <a href="@delete_url@" class="button">Delete</a>
+  <a href="@delete_url@" class="button">#categories.Delete#</a>
   &nbsp;&nbsp;&nbsp;
-  <a href="@cancel_url@" class="button">No, Cancel</a>
+  <a href="@cancel_url@" class="button">#categories.No_Cancel#</a>
 </p>
+
Index: openacs-4/packages/categories/www/cadmin/category-form.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-form.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/categories/www/cadmin/category-form.tcl	21 Dec 2008 18:05:35 -0000	1.9
+++ openacs-4/packages/categories/www/cadmin/category-form.tcl	20 May 2011 10:41:11 -0000	1.10
@@ -20,9 +20,9 @@
 permission::require_permission -object_id $tree_id -privilege category_tree_write
 
 if {[info exists category_id]} {
-    set page_title "Edit category"
+    set page_title [_ categories.Edit_category]
 } else {
-    set page_title "Add category"
+    set page_title [_ categories.Add_category]
 }
 
 set context_bar [category::context_bar $tree_id $locale \
@@ -36,9 +36,9 @@
   -export { tree_id parent_id locale object_id ctx_id } \
   -form {
     {category_id:key}
-    {name:text {label "Name"} {html {size 50 maxlength 200}}}
-    {language:text(select) {label "Language"} {value $locale} {options $languages}}
-    {description:text(textarea),optional {label "Description"} {html {rows 5 cols 80}}}
+    {name:text {label "#acs-admin.Name#"} {html {size 50 maxlength 200}}}
+    {language:text(select) {label "#categories.Language#"} {value $locale} {options $languages}}
+    {description:text(textarea),optional {label "#categories.Description#"} {html {rows 5 cols 80}}}
 } -new_request {
     set name ""
     set description ""
Index: openacs-4/packages/categories/www/cadmin/category-link-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-link-delete.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/categories/www/cadmin/category-link-delete.adp	8 Feb 2004 17:30:45 -0000	1.1
+++ openacs-4/packages/categories/www/cadmin/category-link-delete.adp	20 May 2011 10:41:11 -0000	1.2
@@ -4,13 +4,14 @@
 <property name="locale">@locale;noquote@</property>
 
 <p>
-  <b>Are you sure you want to delete these category links:</b>
+  <b>#categories.lt_Are_you_sure_you_want_1#</b>
 </p>
 
 <listtemplate name="category_links"></listtemplate>
 
 <p>
-  <a href="@delete_url@" class="button">Delete</a>
+  <a href="@delete_url@" class="button">#categories.Delete#</a>
   &nbsp;&nbsp;&nbsp;
-  <a href="@cancel_url@" class="button">No, Cancel</a>
+  <a href="@cancel_url@" class="button">#categories.No_Cancel#</a>
 </p>
+
Index: openacs-4/packages/categories/www/cadmin/category-links-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-links-view.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/categories/www/cadmin/category-links-view.adp	8 Feb 2004 17:30:45 -0000	1.1
+++ openacs-4/packages/categories/www/cadmin/category-links-view.adp	20 May 2011 10:41:11 -0000	1.2
@@ -4,5 +4,5 @@
 <property name="locale">@locale;noquote@</property>
 
 <listtemplate name="category_links"></listtemplate>
-Explanation: Any categorization made to the source category will
-also be made to the target category.
+#categories.lt_Explanation_Any_categ#
+
Index: openacs-4/packages/categories/www/cadmin/category-usage.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-usage.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/categories/www/cadmin/category-usage.adp	22 May 2003 14:25:54 -0000	1.2
+++ openacs-4/packages/categories/www/cadmin/category-usage.adp	20 May 2011 10:41:11 -0000	1.3
@@ -5,7 +5,7 @@
 
 <!-- pagination context bar -->
 <table cellpadding=4 cellspacing=0 border=0 width="95%">
-<tr><td></td><td align=center>@object_count@ objects on @page_count@ pages</td><td></td></tr>
+<tr><td></td><td align=center>#categories.lt_object_count_objects_#</td><td></td></tr>
 <tr>
   <td align=left width="5%">
     <if @info.previous_group@ not nil>
@@ -37,3 +37,4 @@
 </table>
 <p>
 @items;noquote@
+
Index: openacs-4/packages/categories/www/cadmin/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/index.adp,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/categories/www/cadmin/index.adp	14 Feb 2004 11:41:45 -0000	1.5
+++ openacs-4/packages/categories/www/cadmin/index.adp	20 May 2011 10:41:11 -0000	1.6
@@ -3,18 +3,19 @@
 <property name="context_bar">@context_bar;noquote@</property>
 <property name="locale">@locale;noquote@</property>
 
-<h3>Trees you can manage</h3>
+<h3>#categories.Trees_you_can_manage#</h3>
 
 <listtemplate name="trees_with_write_permission"></listtemplate>
 
 <p>
 
-<h3>Trees you can view</h3>
+<h3>#categories.Trees_you_can_view#</h3>
 
 <listtemplate name="trees_with_read_permission"></listtemplate>
 
 <p>
 
 <ul class="action-links">
-  <li><a href="@create_url@">Create a new tree</a></li>
+  <li><a href="@create_url@">#categories.Create_a_new_tree#</a></li>
 </ul>
+
Index: openacs-4/packages/categories/www/cadmin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/index.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/categories/www/cadmin/index.tcl	8 Nov 2008 17:05:38 -0000	1.10
+++ openacs-4/packages/categories/www/cadmin/index.tcl	20 May 2011 10:41:12 -0000	1.11
@@ -53,25 +53,25 @@
 
 set elements {
     tree_name {
-	label "Name"
+	label "#acs-subsite.Name#"
 	link_url_col view_url
     }
     description {
-	label "Description"
+	label "#categories.Description#"
     }
 }
 
 list::create \
     -name trees_with_write_permission \
-    -no_data "None" \
+    -no_data "#categories.None#" \
     -elements $elements \
     -key tree_id \
     -bulk_action_export_vars {locale} \
     -bulk_actions [list "[_ categories.export]" trees-code "[_ categories.code_export]"] \
 
 list::create \
     -name trees_with_read_permission \
-    -no_data "None" \
+    -no_data "#categories.None#" \
     -elements $elements
 
 set create_url [export_vars -no_empty -base tree-form { locale }]
Index: openacs-4/packages/categories/www/cadmin/object-map.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/object-map.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/categories/www/cadmin/object-map.adp	20 Apr 2004 21:13:11 -0000	1.2
+++ openacs-4/packages/categories/www/cadmin/object-map.adp	20 May 2011 10:41:12 -0000	1.3
@@ -4,15 +4,16 @@
 <property name="locale">@locale;noquote@</property>
 
 <p>
-<h3>Category trees mapped to "@object_name@"</h3>
+<h3>#categories.lt_Category_trees_mapped#</h3>
 
 <listtemplate name="mapped_trees"></listtemplate>
 
 <p>
-<h3>Category trees available for mapping</h3>
+<h3>#categories.lt_Category_trees_availa#</h3>
 
 <listtemplate name="unmapped_trees"></listtemplate>
 
 <ul class="action-links">
-  <li><a href="@create_url@">Create and map a new category tree</a></li>
+  <li><a href="@create_url@">#categories.lt_Create_and_map_a_new_#</a></li>
 </ul>
+
Index: openacs-4/packages/categories/www/cadmin/object-map.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/object-map.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/categories/www/cadmin/object-map.tcl	8 Nov 2008 17:05:38 -0000	1.5
+++ openacs-4/packages/categories/www/cadmin/object-map.tcl	20 May 2011 10:41:12 -0000	1.6
@@ -61,47 +61,47 @@
 
 template::list::create \
     -name mapped_trees \
-    -no_data "None" \
+    -no_data "#categories.None#" \
     -elements {
 	tree_name {
-	    label "Name"
+	    label "#acs-subsite.Name#"
 	    link_url_col view_url
 	}
         flags {
 	    display_template {
-		(<if @mapped_trees.site_wide_p@ eq t>Site-Wide Tree, </if>
+		(<if @mapped_trees.site_wide_p@ eq t>#categories.#SiteWide_tree#, </if>
                  <if @mapped_trees.widget@>@mapped_trees.widget@, </if>
-		 <if @mapped_trees.assign_single_p@ eq t>single, </if><else>multiple, </else>
-		 <if @mapped_trees.require_category_p@ eq t>required) </if><else>optional) </else>
+		 <if @mapped_trees.assign_single_p@ eq t>#categories.single#, </if><else>#categories.multiple#, </else>
+		 <if @mapped_trees.require_category_p@ eq t>#categories.required#) </if><else>#categories.optional#) </else>
 	    }
 	}
 	action {
-	    label "Action"
+	    label "#categories.Action#"
 	    display_template {
-		<a href="@mapped_trees.unmap_url@">Unmap</a> &nbsp; &nbsp;
-		<a href="@mapped_trees.edit_url@">Edit parameters</a>
+		<a href="@mapped_trees.unmap_url@">#categories.Unmap#</a> &nbsp; &nbsp;
+		<a href="@mapped_trees.edit_url@">#categories.Edit_parameters#</a>
 	    }
 	}
     }
 
 template::list::create \
     -name unmapped_trees \
-    -no_data "None" \
+    -no_data "#categories.None#" \
     -elements {
 	tree_name {
-	    label "Name"
+	    label "#acs-subsite.Name#"
 	    link_url_col view_url
 	}
 	site_wide_p {
 	    display_template {
-		<if @unmapped_trees.site_wide_p@ eq t> (Site-Wide Tree) </if>
+		<if @unmapped_trees.site_wide_p@ eq t> (#categories.SiteWide_tree#) </if>
 	    }
 	}
 	action {
-	    label "Action"
+	    label "#categories.Action#"
 	    display_template {
-		<a href="@unmapped_trees.map_url@">Map tree</a> &nbsp; &nbsp;
-		<a href="@unmapped_trees.subtree_url@">Map a subtree</a>
+		<a href="@unmapped_trees.map_url@">#categories.Map_tree#</a> &nbsp; &nbsp;
+		<a href="@unmapped_trees.subtree_url@">#categories.Map_subtree#</a>
 	    }
 	}
     }
Index: openacs-4/packages/categories/www/cadmin/permission-manage.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/permission-manage.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/categories/www/cadmin/permission-manage.adp	5 Feb 2004 18:58:48 -0000	1.2
+++ openacs-4/packages/categories/www/cadmin/permission-manage.adp	20 May 2011 10:41:12 -0000	1.3
@@ -5,14 +5,15 @@
 
 <p>
 <if @sw_tree_p@ eq 1>
-  This is a site wide category tree<p>
+  #categories.lt_This_is_a_site_wide_c#<p>
   <if @admin_p@ eq 1>
-    <a href="site-wide-status-change?action=0&@url_vars@" class="button">Make it Local</a>
+    <a href="site-wide-status-change?action=0&@url_vars@" class="button">#categories.Make_it_Local#</a>
   </if>
 </if>
 <else>
-  This tree is local<p>
+  #categories.This_tree_is_local#<p>
   <if @admin_p@ eq 1>
-    <a href="site-wide-status-change?action=1&@url_vars@" class="button">Make it Site-Wide</a>
+    <a href="site-wide-status-change?action=1&@url_vars@" class="button">#categories.Make_it_Site-Wide#</a>
   </if>
 </else>  
+
Index: openacs-4/packages/categories/www/cadmin/permission-manage.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/permission-manage.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/categories/www/cadmin/permission-manage.tcl	1 Mar 2005 00:01:27 -0000	1.5
+++ openacs-4/packages/categories/www/cadmin/permission-manage.tcl	20 May 2011 10:41:12 -0000	1.6
@@ -20,10 +20,10 @@
 
 array set tree [category_tree::get_data $tree_id $locale]
 set tree_name $tree(tree_name)
-set page_title "Permission Management for $tree_name"
+set page_title [_ categories.Permissions_manage_title]
 
 set context_bar [category::context_bar $tree_id $locale [value_if_exists object_id]]
-lappend context_bar "Manage Permissions"
+lappend context_bar [_ categories.Permissions_manage]
 
 set url_vars [export_vars {tree_id object_id locale}]
 set package_id [ad_conn package_id]
Index: openacs-4/packages/categories/www/cadmin/synonym-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/synonym-delete.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/categories/www/cadmin/synonym-delete.adp	11 Feb 2004 13:25:28 -0000	1.1
+++ openacs-4/packages/categories/www/cadmin/synonym-delete.adp	20 May 2011 10:41:12 -0000	1.2
@@ -4,13 +4,14 @@
 <property name="locale">@locale;noquote@</property>
 
 <p>
-  <b>Are you sure you want to delete these synonyms:</b>
+  <b>#categories.lt_Are_you_sure_you_want_2#</b>
 </p>
 
 <listtemplate name="synonyms"></listtemplate>
 
 <p>
-  <a href="@delete_url@" class="button">Delete</a>
+  <a href="@delete_url@" class="button">#categories.Delete#</a>
   &nbsp;&nbsp;&nbsp;
-  <a href="@cancel_url@" class="button">No, Cancel</a>
+  <a href="@cancel_url@" class="button">#categories.No_Cancel#</a>
 </p>
+
Index: openacs-4/packages/categories/www/cadmin/tree-copy-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-copy-view.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/categories/www/cadmin/tree-copy-view.tcl	6 Nov 2008 15:50:44 -0000	1.3
+++ openacs-4/packages/categories/www/cadmin/tree-copy-view.tcl	20 May 2011 10:41:12 -0000	1.4
@@ -28,12 +28,12 @@
 }
 
 set tree_name [category_tree::get_name $tree_id $locale]
-set page_title "Category Tree \"$tree_name\""
+set page_title [_ categories.Tree_view_title]
 
 set context_bar [category::context_bar $tree_id $locale \
                      [value_if_exists object_id] \
                      [value_if_exists ctx_id]]
-lappend context_bar [list [export_vars -no_empty -base tree-copy { {tree_id $target_tree_id} locale object_id ctx_id }] "Copy tree"] "View \"$tree_name\""
+lappend context_bar [list [export_vars -no_empty -base tree-copy { {tree_id $target_tree_id} locale object_id ctx_id }] [_ categories.Action_copy_tree]] "View \"$tree_name\""
 
 template::multirow create tree category_name deprecated_p level left_indent
 
@@ -45,10 +45,10 @@
 
 template::list::create \
     -name tree \
-    -no_data "None" \
+    -no_data "#categories.None#" \
     -elements {
 	category_name {
-	    label "Name"
+	    label "#acs-admin.Name#"
 	    display_template {
 		@tree.left_indent;noquote@ @tree.category_name@
 	    }
Index: openacs-4/packages/categories/www/cadmin/tree-copy.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-copy.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/categories/www/cadmin/tree-copy.tcl	6 Nov 2008 15:50:44 -0000	1.10
+++ openacs-4/packages/categories/www/cadmin/tree-copy.tcl	20 May 2011 10:41:12 -0000	1.11
@@ -22,12 +22,12 @@
 
 set tree_name [category_tree::get_name $tree_id $locale]
 set target_tree_id $tree_id
-set page_title "Copy a tree into \"$tree_name\""
+set page_title [_ categories.Tree_copy_title]
 
 set context_bar [category::context_bar $tree_id $locale \
                      [value_if_exists object_id] \
                      [value_if_exists ctx_id]]
-lappend context_bar "Copy tree"
+lappend context_bar [_ categories.Tree_copy]
 
 template::multirow create trees tree_id tree_name site_wide_p view_url copy_url
 
@@ -45,21 +45,21 @@
 
 template::list::create \
     -name trees \
-    -no_data "None" \
+    -no_data "#categories.None#" \
     -elements {
 	tree_name {
-	    label "Name"
+	    label "#acs-admin.Name#"
 	    link_url_col view_url
 	}
 	site_wide_p {
 	    display_template {
-		<if @trees.site_wide_p@ eq t> (Site-Wide Tree) </if>
+		<if @trees.site_wide_p@ eq t> (#categories.SiteWide_tree#) </if>
 	    }
 	}
 	copy {
-	    label "Action"
+	    label "#categories.Action#"
 	    display_template {
-		<a href="@trees.copy_url@">Copy tree</a>
+		<a href="@trees.copy_url@">#categories.Tree_copy#</a>
 	    }
 	}
     }
Index: openacs-4/packages/categories/www/cadmin/tree-delete.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-delete.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/categories/www/cadmin/tree-delete.adp	27 Apr 2004 11:23:45 -0000	1.4
+++ openacs-4/packages/categories/www/cadmin/tree-delete.adp	20 May 2011 10:41:12 -0000	1.5
@@ -5,27 +5,28 @@
 
 <p>
 <table>
-  <tr><th>Tree Name</th><td>@tree_name@</td></tr>
-  <tr><th>Description</th><td>@tree_description@</td></tr>
+  <tr><th>#categories.Tree_Name#</th><td>@tree_name@</td></tr>
+  <tr><th>#categories.Description#</th><td>@tree_description@</td></tr>
 </table>
 </p>
 
 <if @instances_using_p@ eq t>
-  This tree is still used by some modules. For a complete list, please go
-  <a href="@usage_url@">here</a>.
+  #categories.lt_This_tree_is_still_us#
+  <a href="@usage_url@">#categories.here#</a>.
 </if>
 
 <if @used_categories:rowcount@ gt 0>
-  <p><b>Categories still used</b>
+  <p><b>#categories.lt_Categories_still_used#</b>
   <listtemplate name="used_categories"></listtemplate>
   <p>
 </if>
 
 <if @instances_using_p@ ne t>
-  Are you sure you want to delete the tree "@tree_name@"?
+  #categories.lt_Are_you_sure_you_want_3#
   <p>
-    <a href="@delete_url@" class="button">Delete</a>
+    <a href="@delete_url@" class="button">#categories.Delete#</a>
     &nbsp;&nbsp;&nbsp;
-    <a href="@cancel_url@" class="button">No, Cancel</a>
+    <a href="@cancel_url@" class="button">#categories.No_Cancel#</a>
   </p>
 </if>
+
Index: openacs-4/packages/categories/www/cadmin/tree-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-delete.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/categories/www/cadmin/tree-delete.tcl	6 Nov 2008 15:50:44 -0000	1.10
+++ openacs-4/packages/categories/www/cadmin/tree-delete.tcl	20 May 2011 10:41:12 -0000	1.11
@@ -28,11 +28,11 @@
 set tree_name $tree(tree_name)
 set tree_description $tree(description)
 
-set page_title "Delete Category Tree \"$tree_name\""
+set page_title [_ categories.Delete_category_title]
 set context_bar [category::context_bar $tree_id $locale \
                      [value_if_exists object_id] \
                      [value_if_exists ctx_id]]
-lappend context_bar "Delete"
+lappend context_bar [_ categories.Delete]
 
 set instance_list [category_tree::usage $tree_id]
 
@@ -58,10 +58,10 @@
 
 template::list::create \
     -name used_categories \
-    -no_data "None" \
+    -no_data "#categories.None#" \
     -elements {
 	category_name {
-	    label "Name"
+	    label "#acs-admin.Name#"
 	    link_url_col view_url
 	}
     }
Index: openacs-4/packages/categories/www/cadmin/tree-form.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-form.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/categories/www/cadmin/tree-form.tcl	6 Nov 2008 15:50:44 -0000	1.7
+++ openacs-4/packages/categories/www/cadmin/tree-form.tcl	20 May 2011 10:41:12 -0000	1.8
@@ -16,9 +16,9 @@
 auth::require_login
 
 if { ![ad_form_new_p -key tree_id] } {
-    set page_title "Edit tree"
+    set page_title "#categories.Edit_tree#"
 } else {
-    set page_title "Add tree"
+    set page_title "#categories.Add_tree#"
 }
 
 if { [info exists object_id] } {
Index: openacs-4/packages/categories/www/cadmin/tree-map-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-map-2.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/categories/www/cadmin/tree-map-2.tcl	8 Nov 2008 17:05:38 -0000	1.6
+++ openacs-4/packages/categories/www/cadmin/tree-map-2.tcl	20 May 2011 10:41:12 -0000	1.7
@@ -26,28 +26,28 @@
     permission::require_permission -object_id $tree_id -privilege category_tree_read
 }
 
-set context_bar [list [category::get_object_context $object_id] [list "[export_vars -no_empty -base object-map {locale object_id ctx_id}]" [_ categories.cadmin]] "Mapping Parameters"]
+set context_bar [list [category::get_object_context $object_id] [list "[export_vars -no_empty -base object-map {locale object_id ctx_id}]" [_ categories.cadmin]] [_ categories.Mapping_parameters]]
 
 if {$edit_p} {
     # parameters are edited, so get old data
     db_1row get_mapped_subtree_id ""
 }
 
 if {$category_id eq ""} {
-    set page_title "Parameters of mapping to tree \"$tree_name\""
+    set page_title [_ categories.Mapping_parameters_tree_title]
 } else {
     set category_name [category::get_name $category_id $locale]
-    set page_title "Parameters of mapping to subtree \"$tree_name :: $category_name\""
+    set page_title [_ categories.Mapping_parameters_subtree_title]
 }
 
 ad_form -name tree_map_form -action tree-map-2 -export { tree_id category_id locale object_id edit_p ctx_id} -form {
-    {widget:text(radio) {label "Widget"} {options {
-	{"Select" select}
-	{"Multiselect - let users assign multiple categories" multiselect}
-	{"Radio" radio}
-	{"Checkbox - let users assign multiple categories" checkbox}
+    {widget:text(radio) {label "#categories.Widget#"} {options {
+      {"#categories.Widget_select#" select}
+      {"#categories.Widget_multiselect#" multiselect}
+      {"#categories.Widget_radio#" radio}
+      {"#categories.Widget_checkbox#" checkbox}
     }}}
-    {require_category_p:text(radio) {label "Require users to assign at least one category?"} {options {{"Yes" t} {"No" f}}}}
+    {require_category_p:text(radio) {label "#categories.Widget_required_category#"} {options {{"#acs-admin.Yes#" t} {"#acs-admin.No#" f}}}}
 } -on_request {
     if {$edit_p} {
 	db_1row get_mapping_parameters ""
Index: openacs-4/packages/categories/www/cadmin/tree-map.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-map.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/categories/www/cadmin/tree-map.tcl	6 Nov 2008 15:50:44 -0000	1.8
+++ openacs-4/packages/categories/www/cadmin/tree-map.tcl	20 May 2011 10:41:12 -0000	1.9
@@ -25,12 +25,11 @@
     permission::require_permission -object_id $tree_id -privilege category_tree_read
 }
 
-set page_title "Select subtree of \"$tree_name\" to map"
-
+set page_title [_ categories.Tree_map_title]
 set context_bar [list \
    [category::get_object_context $object_id] \
    [list [export_vars -no_empty -base object-map {locale object_id ctx_id}] [_ categories.cadmin]] \
-   "Map subtree"]
+   "#categories.Map_subtree#"]
 
 template::multirow create tree category_id category_name level left_indent map_url
 
@@ -44,18 +43,18 @@
 
 template::list::create \
     -name tree \
-    -no_data "None" \
+    -no_data "#categories.None#" \
     -elements {
 	category_name {
-	    label "Name"
+	    label "#acs-subsite.Name#"
 	    display_template {
 		@tree.left_indent;noquote@ @tree.category_name@
 	    }
 	}
 	map {
-	    label "Action"
+	    label "#categories.Action#"
 	    display_template {
-		<a href="@tree.map_url@">Map this subtree</a>
+		<a href="@tree.map_url@">#categories.Map_this_subtree#</a>
 	    }
 	}
     }
Index: openacs-4/packages/categories/www/cadmin/tree-unmap.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-unmap.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/categories/www/cadmin/tree-unmap.adp	11 Jan 2004 17:33:31 -0000	1.3
+++ openacs-4/packages/categories/www/cadmin/tree-unmap.adp	20 May 2011 10:41:12 -0000	1.4
@@ -3,11 +3,12 @@
 <property name="context_bar">@context_bar;noquote@</property>
 <property name="locale">@locale;noquote@</property>
 
-Are you sure you want to unmap the tree "@tree_name@" from "@object_name@"?
+#categories.lt_Are_you_sure_you_want_4#
 
 <p>
-  <a href="@delete_url@" class="button">Unmap</a>
+  <a href="@delete_url@" class="button">#categories.Unmap#</a>
   &nbsp;&nbsp;&nbsp;
-  <a href="@cancel_url@" class="button">Cancel, do not unmap</a>
+  <a href="@cancel_url@" class="button">#categories.Cancel_do_not_unmap#</a>
 </p>
 
+
Index: openacs-4/packages/categories/www/cadmin/tree-usage.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-usage.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/categories/www/cadmin/tree-usage.adp	27 Apr 2004 11:23:45 -0000	1.3
+++ openacs-4/packages/categories/www/cadmin/tree-usage.adp	20 May 2011 10:41:12 -0000	1.4
@@ -5,8 +5,8 @@
 
 <p>
 <table>
-  <tr><th>Tree Name</th><td>@tree_name@</td></tr>
-  <tr><th>Description</th><td> @tree_description@</td></tr>
+  <tr><th>#categories.Tree_Name#</th><td>@tree_name@</td></tr>
+  <tr><th>#categories.Description#</th><td> @tree_description@</td></tr>
 </table>
 </p>
 
@@ -16,15 +16,15 @@
     </ul><if @modules.object_name@ ne @modules.instance_name@>@modules.instance_name@</if><ul>
     <group column=package_id>
       <li><a href="/o/@modules.object_id@">@modules.object_name@</a>
-          <a href="@unmap_url@" class="button">unmap</a></li>
+          <a href="@unmap_url@" class="button">#categories.unmap#</a></li>
     </group>
   </group>
   </ul>
 </multiple>
 <if @instances_without_permission@ gt 0>
-  There are @instances_without_permission@ more uses of this tree, but you
-  don't have the permission to see them.
+  #categories.lt_There_are_instances_w#
 </if>
 <if @modules:rowcount@ eq 0 and @instances_without_permission@ eq 0>
-  This tree is not used.
+  #categories.lt_This_tree_is_not_used#
 </if>
+
Index: openacs-4/packages/categories/www/cadmin/tree-usage.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-usage.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/categories/www/cadmin/tree-usage.tcl	6 Nov 2008 15:50:44 -0000	1.8
+++ openacs-4/packages/categories/www/cadmin/tree-usage.tcl	20 May 2011 10:41:12 -0000	1.9
@@ -28,12 +28,12 @@
 
 set tree_name $tree(tree_name)
 set tree_description $tree(description)
-set page_title "Modules using Category Tree \"$tree_name\""
+set page_title [_ categories.Usage_title]
 
 set context_bar [category::context_bar $tree_id $locale \
                      [value_if_exists object_id] \
                      [value_if_exists ctx_id]]
-lappend context_bar "Usage"
+lappend context_bar [_ categories.Usage]
 
 
 template::multirow create modules package object_id object_name package_id instance_name read_p unmap_url
Index: openacs-4/packages/categories/www/cadmin/tree-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-view.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/categories/www/cadmin/tree-view.tcl	9 Nov 2008 23:29:23 -0000	1.14
+++ openacs-4/packages/categories/www/cadmin/tree-view.tcl	20 May 2011 10:41:12 -0000	1.15
@@ -30,7 +30,7 @@
 set tree_name $tree(tree_name)
 set tree_description $tree(description)
 
-set page_title "Category Tree \"$tree_name\""
+set page_title [_ categories.Tree_view_title]
 if {[info exists object_id]} {
     set context_bar [list [category::get_object_context $object_id] [list [export_vars -no_empty -base object-map {locale object_id ctx_id}] "[_ categories.cadmin]"] $tree_name]
 } else {
@@ -84,15 +84,15 @@
 	    <img src="/resources/acs-subsite/Edit16.gif" height="16" width="16" alt="Edit" style="border:0">
 	}
 	link_url_col edit_url
-	link_html {title "Edit this category"}
+	link_html {title "#categories.Edit_category_link_title#"}
     }
 }
 
 lappend elements category_name {
-    label "Category"
+    label "#categories.Category#"
     display_template {
 	@one_tree.left_indent;noquote@<a href="@one_tree.usage_url@" title="Show usage of this category">@one_tree.category_name@</a>
-	<if @one_tree.deprecated_p@ true>(Deprecated - <a href="@one_tree.phase_in_url@">Restore</a>)</if>
+	<if @one_tree.deprecated_p@ true>(#categories.Deprecated# - <a href="@one_tree.phase_in_url@">#categories.Restore#</a>)</if>
     }
 }
 
@@ -103,20 +103,20 @@
 	    <img src="/resources/acs-subsite/Add16.gif" height="16" width="16" alt="Add" style="border:0">
 	}
 	link_url_col add_url
-	link_html { title "Add subcategory" }
+	link_html { title "#categories.Add_subcategory_link_title#" }
     }
     lappend elements sort_key {
-	label "Ordering"
+	label "#categories.Ordering#"
 	display_template {
 	    <input name="sort_key.@one_tree.category_id@" value="@one_tree.sort_key@" size="8">
 	}
     }
     lappend elements actions {
-	label "Actions"
+	label "#categories.Actions#"
 	display_template {
-	    <a href="@one_tree.parent_url@">Change parent</a> &nbsp; &nbsp;
-	    <a href="@one_tree.links_view_url@">View links</a> &nbsp; &nbsp;
-	    <a href="@one_tree.synonyms_view_url@">View synonyms</a>
+	    <a href="@one_tree.parent_url@">#categories.Action_change_parent#</a> &nbsp; &nbsp;
+	    <a href="@one_tree.links_view_url@">#categories.Action_view_links#</a> &nbsp; &nbsp;
+	    <a href="@one_tree.synonyms_view_url@">#categories.Action_view_synonyms#</a>
 	}
     }
 
@@ -126,27 +126,27 @@
 	    <img src="/resources/acs-subsite/Delete16.gif" height="16" width="16" alt="Delete" style="border:0">
 	}
 	link_url_col delete_url
-	link_html { title "Delete category and all subcategories" }
+	link_html { title "#categories.Delete_category_link_title#" }
     }
 }
 
 set actions [list]
 set bulk_actions [list]
 if { $can_write_p } {
     set bulk_actions {
-	"Delete" "category-delete" "Delete checked categories"
-	"Deprecate" "category-phase-out" "Deprecate checked categories"
-	"Restore" "category-phase-in" "Restore checked categories"
-	"Update ordering" "tree-order-update" "Update ordering from values in list"
+	"#categories.Delete#" "category-delete" "#categories.Delete_category_link_title#"
+	"#categories.Deprecate#" "category-phase-out" "#categories.Deprecate_category_link_title#"
+	"#categories.Restore#" "category-phase-in" "#categories.Restore_category_link_ttitle#"
+	"#categories.Ordering_update#" "tree-order-update" "#categories.Ordering_update_link_title#"
     }
     set actions [list \
-		     "Add root category" [export_vars -no_empty -base category-form { tree_id locale object_id ctx_id}] "Add category at the root level" \
-		     "Copy tree" [export_vars -no_empty -base tree-copy { tree_id locale object_id ctx_id}] "Copy categories from other tree" \
-		     "Delete tree" [export_vars -no_empty -base tree-delete { tree_id locale object_id ctx_id}] "Delete this category tree" \
-		     "Applications" [export_vars -no_empty -base tree-usage { tree_id locale object_id ctx_id}] "Applications using this tree"]
+		     "#categories.Action_add_root#" [export_vars -no_empty -base category-form { tree_id locale object_id ctx_id}] "#categories.Action_add_root_link_title#" \
+		     "#categories.Action_copy_tree#" [export_vars -no_empty -base tree-copy { tree_id locale object_id ctx_id}] "#categories.Action_copy_tree_link_title#" \
+		     "#categories.Action_delete_tree#" [export_vars -no_empty -base tree-delete { tree_id locale object_id ctx_id}] "#categories.Action_delete_tree_link_title#" \
+		     "#categories.Action_applications#" [export_vars -no_empty -base tree-usage { tree_id locale object_id ctx_id}] "#categories.Action_applications_link_title#"]
 
     if { $can_grant_p } {
-	lappend actions "Permissions" [export_vars -no_empty -base permission-manage { tree_id locale object_id ctx_id}] "Manage permissions for tree"
+	lappend actions "#acs-kernel.common_Permissions#" [export_vars -no_empty -base permission-manage { tree_id locale object_id ctx_id}] "#categories.Action_permissions_link_title#"
     }
 
 }
Index: openacs-4/packages/categories/www/include/widget.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/include/widget.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/categories/www/include/widget.adp	6 Feb 2004 14:00:31 -0000	1.3
+++ openacs-4/packages/categories/www/include/widget.adp	20 May 2011 10:41:12 -0000	1.4
@@ -1,11 +1,12 @@
 <if @trees:rowcount@ gt 0>
   <multiple name=trees>
     @trees.tree_name@:
-    <select name="@name@"<if @trees.assign_single_p@ eq f> multiple</if>>
+    <select name="@name@"<if @trees.assign_single_p@ eq f> #categories.multiple#</if>>
     <if @trees.assign_single_p@ eq t and @trees.require_category_p@ eq f><option value=""></if>
     <group column=tree_id>
-      <option value="@trees.category_id@"<if @trees.selected_p@ eq 1> selected</if>>@trees.indent;noquote@@trees.category_name@
+      <option value="@trees.category_id@"<if @trees.selected_p@ eq 1> #categories.selected#</if>>@trees.indent;noquote@@trees.category_name@
     </group>
     </select>
   </multiple>
 </if>
+