Index: openacs-4/packages/new-portal/new-portal.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/new-portal.info,v
diff -u -N -r1.17 -r1.18
--- openacs-4/packages/new-portal/new-portal.info	9 Jul 2002 02:56:29 -0000	1.17
+++ openacs-4/packages/new-portal/new-portal.info	12 Nov 2002 08:38:41 -0000	1.18
@@ -128,7 +128,7 @@
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="master_template"  default="/packages/new-portal/www/master" description="The path to the master template for this portal." section_name="Look and Feel"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="render_immutable_p"  default="0" description="When editing, render elements in immutable regions instead of merely displaying their names." section_name="Portal Editing"/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="local_remove_p"  default="0" description="When editing, render elements in immutable regions instead of merely displaying their names." section_name="Portal Editing"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="default_theme_name"  default="simple" description="the default theme"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="default_theme_name"  default="#new-portal.deco_theme_name#" description="the default theme"/>
         </parameters>
 
     </version>
Index: openacs-4/packages/new-portal/catalog/new-portal.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/catalog/new-portal.en_US.ISO-8859-1.xml,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/new-portal/catalog/new-portal.en_US.ISO-8859-1.xml	23 Oct 2002 12:27:17 -0000	1.1
+++ openacs-4/packages/new-portal/catalog/new-portal.en_US.ISO-8859-1.xml	12 Nov 2002 08:38:41 -0000	1.2
@@ -1,23 +1,40 @@
 <?xml version="1.0"?>
-<!-- Generated by lang::catalog::export_package_to_files on 2002 October 23 13:54 -->
+<!-- Generated by lang::catalog::export_package_to_files on 2002 November 09 22:25 -->
 <message_catalog package_key="new-portal" locale="en_US" charset="ISO-8859-1">
 
-  <msg key="Change_Theme">Change Theme:</msg>
-  <msg key="Create_a_new_page">Create a new page</msg>
-  <msg key="lt_Error_bad_params_n___">Error, bad params! \n
-                Please notify the system administrator of this error. Thank You</msg>
-  <msg key="Page">Page</msg>
   <msg key="Add_Page">Add Page</msg>
-  <msg key="lt_Revert_the_entire_por">Revert the entire portal to the default arrangement</msg>
+  <msg key="Bad_direction">Bad direction:</msg>
   <msg key="Bad_direction_1">Bad direction!</msg>
+  <msg key="Change_Page_Layout">Change Page Layout</msg>
+  <msg key="Change_Theme">Change Theme:</msg>
   <msg key="Change_Theme_1">Change Theme</msg>
+  <msg key="Change_page_layout">Change page layout:</msg>
+  <msg key="Create_a_new_page">Create a new page</msg>
+  <msg key="Go_back">Go back</msg>
+  <msg key="Move_to_page">Move to page</msg>
+  <msg key="Page">Page</msg>
+  <msg key="Page_1">Page:</msg>
   <msg key="Remove_Empty_Page">Remove Empty Page</msg>
   <msg key="Revert">Revert</msg>
-  <msg key="lt_You_must_enter_new_na">You must enter new name for the page.</msg>
+  <msg key="Unused_Portlets">Unused Portlets</msg>
+  <msg key="deco_theme_description">An Art Deco theme</msg>
+  <msg key="deco_theme_name">deco</msg>
+  <msg key="lt_Add_This_Portlet_Here">Add This Portlet Here</msg>
+  <msg key="lt_Error_bad_params_n___">Error, bad params! \n
+                Please notify the system administrator of this error. Thank You</msg>
   <msg key="lt_No_Elements_on_this_p">No Elements on this page</msg>
+  <msg key="lt_None_You_can_not_add_">None. You can not add any portlets to this page because they are all in use.</msg>
+  <msg key="lt_Revert_the_entire_por">Revert the entire portal to the default arrangement</msg>
+  <msg key="lt_You_must_enter_new_na">You must enter new name for the page.</msg>
+  <msg key="nada_theme_description">The un-theme. No graphics.</msg>
+  <msg key="nada_theme_name">nada</msg>
+  <msg key="simple_1column_layout_description">A simple 1-column layout</msg>
+  <msg key="simple_1column_layout_name">Simple 1-Column</msg>
+  <msg key="simple_2column_layout_description">A simple 2-column layout</msg>
+  <msg key="simple_2column_layout_name">Simple 2-Column</msg>
+  <msg key="simple_3column_layout_description">A simple 3-column layout</msg>
+  <msg key="simple_3column_layout_name">Simple 3-Column</msg>
+  <msg key="simple_red_theme_description">A simple red table-based theme</msg>
+  <msg key="simple_red_theme_name">simple</msg>
   <msg key="transaction_failed">transaction failed</msg>
-  <msg key="Page_1">Page:</msg>
-  <msg key="Change_Page_Layout">Change Page Layout</msg>
-  <msg key="Change_page_layout">Change page layout:</msg>
-  <msg key="Bad_direction">Bad direction:</msg>
 </message_catalog>
Index: openacs-4/packages/new-portal/sql/oracle/defaults.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/sql/oracle/defaults.sql,v
diff -u -N -r1.20 -r1.21
--- openacs-4/packages/new-portal/sql/oracle/defaults.sql	9 Aug 2002 20:56:27 -0000	1.20
+++ openacs-4/packages/new-portal/sql/oracle/defaults.sql	12 Nov 2002 08:38:41 -0000	1.21
@@ -31,8 +31,8 @@
 
     -- two-column layout, without a header.
     layout_id := portal_layout.new(
-        name => 'Simple 2-Column',
-        description => 'A simple 2-column layout',
+        name => '#new-portal.simple_2column_layout_name#',
+        description => '#new-portal.simple_2column_layout_description#',
         filename => 'layouts/simple2',
         resource_dir => 'layouts/components/simple2'
     );
@@ -43,8 +43,8 @@
 
     -- one-column layout, without a header.
     layout_id := portal_layout.new(
-        name => 'Simple 1-Column',
-        description => 'A simple 1-column layout',
+        name => '#new-portal.simple_1column_layout_name#',
+        description => '#new-portal.simple_1column_layout_description#',
         filename => 'layouts/simple1',
         resource_dir => 'layouts/components/simple1'
     );
@@ -54,8 +54,8 @@
 
     -- same as above, only, three columns.
     layout_id := portal_layout.new(
-        name => 'Simple 3-Column',
-        description => 'A simple 3-column layout',
+        name => '#new-portal.simple_3column_layout_name#',
+        description => '#new-portal.simple_3column_layout_description#',
         filename => 'layouts/simple3',
         resource_dir => 'layouts/components/simple3'
     );
@@ -66,22 +66,22 @@
 
     -- Now, some element themes.
     theme_id := portal_element_theme.new(
-        name => 'simple',
-        description => 'A simple red table-based theme',
+        name => '#new-portal.simple_red_theme_name#',
+        description => '#new-portal.simple_red_theme_description#',
         filename => 'themes/simple-theme',
         resource_dir => 'themes/simple-theme'
     );
 
     theme_id := portal_element_theme.new(
-        name => 'nada',
-        description => 'The un-theme. No graphics.',
+        name => '#new-portal.nada_theme_name#',
+        description => '#new-portal.nada_theme_description#',
         filename => 'themes/nada-theme',
         resource_dir => 'themes/nada-theme'
     );
 
     theme_id := portal_element_theme.new(
-        name => 'deco',
-        description => 'An Art Deco theme',
+        name => '#new-portal.deco_theme_name#',
+        description => '#new-portal.deco_theme_description#',
         filename => 'themes/deco-theme',
         resource_dir => 'themes/deco-theme'
     );
Index: openacs-4/packages/new-portal/sql/postgresql/defaults.sql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/sql/postgresql/defaults.sql,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/new-portal/sql/postgresql/defaults.sql	9 Aug 2002 20:56:28 -0000	1.4
+++ openacs-4/packages/new-portal/sql/postgresql/defaults.sql	12 Nov 2002 08:38:41 -0000	1.5
@@ -30,8 +30,8 @@
 
     -- two-column layout, without a header.
     layout_id := portal_layout__new(
-        ''Simple 2-Column'',
-        ''A simple 2-column layout'',
+        ''#new-portal.simple_2column_layout_name#'',
+        ''#new-portal.simple_2column_layout_description#'',
         ''layouts/simple2'',
         ''layouts/components/simple2''
     );
@@ -42,8 +42,8 @@
 
     -- one-column layout, without a header.
     layout_id := portal_layout__new(
-        ''Simple 1-Column'',
-        ''A simple 1-column layout'',
+        ''#new-portal.simple_1column_layout_name#'',
+        ''#new-portal.simple_1column_layout_description#'',
         ''layouts/simple1'',
         ''layouts/components/simple1''
     );
@@ -53,8 +53,8 @@
 
     -- same as above, only, three columns.
     layout_id := portal_layout__new(
-        ''Simple 3-Column'',
-        ''A simple 3-column layout'',
+        ''#new-portal.simple_3column_layout_name#'',
+        ''#new-portal.simple_3column_layout_description#'',
         ''layouts/simple3'',
         ''layouts/components/simple3''
     );
@@ -65,22 +65,22 @@
 
     -- Now, some element themes.
     theme_id := portal_element_theme__new(
-        ''simple'',
-        ''A simple red table-based theme'',
+        ''#new-portal.simple_red_theme_name#'',
+        ''#new-portal.simple_red_theme_description#'',
         ''themes/simple-theme'',
         ''themes/simple-theme''
     );
 
     theme_id := portal_element_theme__new(
-        ''nada'',
-        ''The un-theme. No graphics.'',
+        ''#new-portal.nada_theme_name#'',
+        ''#new-portal.nada_theme_description#'',
         ''themes/nada-theme'',
         ''themes/nada-theme''
     );
 
     theme_id := portal_element_theme__new(
-        ''deco'',
-        ''An Art Deco theme'',
+        ''#new-portal.deco_theme_name#'',
+        ''#new-portal.deco_theme_description#'',
         ''themes/deco-theme'',
         ''themes/deco-theme''
     );
Index: openacs-4/packages/new-portal/tcl/portal-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.tcl,v
diff -u -N -r1.159 -r1.160
--- openacs-4/packages/new-portal/tcl/portal-procs.tcl	24 Oct 2002 14:25:28 -0000	1.159
+++ openacs-4/packages/new-portal/tcl/portal-procs.tcl	12 Nov 2002 08:38:41 -0000	1.160
@@ -145,7 +145,7 @@
         # and first page layout from it, overriding any other params
 
         set page_name_list [list "Page 1"]
-        set layout_name_list [list "Simple 2-Column"]
+        set layout_name_list [list "#new-portal.simple_2column_layout_name#"]
 
         if {![empty_string_p $csv_list]} {
             set page_name_and_layout_list [split [string trimright $csv_list ";"] ";"]
@@ -385,7 +385,7 @@
         }
 
         if {[empty_string_p $referer]} {
-            set return_text "<a href=@return_url@>Go back</a>"
+            set return_text "<a href=@return_url@>[_ new-portal.Go_back]</a>"
         } else {
             set return_text ""
             set return_url $referer
@@ -1933,7 +1933,7 @@
     ad_proc -private get_layout_id {
         {-page_num ""}
         {-page_id ""}
-        {-layout_name "Simple 2-Column"}
+        {-layout_name "#new-portal.simple_2column_layout_name#"}
         {portal_id ""}
     } {
         Get the layout_id of a layout template for a portal page.
Index: openacs-4/packages/new-portal/www/place-element-other-page.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/place-element-other-page.adp,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/new-portal/www/place-element-other-page.adp	9 Aug 2002 20:56:29 -0000	1.7
+++ openacs-4/packages/new-portal/www/place-element-other-page.adp	12 Nov 2002 08:38:41 -0000	1.8
@@ -25,10 +25,10 @@
 <if @other_page_avail_p@ ne 0>
   <input type=hidden name=element_id value=@element_id@>
   <input type=hidden name=anchor value=@page_id@>
-  <input type=submit name="op" value="Move to page">
+  <input type=submit name="op" value="#new-portal.Move_to_page#">
   <select name=page_id>
   <multiple name=pages>
-  <option value=@pages.page_id@>@pages.pretty_name@</option>
+  <option value=@pages.page_id@><%= [lang::util::localize "@pages.pretty_name@"] %></option>
   </multiple>
   </select>
 
Index: openacs-4/packages/new-portal/www/place-element.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/place-element.adp,v
diff -u -N -r1.37 -r1.38
--- openacs-4/packages/new-portal/www/place-element.adp	16 Oct 2002 15:39:16 -0000	1.37
+++ openacs-4/packages/new-portal/www/place-element.adp	12 Nov 2002 08:38:41 -0000	1.38
@@ -29,7 +29,7 @@
 <multiple name=element_multi>
 <center>  
 <table class="portlet-config" cellpadding=0 cellspacing=0 border="0" bground="white" width="95%">
-    <tr><td class="element-header-text">@element_multi.name@</td>
+    <tr><td class="element-header-text"><%= [lang::util::localize "@element_multi.name@"] %></td>
     <td align=right>	
 
     <if @element_multi.state@ ne "pinned">
Index: openacs-4/packages/new-portal/www/show-here.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/show-here.adp,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/new-portal/www/show-here.adp	16 Oct 2002 15:39:17 -0000	1.1
+++ openacs-4/packages/new-portal/www/show-here.adp	12 Nov 2002 08:38:41 -0000	1.2
@@ -2,7 +2,7 @@
 <center>
 <table class="z_light" cellpadding=0 cellspacing=0 border="0" bground="white" width="95%">
     <tr><td>
-<h5>Unused Portlets</h5>
+<h5>#new-portal.Unused_Portlets#</h5>
 </td></tr>
 <tr><td>
 <if @show_avail_p@ ne 0>
@@ -15,10 +15,10 @@
 <input type=hidden name=anchor value=@page_id@>
 @show_html@
 </select>
-<input type=submit name="submit" value="Add This Portlet Here">
+<input type=submit name="submit" value="#new-portal.lt_Add_This_Portlet_Here#">
 </if>
 <else>
-<i>None. You can not add any portlets to this page because they are all in use.</i>
+<i>#new-portal.lt_None_You_can_not_add_#</i>
 </else>
 </center>
 </form>
Index: openacs-4/packages/new-portal/www/admin/portal-admin-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/admin/portal-admin-master.adp,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/new-portal/www/admin/portal-admin-master.adp	9 Aug 2002 20:56:30 -0000	1.3
+++ openacs-4/packages/new-portal/www/admin/portal-admin-master.adp	12 Nov 2002 08:38:41 -0000	1.4
@@ -21,7 +21,7 @@
 <hr>
 Portal: <strong>@name@</strong>
 <P>
-<a href=@referer@>Go back</a>
+<a href=@referer@>#new-portal.Go_back#</a>
 <hr>
 
 <slave>