Index: openacs-4/packages/dotlrn-calendar/dotlrn-calendar.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-calendar/dotlrn-calendar.info,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/dotlrn-calendar/dotlrn-calendar.info	29 May 2003 18:05:24 -0000	1.9
+++ openacs-4/packages/dotlrn-calendar/dotlrn-calendar.info	18 Sep 2003 15:03:11 -0000	1.10
@@ -20,7 +20,6 @@
         <requires url="dotlrn-fs" version="0.1a"/>
 
         <parameters>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="user_default_page"  default="My Calendar" description="Default Page for addition of the portlet"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="main_calendar_package_id"  description="The package_id of calendar mounted right under dotLRN"/>
         </parameters>
 
Index: openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.tcl,v
diff -u -r1.68 -r1.69
--- openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.tcl	24 Jun 2003 00:23:10 -0000	1.68
+++ openacs-4/packages/dotlrn-calendar/tcl/dotlrn-calendar-procs.tcl	18 Sep 2003 15:03:11 -0000	1.69
@@ -483,18 +483,12 @@
     ad_proc -public get_user_default_page {} {
         The "full calendar" portlet must go on this page of a user's portal
     } {
-        return [parameter::get_from_package_key \
-                    -package_key [my_package_key] \
-                    -parameter "user_default_page"
-        ]
+        return "#dotlrn.user_portal_page_calendar_title#"
     }
 
     ad_proc -public get_community_default_page {} {
         The "full calendar" portlet must go on this page of a comm's portal
     } {
-        return [parameter::get_from_package_key \
-                    -package_key [my_package_key] \
-                    -parameter "user_default_page"
-        ]
+        return "#dotlrn.club_page_calendar_title#"
     }
 }
Index: openacs-4/packages/dotlrn-fs/dotlrn-fs.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-fs/dotlrn-fs.info,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/dotlrn-fs/dotlrn-fs.info	29 May 2003 18:05:48 -0000	1.20
+++ openacs-4/packages/dotlrn-fs/dotlrn-fs.info	18 Sep 2003 15:03:11 -0000	1.21
@@ -24,7 +24,6 @@
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="dotlrn_club_default_folders"  description="Default folders for clubs."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="dotlrn_class_instance_default_folders"  default="#dotlrn-fs.Assignments#,#dotlrn-fs.Lecture_Notes#,#dotlrn-fs.Handouts#,#dotlrn-fs.Exams#,#dotlrn-fs.Projects#" description="Default folders for classes."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="dotlrn_community_default_folders"  description="Default folders for communities of type dotlrn_community, most likely subcommunities."/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="user_default_page"  default="My Files" description="Default Page for addition of the portlet"/>
         </parameters>
 
     </version>
Index: openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl,v
diff -u -r1.81 -r1.82
--- openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl	29 May 2003 18:05:49 -0000	1.81
+++ openacs-4/packages/dotlrn-fs/tcl/dotlrn-fs-procs.tcl	18 Sep 2003 15:03:11 -0000	1.82
@@ -400,6 +400,8 @@
                     -package_key [my_package_key] \
                     -parameter "dotlrn_class_instance_folders_to_show"
                 ]
+
+                # TODO: Do we need to also pass in layout #new-portal.simple_1column_layout_name# ?
         
                 foreach folder [string trim [split $portlet_list ',']] {
                     fs_contents_portlet::add_self_to_page \
@@ -706,19 +708,19 @@
     ad_proc -public get_user_default_page {} {
         return the user default page to add the portlet to
     } {
-        return "My Files"
+        return "#dotlrn.user_portal_page_file_storage_title#"
     }
 
     ad_proc -public get_community_default_page {} {
-        return the user default page to add the portlet to
+        return the community (club) default page to add the portlet to
     } {
-        return "File Storage"
+        return "#dotlrn.club_page_file_storage_title#"
     }
 
     ad_proc -public get_subcomm_default_page {} {
-        return the user default page to add the portlet to
+        return the subcomm default page to add the portlet to
     } {
-        return Files
+        return "#dotlrn.subcomm_page_file_storage_title#"
     }
 
     ad_proc -public get_package_id {