Index: openacs-4/packages/news-aggregator/catalog/news-aggregator.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/catalog/news-aggregator.en_US.ISO-8859-1.xml,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/news-aggregator/catalog/news-aggregator.en_US.ISO-8859-1.xml	30 May 2006 03:57:25 -0000	1.1.2.2
+++ openacs-4/packages/news-aggregator/catalog/news-aggregator.en_US.ISO-8859-1.xml	20 Nov 2006 19:41:18 -0000	1.1.2.3
@@ -1,14 +1,71 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <message_catalog package_key="news-aggregator" package_version="1.0.2" locale="en_US" charset="ISO-8859-1">
 
+  <msg key="Add">Add</msg>
+  <msg key="Add_new_weblog">Add new weblog</msg>
+  <msg key="Blog">Blog</msg>
+  <msg key="Copy">Copy</msg>
+  <msg key="Copy_Selected">Copy selected subscriptions to %title%</msg>
+  <msg key="Description">Description</msg>
+  <msg key="Enter_the_URL_of_an_XML_news_feed"> Enter the URL of an XML news feed you want to subscribe to or choose a feed the system already knows about and then click on the Add button.</msg>
+  <msg key="Export_Subscriptions">Export Subscriptions</msg>
+  <msg key="Export_your_subscriptions_as_an_OPML_file">Export_your_subscriptions as an OPML file</msg>
+  <msg key="Feed">Feed</msg>
+  <msg key="General">General</msg>
+  <msg key="Help_Msg_aggregator">A public aggregator is intended to be used by a group of people and will not have a Purge button. Instead, the most recent 100 items will be displayed. Private aggregators will, by default, only be viewable by the creator.</msg>
+  <msg key="Last_Scan">Last Scan</msg>
+  <msg key="Last_Update">Last Update</msg>
   <msg key="lt_Create_New_Aggregator">Create New Aggregator</msg>
+  <msg key="lt_Create_new_aggregator">Create new aggregator</msg>
+  <msg key="lt_Edit_attributes_for_t">Edit attributes for this aggregator:</msg>
+  <msg key="lt_Manage_detailed_permi">Manage detailed permissions for this aggregator. You can use this form to allow other users to view your personal feeds.</msg>
   <msg key="lt_Manage_This_Aggregato">Manage This Aggregator</msg>
+  <msg key="lt_No_weblog_options_ava">No weblog options available!</msg>
+  <msg key="lt_Posted_itemspub_time_">Posted: %items.pub_time_pretty%</msg>
+  <msg key="lt_The_following_feeds_w">The following feeds were found in the OPML file at</msg>
+  <msg key="lt_The_following_table_l">The following table lists the XML news feeds you've subscribed to. 
+      To delete a subscription, check it and then click on the Unsubscribe button 
+      at the bottom of the page.</msg>
+  <msg key="lt_The_weblogs_below_wil">The weblogs below will show up as options (in addition to any blogger instances you can post to on your subsite) 
+when you choose to blog about a news item.</msg>
+  <msg key="lt_This_page_lists">This page lists &lt;b&gt;the most recent items&lt;/b&gt; from the feeds you've &lt;a href=&quot;@url@subscriptions&quot;&gt;subscribed&lt;/a&gt; to.</msg>
+  <msg key="lt_Use_tabs_below_to_mod">Use tabs below to modify options for this aggregator. Options for %instance_name% are 
+available on the</msg>
+  <msg key="lt_You_can_hit_the_Purge">You can hit the Purge button to clean out the page. Clicking the &lt;a href=&quot;#&quot; class=&quot;button&quot;&gt;Save&lt;/a&gt; button will prevent an item from being purged.</msg>
+  <msg key="lt_You_can_import_OPML_e">You can import OPML either from an URL, or by uploading a file.</msg>
+  <msg key="lt_You_have_the_ability_">You have the ability to view the following aggregators in %instance_name%. If You select a default aggregator,  
+you will automatically be directed there when visiting %instance_name%. If you have write privileges on 
+a particular aggregator, you will have the option to edit or delete it as well.</msg>
+  <msg key="lt_You_will_not_usually_">You will not usually come back to the aggregator.</msg>
+  <msg key="Manage">Manage</msg>
   <msg key="Manage_Subscriptions">Manage Subscriptions</msg>
+  <msg key="Move">Move</msg>
+  <msg key="Move_Selected">Move selected subscriptions to %title%</msg>
+  <msg key="Name">Name</msg>
+  <msg key="No">No</msg>
   <msg key="No_items">No items.</msg>
+  <msg key="Note">Note:</msg>
   <msg key="Off">Off</msg>
   <msg key="On">On</msg>
+  <msg key="page">page.</msg>
+  <msg key="Permissions">Permissions</msg>
   <msg key="Post">Post</msg>
+  <msg key="pretty_name">News Aggregator</msg>
+  <msg key="Public">Public?</msg>
   <msg key="Purges">Purges:</msg>
   <msg key="raquo">&amp;raquo;</msg>
+  <msg key="Save">Save</msg>
+  <msg key="settings">settings</msg>
+  <msg key="Source">Source:</msg>
+  <msg key="Subscriptions">Subscriptions</msg>
+  <msg key="Titles_Only">Titles Only?</msg>
+  <msg key="Toggle">Toggle</msg>
+  <msg key="Unsave">Unsave</msg>
+  <msg key="Unsubscribe">Unsubscribe</msg>
   <msg key="updated_x_time_ago">updated %items.diff%</msg>
+  <msg key="URL">URL</msg>
+  <msg key="View_the_XML">View the XML source for this subscriptions</msg>
+  <msg key="Yes">Yes</msg>
+  <msg key="You_have_been_unsubscribed">You have been unsubscribed from one source.</msg>
+  <msg key="You_have_been_unsubscribed_from">You have been unsubscribed from %delete_count% sources.</msg>
 </message_catalog>
Index: openacs-4/packages/news-aggregator/tcl/news-aggregator-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/tcl/news-aggregator-procs.tcl,v
diff -u -r1.9.2.4 -r1.9.2.5
--- openacs-4/packages/news-aggregator/tcl/news-aggregator-procs.tcl	14 Jan 2006 23:27:59 -0000	1.9.2.4
+++ openacs-4/packages/news-aggregator/tcl/news-aggregator-procs.tcl	20 Nov 2006 19:41:18 -0000	1.9.2.5
@@ -85,7 +85,7 @@
 	    return "Yesterday"
 	}
 	default {
-	    return "$days Days Ago"
+            return "$days Days Ago"
 	}
     }
-}
\ No newline at end of file
+}
Index: openacs-4/packages/news-aggregator/www/aggregator-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/Attic/aggregator-edit.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/news-aggregator/www/aggregator-edit.adp	14 Jan 2006 23:27:59 -0000	1.1.2.1
+++ openacs-4/packages/news-aggregator/www/aggregator-edit.adp	20 Nov 2006 19:41:18 -0000	1.1.2.2
@@ -5,6 +5,6 @@
 <include src="aggregator-tabs" tab="general">
 
 <p>
-Edit attributes for this aggregator:
+#news-aggregator.lt_Edit_attributes_for_t#
 
-<include src="aggregator">
\ No newline at end of file
+<include src="aggregator">
Index: openacs-4/packages/news-aggregator/www/aggregator-tabs.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/Attic/aggregator-tabs.adp,v
diff -u -r1.1.2.3 -r1.1.2.4
--- openacs-4/packages/news-aggregator/www/aggregator-tabs.adp	27 Jul 2006 11:39:13 -0000	1.1.2.3
+++ openacs-4/packages/news-aggregator/www/aggregator-tabs.adp	20 Nov 2006 19:41:18 -0000	1.1.2.4
@@ -1,7 +1,6 @@
-<h2>Manage @ag_info.aggregator_name@</h2>
+<h2>#news-aggregator.Manage# @ag_info.aggregator_name@</h2>
 
-Use tabs below to modify options for this aggregator. Options for @instance_name@ are 
-available on the <a href="./settings">settings</a> page.
+#news-aggregator.lt_Use_tabs_below_to_mod# <a href="./settings">#news-aggregator.settings#</a> #news-aggregator.page#
 
 <p>
 
@@ -10,26 +9,27 @@
     <div id="subnavbar">
 
      <if @tab@ eq "general">
-      <div class="tab" id="subnavbar-here">General</div>
+      <div class="tab" id="subnavbar-here">#news-aggregator.General#</div>
      </if>
      <else>
-      <div class="tab"><a href="aggregator-edit?aggregator_id=@aggregator_id@">General</a></div>
+      <div class="tab"><a href="aggregator-edit?aggregator_id=@aggregator_id@">#news-aggregator.General#</a></div>
      </else
 
      <if @tab@ eq "subscriptions">
-      <div class="tab" id="subnavbar-here">Subscriptions</div>
+      <div class="tab" id="subnavbar-here">#news-aggregator.Subscriptions#</div>
      </if>
      <else>
-      <div class="tab"><a href="subscriptions?aggregator_id=@aggregator_id@">Subscriptions</a></div>
+      <div class="tab"><a href="subscriptions?aggregator_id=@aggregator_id@">#news-aggregator.Subscriptions#</a></div>
      </else>
 
      <if @tab@ eq "permissions">
-      <div class="tab" id="subnavbar-here">Permissions</div>
+      <div class="tab" id="subnavbar-here">#news-aggregator.Permissions#</div>
      </if>
      <else>
-      <div class="tab"><a href="permissions?aggregator_id=@aggregator_id@">Permissions</a></div>
+      <div class="tab"><a href="permissions?aggregator_id=@aggregator_id@">#news-aggregator.Permissions#</a></div>
      </else>
 
     </div>
   </div>
 </div>
+
Index: openacs-4/packages/news-aggregator/www/aggregator.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/aggregator.tcl,v
diff -u -r1.4.2.4 -r1.4.2.5
--- openacs-4/packages/news-aggregator/www/aggregator.tcl	14 Jan 2006 23:27:59 -0000	1.4.2.4
+++ openacs-4/packages/news-aggregator/www/aggregator.tcl	20 Nov 2006 19:41:18 -0000	1.4.2.5
@@ -21,17 +21,17 @@
 ad_form -name aggregator -action aggregator -select_query_name select_aggregator -form {
     {aggregator_id:integer(hidden),key}
     {aggregator_name:text
-        {label "Name"}
+        {label "\#news-aggregator.Name\#"}
         {html {size 50}}
     }
     {description:text(textarea),optional
-        {label "Description"}
+        {label "\#news-aggregator.Description\#"}
         {html {cols 60 rows 10}}
     }
     {public_p:text(radio)
-        {label "Public?"}
-        {options {{"Yes" t} {"No" f}}}
-	{help_text "A public aggregator is intended to be used by a group of people and will not have a Purge button. Instead, the most recent 100 items will be displayed. Private aggregators will, by default, only be viewable by the creator."}
+        {label "\#news-aggregator.Public\#"}
+        {options {{"[_ news-aggregator.Yes]" t} {"[_ news-aggregator.No]" f}}}
+	{help_text "[_ news-aggregator.Help_Msg_aggregator]"}
     }
     {return_url:text(hidden)
         {value $return_url}
Index: openacs-4/packages/news-aggregator/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/index.adp,v
diff -u -r1.12.2.12 -r1.12.2.13
--- openacs-4/packages/news-aggregator/www/index.adp	29 Jan 2006 18:16:40 -0000	1.12.2.12
+++ openacs-4/packages/news-aggregator/www/index.adp	20 Nov 2006 19:41:18 -0000	1.12.2.13
@@ -18,12 +18,12 @@
 
  <else>
   </div>
-   This page lists <b>the most recent items</b> from the feeds you've <a href="@url@subscriptions">subscribed</a> to.
- </else>
+	#news-aggregator.lt_This_page_lists#
+  </else>
 
 <div>
  <if @enable_purge_p@ true and @public_p@ false>
-   You can hit the Purge button to clean out the page. Clicking the <a href="#" class="button">Save</a> button will prevent an item from being purged.
+   #news-aggregator.lt_You_can_hit_the_Purge#
  </if>
  <if @write_p@ true and @blog_p@ true>
    Click the <a href="#" class="button">Blog</a> button to post the item to a weblog (you will have a choice of weblogs to post to).
Index: openacs-4/packages/news-aggregator/www/item-blog.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/item-blog.adp,v
diff -u -r1.2.2.2 -r1.2.2.3
--- openacs-4/packages/news-aggregator/www/item-blog.adp	1 Jan 2006 19:44:38 -0000	1.2.2.2
+++ openacs-4/packages/news-aggregator/www/item-blog.adp	20 Nov 2006 19:41:18 -0000	1.2.2.3
@@ -3,7 +3,7 @@
   <property name="context">@context@</property>
 
 <p>
-  <h3>Source: <a href="@link@">@title@</a></h3>
+  <h3>#news-aggregator.Source# <a href="@link@">@title@</a></h3>
 </p>
 
 <p>
@@ -13,9 +13,9 @@
 <if @weblog_p@ true>
  <formtemplate id="blog_item"></formtemplate>
  <p>
-   <b>Note:</b> You will not usually come back to the aggregator.
+   <b>#news-aggregator.Note#</b> #news-aggregator.lt_You_will_not_usually_#
  </p>
 </if>
 <else>
- No weblog options available!
-</else>
\ No newline at end of file
+ #news-aggregator.lt_No_weblog_options_ava#
+</else>
Index: openacs-4/packages/news-aggregator/www/multi-source-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/Attic/multi-source-chunk.adp,v
diff -u -r1.1.2.3 -r1.1.2.4
--- openacs-4/packages/news-aggregator/www/multi-source-chunk.adp	3 Feb 2006 23:57:57 -0000	1.1.2.3
+++ openacs-4/packages/news-aggregator/www/multi-source-chunk.adp	20 Nov 2006 19:41:18 -0000	1.1.2.4
@@ -19,7 +19,7 @@
              <a href="@items.item_link@" class="na-item">@items.item_title;noquote@</a>
             </if>
            </div>
-           <div class="na-item-pub-time">Posted: @items.pub_time_pretty@
+           <div class="na-item-pub-time">#news-aggregator.lt_Posted_itemspub_time_#
             <if @items.item_link@ not nil and @items.item_guid_link@ not nil>
              <a href="@items.item_guid_link@" title="Permanent URL for this entry" class="na-item">#</a>
             </if>        
@@ -28,14 +28,14 @@
            <div class="na-item-button-bar">
             <if @write_p@ true>
              <if @items.save_url@ not nil>
-               <a href="@items.save_url@" alt="Mark this item as saved" class="button">Save</a>
+               <a href="@items.save_url@" alt="Mark this item as saved" class="button">#news-aggregator.Save#</a>
              </if>
              <if @items.unsave_url@ not nil>
-              <a href="@items.unsave_url@" alt="Unmark this item as saved" class="button">Unsave</a>
+              <a href="@items.unsave_url@" alt="Unmark this item as saved" class="button">#news-aggregator.Unsave#</a>
              </if>
             </if>
             <if @blog_p@ true>
-             <a href="@items.item_blog_url@" alt="Post this item to a Weblog" class="button">Blog</a>
+             <a href="@items.item_blog_url@" alt="Post this item to a Weblog" class="button">#news-aggregator.Blog#</a>
             </if>
            </div>
           </div>
@@ -44,23 +44,23 @@
           <div class="na-item-title-only na-item">
           <a name="@items.item_id@">
             <a href="@items.item_link@" class="na-item-title-only-title">@items.item_title;noquote@</a>
-            <span class="na-item-pub-time">Posted: @items.pub_time_pretty@</span>
+            <span class="na-item-pub-time">#news-aggregator.lt_Posted_itemspub_time_#</span>
             <if @items.item_link@ not nil and @items.item_guid_link@ not nil>
              <a href="@items.item_guid_link@" title="Permanent URL for this entry">#</a>
             </if>&nbsp;
             <if @write_p@ true>
             <if @items.save_url@ not nil>
-              <a href="@items.save_url@" alt="Save" class="button">Save</a>
+              <a href="@items.save_url@" alt="Save" class="button">#news-aggregator.Save#</a>
             </if>
             <if @items.unsave_url@ not nil>
-             <a href="@items.unsave_url@" alt="Unsave" class="button">Unsave</a>
+             <a href="@items.unsave_url@" alt="Unsave" class="button">#news-aggregator.Unsave#</a>
             </if>
             </if>
             <if @blog_p@ true>
-              <a href="@items.item_blog_url@" alt="Post this item to your Weblog" class="button">Blog</a>
+              <a href="@items.item_blog_url@" alt="Post this item to your Weblog" class="button">#news-aggregator.Blog#</a>
             </if>
           </div>
         </else>
        </group>
     </group>
-  </multiple>
\ No newline at end of file
+  </multiple>
Index: openacs-4/packages/news-aggregator/www/opml-import-2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/opml-import-2.adp,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/news-aggregator/www/opml-import-2.adp	3 Jun 2004 18:11:12 -0000	1.2
+++ openacs-4/packages/news-aggregator/www/opml-import-2.adp	20 Nov 2006 19:41:18 -0000	1.2.2.1
@@ -3,7 +3,8 @@
 <property name="context">@context@</property>
 
 <p>
-	The following feeds were found in the OPML file at <b>@opml_url@</b>:
+	#news-aggregator.lt_The_following_feeds_w# <b>@opml_url@</b>:
 </p>
 
 <listtemplate name="opml_feeds"></listtemplate>
+
Index: openacs-4/packages/news-aggregator/www/opml-import.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/opml-import.adp,v
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- openacs-4/packages/news-aggregator/www/opml-import.adp	20 Mar 2004 11:04:39 -0000	1.1.1.1
+++ openacs-4/packages/news-aggregator/www/opml-import.adp	20 Nov 2006 19:41:18 -0000	1.1.1.1.2.1
@@ -7,8 +7,9 @@
 </p>
 
 <p>
-    You can import OPML either from an URL, or by uploading a file.
+    #news-aggregator.lt_You_can_import_OPML_e#
 </p>
 
 <formtemplate id="opml"></formtemplate>
 
+
Index: openacs-4/packages/news-aggregator/www/permissions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/Attic/permissions.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/news-aggregator/www/permissions.adp	4 Jan 2006 05:31:08 -0000	1.1.2.1
+++ openacs-4/packages/news-aggregator/www/permissions.adp	20 Nov 2006 19:41:18 -0000	1.1.2.2
@@ -6,6 +6,7 @@
   <include src="aggregator-tabs" tab="permissions">
 
   <p>
-  Manage detailed permissions for this aggregator. You can use this form to allow other users to view your personal feeds.
+  #news-aggregator.lt_Manage_detailed_permi#
   <p>
   <include src="/packages/acs-subsite/www/permissions/perm-include" object_id="@aggregator_id@">
+
Index: openacs-4/packages/news-aggregator/www/settings.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/settings.adp,v
diff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3
--- openacs-4/packages/news-aggregator/www/settings.adp	1 Jan 2006 19:44:38 -0000	1.1.1.1.2.2
+++ openacs-4/packages/news-aggregator/www/settings.adp	20 Nov 2006 19:41:18 -0000	1.1.1.1.2.3
@@ -4,21 +4,19 @@
 
 <h2>@page_title@</h2>
 <p>
-You have the ability to view the following aggregators in @instance_name@. If You select a default aggregator,  
-you will automatically be directed there when visiting @instance_name@. If you have write privileges on 
-a particular aggregator, you will have the option to edit or delete it as well.
+#news-aggregator.lt_You_have_the_ability_#
   <listtemplate name="aggregators"></listtemplate>
 </p>
 <p>
-  <b>&raquo;</b> <a href="@aggregator_link@">Create new aggregator</a>
+  <b>&raquo;</b> <a href="@aggregator_link@">#news-aggregator.lt_Create_new_aggregator#</a>
 </p>
 
 <p>&nbsp;</p>
 <p>
-The weblogs below will show up as options (in addition to any blogger instances you can post to on your subsite) 
-when you choose to blog about a news item. 
+#news-aggregator.lt_The_weblogs_below_wil# 
   <listtemplate name="weblogs"></listtemplate>
 </p>
 <p>
-  <b>&raquo;</b> <a href="@package_url@weblog">Add new weblog</a>
+  <b>&raquo;</b> <a href="@package_url@weblog">#news-aggregator.Add_new_weblog#</a>
 </p>
+
Index: openacs-4/packages/news-aggregator/www/single-source-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/Attic/single-source-chunk.adp,v
diff -u -r1.1.2.3 -r1.1.2.4
--- openacs-4/packages/news-aggregator/www/single-source-chunk.adp	3 Feb 2006 23:57:57 -0000	1.1.2.3
+++ openacs-4/packages/news-aggregator/www/single-source-chunk.adp	20 Nov 2006 19:41:18 -0000	1.1.2.4
@@ -18,7 +18,7 @@
              <a href="@items.item_link@" class="na-item">@items.item_title;noquote@</a>
             </if>
            </div>
-           <div class="na-item-pub-time">Posted: @items.pub_time_pretty@
+           <div class="na-item-pub-time">#news-aggregator.lt_Posted_itemspub_time_#
             <if @items.item_link@ not nil and @items.item_guid_link@ not nil>
              <a href="@items.item_guid_link@" title="Permanent URL for this entry">#</a>
             </if>        
@@ -27,14 +27,14 @@
            <div class="na-item-button-bar">
             <if @write_p@ true>
              <if @items.save_url@ not nil>
-               <a href="@items.save_url@" alt="Save" class="button">Save</a>
+               <a href="@items.save_url@" alt="Save" class="button">#news-aggregator.Save#</a>
              </if>
              <if @items.unsave_url@ not nil>
-              <a href="@items.unsave_url@" alt="Unsave" class="button">Unsave</a>
+              <a href="@items.unsave_url@" alt="Unsave" class="button">#news-aggregator.Unsave#</a>
              </if>
             </if>
             <if @blog_p@ true>
-             <a href="@items.item_blog_url@" alt="Post this item to your Weblog" class="button">Blog</a>
+             <a href="@items.item_blog_url@" alt="Post this item to your Weblog" class="button">#news-aggregator.Blog#</a>
             </if>
            </div>
           </div>
@@ -43,22 +43,22 @@
           <div class="na-item-title-only na-item">
           <a name="@items.item_id@">
             <a href="@items.item_link@" class="na-item-title-only-title">@items.item_title;noquote@</a>
-            <span class="na-item-pub-time">Posted: @items.pub_time_pretty@</span>
+            <span class="na-item-pub-time">#news-aggregator.lt_Posted_itemspub_time_#</span>
             <if @items.item_link@ not nil and @items.item_guid_link@ not nil>
              <a href="@items.item_guid_link@" title="Permanent URL for this entry">#</a>
             </if>&nbsp;
             <if @write_p@ true>
             <if @items.save_url@ not nil>
-              <a href="@items.save_url@" alt="Save" class="button">Save</a>
+              <a href="@items.save_url@" alt="Save" class="button">#news-aggregator.Save#</a>
             </if>
             <if @items.unsave_url@ not nil>
-             <a href="@items.unsave_url@" alt="Unsave" class="button">Unsave</a>
+             <a href="@items.unsave_url@" alt="Unsave" class="button">#news-aggregator.Unsave#</a>
             </if>
             </if>
             <if @blog_p@ true>
-              <a href="@items.item_blog_url@" alt="Post this item to your Weblog" class="button">Blog</a>
+              <a href="@items.item_blog_url@" alt="Post this item to your Weblog" class="button">#news-aggregator.Blog#</a>
             </if>
           </div>
         </else>
     </group>
-  </multiple>
\ No newline at end of file
+  </multiple>
Index: openacs-4/packages/news-aggregator/www/subscriptions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/subscriptions.adp,v
diff -u -r1.5.2.2 -r1.5.2.3
--- openacs-4/packages/news-aggregator/www/subscriptions.adp	4 Jan 2006 05:28:09 -0000	1.5.2.2
+++ openacs-4/packages/news-aggregator/www/subscriptions.adp	20 Nov 2006 19:41:18 -0000	1.5.2.3
@@ -4,20 +4,17 @@
   <property name="context">@context@</property>
   
   <include src="aggregator-tabs" tab="subscriptions">
-  <p>
-    Enter the URL of an XML news feed you want to subscribe to or choose a feed the system already knows about and then click on the Add button.
-  </p>
+  <p>#news-aggregator.Enter_the_URL_of_an_XML_news_feed#</p>
 
   <formtemplate id=add_subscription></formtemplate>
 
   <if @sources:rowcount@ >
     <p>
-      The following table lists the XML news feeds you've subscribed to. 
-      To delete a subscription, check it and then click on the Unsubscribe button 
-      at the bottom of the page.
+      #news-aggregator.lt_The_following_table_l#
     </p>
   </if>
 
   <p>
     <listtemplate name="sources"></listtemplate>
   </p>
+
Index: openacs-4/packages/news-aggregator/www/subscriptions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/subscriptions.tcl,v
diff -u -r1.7.2.7 -r1.7.2.8
--- openacs-4/packages/news-aggregator/www/subscriptions.tcl	27 Jul 2006 11:39:13 -0000	1.7.2.7
+++ openacs-4/packages/news-aggregator/www/subscriptions.tcl	20 Nov 2006 19:41:18 -0000	1.7.2.8
@@ -15,7 +15,7 @@
     -object_id $aggregator_id \
     -privilege write
 
-set page_title "Manage Subscriptions"
+set page_title "[_ news-aggregator.Manage_Subscriptions]"
 array set ag_info [news_aggregator::aggregator::aggregator_info -aggregator_id $aggregator_id]
 set context [list [list "." "$ag_info(aggregator_name)"] "$page_title"]
 
@@ -45,9 +45,9 @@
 	incr delete_count
     }
     if { $delete_count > 1 } {
-	set message "You have been unsubscribed from $delete_count sources."
+	set message "[_ news-aggregator.You_have_been_unsubscribed_from]"
     } else {
-	set message "You have been unsubscribed from one source."
+	set message "[_ news-aggregator.You_have_been_unsubscribed]"
     }
     ad_returnredirect -message $message subscriptions
     ad_script_abort
@@ -60,7 +60,7 @@
 }
 
 set bulk_actions {
-    Unsubscribe subscriptions Unsubscribe
+    #news-aggregator.Unsubscribe# subscriptions #news-aggregator.Unsubscribe#
 }
 
 if { $aggregator_count > 1 } {
@@ -71,8 +71,8 @@
         set title [db_string select_name {}]
     }
     lappend bulk_actions \
-        Copy subscription-copy "Copy selected subscriptions to $title" \
-        Move subscription-move "Move selected subscriptions to $title"
+        \#news-aggregator.Copy\# Copy subscription-copy "\#news-aggregator.Copy_Selected\#" \
+        \#news-aggregator.Move\# subscription-move "\#news-aggregator.Move_Selected\#"
 
 }
 
@@ -82,31 +82,30 @@
     -key source_id \
     -row_pretty_plural "subscriptions" \
     -actions {
-       "Export Subscriptions" "opml" "Export your subscriptions as an OPML file"
+       "\#news-aggregator.Export_Subscriptions\#" "opml" "\#news-aggregator.Export_your_subscriptions_as_an_OPML_file\#"
     } -bulk_actions $bulk_actions -elements {
         title {
-            label "Name"
+            label "\#news-aggregator.Name\#"
             link_url_eval $link
         }
         last_scanned {
-            label "Last Scan"
+            label "\#news-aggregator.Last_Scan\#"
         }
 	last_modified {
-	    label "Last Update"
+	    label "\#news-aggregator.Last_Update\#"
 	}
 	show_description_p {
-	    label "Titles Only?"
+	    label "\#news-aggregator.Titles_Only\#"
 	    display_template {
-		<center><if @sources.show_description_p@ true>No</if><else>Yes</else> <a href="@sources.toggle_show_desc_url@" title="toggle" class="button">toggle</a></center>
+		<center><if @sources.show_description_p@ true>\#news-aggregator.No\#</if><else>\#news-aggregator.Yes\#</else> <a href="@sources.toggle_show_desc_url@" title="toggle" class="button">toggle</a></center>
 	    }
 	}
         feed_url {
-            label "Source"
+            label "\#news-aggregator.Source\#"
             display_template {
-                <a href="@sources.feed_url@" title="View the XML 
-                source for this subscriptions."
+                <a href="@sources.feed_url@" title="\#news-aggregator.View_the_XML\#"
                 ><img src="@sources.xml_graphics_url@" height="14" width="36" 
-                alt="View the XML source for this subscription" border="0"></a>
+                alt="\#news-aggregator.View_the_XML\#" border="0"></a>
             }
         }
     } -orderby {
@@ -145,21 +144,21 @@
     lappend other_feeds [list $title $source_id]
 }
 
-ad_form -name add_subscription -action subscriptions -form {
+ad_form -name add_subscription -form {
     {subscription_id:integer(hidden),key}
     {aggregator_id:integer(hidden) {value $aggregator_id}}
     {feed_url:text(text),optional
         {value $feed_url_val} 
-        {label "URL"}
+        {label "#news-aggregator.URL#"}
 	{value "http://"}
         {html {size 55}}
     }
     {new_source_id:integer(select),optional
-	{label "Feed"}
+	{label "\#news-aggregator.Feed\#"}
 	{options $other_feeds}
     }
     {add_submit:text(submit),optional
-        {label "Add"}
+        {label "[_ news-aggregator.Add]"}
     }
 } -validate {
     {feed_url