Index: openacs-4/packages/curriculum/lib/summary.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum/lib/summary.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/curriculum/lib/summary.adp	11 Dec 2003 21:40:01 -0000	1.2
+++ openacs-4/packages/curriculum/lib/summary.adp	26 Feb 2007 19:52:14 -0000	1.3
@@ -21,7 +21,7 @@
 <else>
 
 <li>
-  #curriculum.lt_No_published_curricul#
+  @community_name@: #curriculum.lt_No_published_curricul#
 </li>
 
 </else>
Index: openacs-4/packages/curriculum-portlet/www/curriculum-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/curriculum-portlet/www/curriculum-portlet.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/curriculum-portlet/www/curriculum-portlet.adp	20 Apr 2004 21:13:12 -0000	1.2
+++ openacs-4/packages/curriculum-portlet/www/curriculum-portlet.adp	26 Feb 2007 19:52:15 -0000	1.3
@@ -13,5 +13,5 @@
 
 </if>
 <else>
-  &nbsp;
+  #new-portal.when_portlet_shaded#
 </else>
Index: openacs-4/packages/dotlrn-curriculum/tcl/dotlrn-curriculum-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-curriculum/tcl/dotlrn-curriculum-procs.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn-curriculum/tcl/dotlrn-curriculum-procs.tcl	13 Jan 2005 13:57:24 -0000	1.2
+++ openacs-4/packages/dotlrn-curriculum/tcl/dotlrn-curriculum-procs.tcl	26 Feb 2007 19:52:15 -0000	1.3
@@ -14,7 +14,7 @@
     } {
         get the pretty name
     } {
-        return "Curriculum"
+        return "#curriculum.pretty_name#"
     }
 
     ad_proc -public applet_key {} {
Index: openacs-4/packages/dotlrn-edit-this-page/tcl/dotlrn-edit-this-page-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-edit-this-page/tcl/dotlrn-edit-this-page-procs.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn-edit-this-page/tcl/dotlrn-edit-this-page-procs.tcl	13 Jan 2005 13:57:26 -0000	1.2
+++ openacs-4/packages/dotlrn-edit-this-page/tcl/dotlrn-edit-this-page-procs.tcl	26 Feb 2007 19:52:15 -0000	1.3
@@ -29,7 +29,7 @@
     } {
         get the pretty name
     } {
-        return "Edit This Page"
+        return "#edit-this-page.pretty_name#"
     }
 
     ad_proc -public applet_key {} {
Index: openacs-4/packages/dotlrn-news-aggregator/tcl/dotlrn-news-aggregator-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-news-aggregator/tcl/dotlrn-news-aggregator-procs.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/dotlrn-news-aggregator/tcl/dotlrn-news-aggregator-procs.tcl	13 Jan 2005 13:57:31 -0000	1.3
+++ openacs-4/packages/dotlrn-news-aggregator/tcl/dotlrn-news-aggregator-procs.tcl	26 Feb 2007 19:52:15 -0000	1.4
@@ -28,7 +28,7 @@
 ad_proc -public dotlrn_news_aggregator::get_pretty_name {} {
     returns the pretty name
 } {
-    return "News Aggregator"
+    return "#news-aggregator-portlet.pretty_name#"
 }
 
 ad_proc -public dotlrn_news_aggregator::add_applet {} {
@@ -49,7 +49,7 @@
     Add the news-aggregator applet to a specifc dotlrn community
 } {
     set portal_id [dotlrn_community::get_portal_id -community_id $community_id]
-
+    
     # create the news-aggregator package instance (all in one, I've mounted it)
     set package_id [dotlrn::instantiate_and_mount $community_id [package_key]]
 
@@ -66,6 +66,25 @@
     ns_set put $args package_id $package_id
     add_portlet_helper $portal_id $args
 
+    #create a aggregator to avoid the "no aggregator"-error
+    #begin
+    set package_name [apm_instance_name_from_id [ad_conn package_id]]
+    set aggregator_name "${package_name} - #news-aggregator.pretty_name#"
+    set user_id [ad_conn user_id]
+    set aggregator_id [news_aggregator::aggregator::new \
+                                -aggregator_name $aggregator_name \
+                                -package_id $package_id \
+                                -public_p 0 \
+                                -creation_user $user_id \
+                           -creation_ip [ad_conn peeraddr]]
+        news_aggregator::aggregator::set_user_default -user_id $user_id \
+            -package_id $package_id -aggregator_id $aggregator_id
+        #load preinstalled subscriptions into aggregator
+        news_aggregator::aggregator::load_preinstalled_subscriptions \
+            -aggregator_id $aggregator_id \
+            -package_id $package_id
+    #end
+
     return $package_id
 }
 
Index: openacs-4/packages/edit-this-page-portlet/catalog/edit-this-page-portlet.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page-portlet/catalog/edit-this-page-portlet.en_US.ISO-8859-1.xml,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/edit-this-page-portlet/catalog/edit-this-page-portlet.en_US.ISO-8859-1.xml	13 Jan 2005 13:58:05 -0000	1.2
+++ openacs-4/packages/edit-this-page-portlet/catalog/edit-this-page-portlet.en_US.ISO-8859-1.xml	26 Feb 2007 19:52:15 -0000	1.3
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="edit-this-page-portlet" package_version="0.1a" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="edit-this-page-portlet" package_version="2.0.3" locale="en_US" charset="ISO-8859-1">
 
+  <msg key="admin_edit-this-page">Administer ETP</msg>
   <msg key="admin_pretty_name">ETP Administration</msg>
   <msg key="Disable">Disable</msg>
   <msg key="Disabled">Disabled</msg>
   <msg key="Enable">Enable</msg>
+  <msg key="fs_edit-this-page">ETP File Storage</msg>
   <msg key="group">Group</msg>
   <msg key="name">Name</msg>
-  <msg key="admin_edit-this-page">Administer ETP</msg>
-  <msg key="fs_edit-this-page">ETP File Storage</msg>
+  <msg key="noentry_edit-this-page">no entry</msg>
   <msg key="one_admin_edit-this-page">There should be only one instance of ETP for admin purposes</msg>
   <msg key="pretty_name">ETP</msg>
-  <msg key="noentry_edit-this-page">no entry</msg>
 </message_catalog>
Index: openacs-4/packages/edit-this-page-portlet/www/edit-this-page-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/edit-this-page-portlet/www/edit-this-page-portlet.adp,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/edit-this-page-portlet/www/edit-this-page-portlet.adp	13 Jan 2005 13:58:06 -0000	1.2
+++ openacs-4/packages/edit-this-page-portlet/www/edit-this-page-portlet.adp	26 Feb 2007 19:52:15 -0000	1.3
@@ -33,9 +33,11 @@
     </multiple>
   </if>
   <else>
-    #edit-this-page-portlet.noentry_edit-this-page#
+    <small>#edit-this-page-portlet.noentry_edit-this-page#</small>
   </else>
 </if>
 <else>
-  &nbsp;
+  <small>
+    #new-portal.when_portlet_shaded#
+  </small>
 </else>
\ No newline at end of file
Index: openacs-4/packages/news-aggregator-portlet/tcl/news-aggregator-admin-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator-portlet/tcl/news-aggregator-admin-portlet-procs.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/news-aggregator-portlet/tcl/news-aggregator-admin-portlet-procs.tcl	28 Aug 2003 09:41:58 -0000	1.2
+++ openacs-4/packages/news-aggregator-portlet/tcl/news-aggregator-admin-portlet-procs.tcl	26 Feb 2007 19:52:15 -0000	1.3
@@ -18,7 +18,7 @@
 
 ad_proc -public news_aggregator_admin_portlet::get_pretty_name {
 } {
-    return "News Aggregator Administration"
+    return "#news-aggregator-portlet.news_aggregator_admin_portlet_pretty_name#"
 }
 
 
Index: openacs-4/packages/news-aggregator-portlet/tcl/news-aggregator-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator-portlet/tcl/news-aggregator-portlet-procs.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/news-aggregator-portlet/tcl/news-aggregator-portlet-procs.tcl	28 Aug 2003 09:41:58 -0000	1.2
+++ openacs-4/packages/news-aggregator-portlet/tcl/news-aggregator-portlet-procs.tcl	26 Feb 2007 19:52:15 -0000	1.3
@@ -26,7 +26,7 @@
 
 ad_proc -public news_aggregator_portlet::get_pretty_name {
 } {
-    return "News Aggregator"
+    return "#news-aggregator-portlet.news_aggregator_portlet_pretty_name#"
 }