Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml,v
diff -u -N -r1.88 -r1.89
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml	15 Apr 2011 09:50:52 -0000	1.88
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.en_US.ISO-8859-1.xml	15 Apr 2011 10:29:16 -0000	1.89
@@ -135,6 +135,7 @@
   <msg key="Define_a_new_relationship_type">Define a new relationship type</msg>
   <msg key="Delete">Delete</msg>
   <msg key="delete">delete</msg>
+  <msg key="Delete_selected_app">Delete selected applications</msg>
   <msg key="Delete_this_application">Delete this application</msg>
   <msg key="Description">Description</msg>
   <msg key="DevAdmin">DevAdmin</msg>
@@ -495,6 +496,7 @@
   <msg key="See_full_size">See full size</msg>
   <msg key="Select_an_Object_by_Id">Select an Object by Id:</msg>
   <msg key="Select_Applications">Select Applications</msg>
+  <msg key="Select_Applications__helptext">If the application is not in the list, you may need to &lt;a href=\&quot;/acs-admin/install/\&quot;&gt;install&lt;/a&gt; it on the server</msg>
   <msg key="Select_relation_type">Select relation type</msg>
   <msg key="Send_email_to_this_user">Send email to this user</msg>
   <msg key="Send_me_a_copy">Send me a copy:</msg>
@@ -540,7 +542,7 @@
   <msg key="To_copy_an_application_instance_to_another">To &lt;strong&gt;copy&lt;/strong&gt; an application instance to another URL, create a new folder as above, then select &lt;em&gt;mount&lt;/em&gt;.  Select the application to be copied from the list of available packages.</msg>
   <msg key="To_log_in_visit_the"> Please check your inbox. Within the next few minutes, you should find an e-mail from %system_owner% with a new randomly generated password and instructions on how to proceed. Once received, go to
 </msg>
-  <msg key="To_move_an_application_copy_it_as_above">To &lt;strong&gt;move&lt;/strong&gt; an application,
+  <msg key="To_move_an_application_copy_it_as_above">To &lt;strong&gt;move&lt;/strong&gt; an application,
 copy it as above to the new location, then select &lt;em&gt;unmount&lt;/em&gt; at the old location.  Selecting &lt;em&gt;delete&lt;/em&gt; on the empty folder will remove it from the site node.</msg>
   <msg key="To_remove_an_application_and_all_of_its_data">To &lt;strong&gt;remove&lt;/strong&gt; an application and all of its data, select &lt;em&gt;unmount&lt;/em&gt; from all the site nodes it is mounted from, then &lt;em&gt;delete&lt;/em&gt; it from the &lt;em&gt;Unmounted Applications&lt;/em&gt; link below the site map.</msg>
   <msg key="Topic">Topic</msg>
Index: openacs-4/packages/acs-subsite/catalog/acs-subsite.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/catalog/acs-subsite.es_ES.ISO-8859-1.xml,v
diff -u -N -r1.36 -r1.37
--- openacs-4/packages/acs-subsite/catalog/acs-subsite.es_ES.ISO-8859-1.xml	15 Apr 2011 09:50:52 -0000	1.36
+++ openacs-4/packages/acs-subsite/catalog/acs-subsite.es_ES.ISO-8859-1.xml	15 Apr 2011 10:29:16 -0000	1.37
@@ -116,6 +116,7 @@
   <msg key="Define_a_new_relationship_type">Define un nuevo tipo de relaci�n</msg>
   <msg key="Delete">Borrar</msg>
   <msg key="delete">Borrar</msg>
+  <msg key="Delete_selected_app">Borrar aplicaciones seleccionadas</msg>
   <msg key="Delete_this_application">Borrar esta aplicaci�n</msg>
   <msg key="Description">Descripci�n</msg>
   <msg key="DevAdmin">Administraci�n de desarrolladores</msg>
@@ -419,6 +420,7 @@
   <msg key="See_full_size">Ver a tama�o completo</msg>
   <msg key="Select_an_Object_by_Id">Seleccionar un objeto por Id </msg>
   <msg key="Select_Applications">Selecciona las aplicaciones</msg>
+  <msg key="Select_Applications__helptext">Si una aplicaci�n no aparece en la lista, necesitar� &lt;a href=\&quot;/acs-admin/install/\&quot;&gt;instalarla&lt;/a&gt; en el servidor</msg>
   <msg key="Select_relation_type">Selecciona el tipo de relaci�n</msg>
   <msg key="Send_email_to_this_user">Enviar email a este usuario</msg>
   <msg key="Send_me_a_copy">Envienme una copia:</msg>
Index: openacs-4/packages/acs-subsite/www/admin/applications/application-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/applications/application-add.adp,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/admin/applications/application-add.adp	24 Jan 2004 14:10:42 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/admin/applications/application-add.adp	15 Apr 2011 10:29:16 -0000	1.6
@@ -6,5 +6,5 @@
 <formtemplate id="application"></formtemplate>
 
 <ul class="action-links">
-  <li><a href="@multiple_add_url@">Add multiple applications</a></li>
+  <li><a href="@multiple_add_url@">#acs-subsite.Add_multiple_applications#</a></li>
 </ul>
Index: openacs-4/packages/acs-subsite/www/admin/applications/application-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/applications/application-add.tcl,v
diff -u -N -r1.10 -r1.11
--- openacs-4/packages/acs-subsite/www/admin/applications/application-add.tcl	10 Jan 2007 21:22:06 -0000	1.10
+++ openacs-4/packages/acs-subsite/www/admin/applications/application-add.tcl	15 Apr 2011 10:29:16 -0000	1.11
@@ -9,7 +9,7 @@
     {return_url "."}
 }
 
-set page_title "New Application"
+set page_title "[_ acs-subsite.New_Application]"
 set context [list [list "." "Applications"] $page_title]
 
 set packages [subsite::get_application_options]
@@ -26,18 +26,18 @@
     {return_url:text(hidden),optional}
     {node_id:key}
     {package_key:text(select)
-        {label "Application"}
+        {label "[_ acs-subsite.Application]"}
         {options $packages}
         {help_text "The type of application you want to add.  If the application is not in the list, you may need to <a href=\"/acs-admin/install/\">install</a> it on the server."}
         {mode {[ad_decode [ad_form_new_p -key node_id] 1 "" "display"]}}
     }
     {instance_name:text,optional
-        {label "Application name"}
+        {label "[_ acs-subsite.Application_name]"}
         {help_text "The human-readable name of your application. If blank, the name of the application is used (e.g. 'Forums')."}
         {html {size 50}}
     }
     {folder:text,optional
-        {label "URL folder name"}
+        {label "[_ acs-subsite.URL_folder_name]"}
         {help_text "The partial URL of the new application.  This should be a short string, all lowercase, with hyphens instead of spaces. If blank, the package name is used (e.g. 'forum')."}
         {html {size 30}}
     }
Index: openacs-4/packages/acs-subsite/www/admin/applications/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/applications/index.tcl,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/acs-subsite/www/admin/applications/index.tcl	21 Nov 2007 14:08:43 -0000	1.9
+++ openacs-4/packages/acs-subsite/www/admin/applications/index.tcl	15 Apr 2011 10:29:16 -0000	1.10
@@ -6,7 +6,7 @@
     @cvs-id $Id$
 }
 
-set page_title "Applications"
+set page_title "[_ acs-subsite.Applications]"
 set context [list $page_title]
 
 # Get the subsite node ID
@@ -26,49 +26,49 @@
     -multirow applications \
     -key node_id \
     -actions { 
-        "Add application" application-add "Add new application"
+        "#acs-subsite.Add_application#" application-add "#acs-subsite.Add_new_app#"
     } \
     -bulk_actions {
-        "Delete" application-delete "Delete selected applications"
+        "#acs-subsite.Delete#" application-delete "#acs-subsite.Delete_selected_app#"
     } \
     -elements {
         edit {
             sub_class narrow
             display_template {
-                <img src="/shared/images/Edit16.gif" height="16" width="16" alt="Edit application name and path" style="border:0">
+                <img src="/shared/images/Edit16.gif" height="16" width="16" alt="#acs-subsite.Edit_application_name_and_path#" style="border:0">
             }
             link_url_eval {[export_vars -base application-add { node_id }]}
-            link_html { title "Edit application name and path" }
+            link_html { title "#acs-subsite.Edit_application_name_and_path#" }
         }
         instance_name {
-            label "Name"
+            label "[_ acs-subsite.Name]"
             link_url_eval {../../$name/}
         }
         name {
-            label "URL"
+            label "[_ acs-subsite.URL]"
         }
         package_pretty_name {
-            label "Application"
+            label "[_ acs-subsite.Application]"
         }
         permissions {
-            label "Permissions"
+            label "[_ acs-subsite.Permissions]"
             link_url_eval {[export_vars -base permissions { package_id }]}
-            display_template {Permissions}
+            display_template { #acs-subsite.Permissions# }
             sub_class narrow
         }
         parameters {
-            label "Parameters"
+            label "[_ acs-subsite.Parameters]"
             link_url_col parameter_url
-            display_template {<if @applications.parameter_url@ not nil>Parameters</if>}
+            display_template {<if @applications.parameter_url@ not nil>[_ acs-subsite.Parameters]</if>}
             sub_class narrow
         }
         delete {
             sub_class narrow
             display_template {
-                <img src="/shared/images/Delete16.gif" height="16" width="16" alt="Delete this application" style="border:0">
+                <img src="/shared/images/Delete16.gif" height="16" width="16" alt="#acs-subsite.Delete_this_application#" style="border:0">
             }
             link_url_eval {[export_vars -base application-delete { node_id }]}
-            link_html { title "Delete this application" }
+            link_html { title "#acs-subsite.Delete_this_application#" }
         }
     }
 
Index: openacs-4/packages/acs-subsite/www/admin/applications/multiple-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/applications/multiple-add.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/applications/multiple-add.adp	14 Dec 2003 11:56:54 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/applications/multiple-add.adp	15 Apr 2011 10:29:16 -0000	1.2
@@ -1,5 +1,5 @@
 <master>
-  <property name="title">@page_title@</property>
+  <property name="doc(title)">@doc.title@</property>
   <property name="context">@context@</property>
   <property name="focus">application.package_key</property>
 
Index: openacs-4/packages/acs-subsite/www/admin/applications/multiple-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/admin/applications/multiple-add.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/admin/applications/multiple-add.tcl	14 Dec 2003 11:56:54 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/admin/applications/multiple-add.tcl	15 Apr 2011 10:29:16 -0000	1.2
@@ -8,16 +8,16 @@
     {return_url "."}
 }
 
-set page_title "Add Applications"
-set context [list [list "." "Applications"] $page_title]
+set doc(title) "[_ acs-subsite.Add_multiple_applications]"
+set context [list [list "." [_ acs-subsite.Applications]] $doc(title)]
 
 set packages [subsite::get_application_options]
 
 ad_form -name application -cancel_url . -export { return_url } -form {
     {package_key:text(checkbox),multiple
-        {label "Select Applications"}
+        {label "[_ acs-subsite.Select_Applications]"}
         {options $packages}
-        {help_text "If the application is not in the list, you may need to <a href=\"/acs-admin/install/\">install</a> it on the server."}
+        {help_text "[_ acs-subsite.Select_Applications__helptext]"}
     }
 } -on_submit {
     # Find the package pretty name from the list of packages