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.8 -r1.7.2.9
--- openacs-4/packages/news-aggregator/www/subscriptions.tcl	20 Nov 2006 19:41:18 -0000	1.7.2.8
+++ openacs-4/packages/news-aggregator/www/subscriptions.tcl	22 Nov 2006 10:03:23 -0000	1.7.2.9
@@ -15,7 +15,7 @@
     -object_id $aggregator_id \
     -privilege write
 
-set page_title "[_ news-aggregator.Manage_Subscriptions]"
+set page_title "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 "[_ news-aggregator.You_have_been_unsubscribed_from]"
+	set message "You have been unsubscribed from $delete_count sources."
     } else {
-	set message "[_ news-aggregator.You_have_been_unsubscribed]"
+	set message "You have been unsubscribed from one source."
     }
     ad_returnredirect -message $message subscriptions
     ad_script_abort
@@ -60,7 +60,7 @@
 }
 
 set bulk_actions {
-    #news-aggregator.Unsubscribe# subscriptions #news-aggregator.Unsubscribe#
+    Unsubscribe subscriptions Unsubscribe
 }
 
 if { $aggregator_count > 1 } {
@@ -71,8 +71,8 @@
         set title [db_string select_name {}]
     }
     lappend bulk_actions \
-        \#news-aggregator.Copy\# Copy subscription-copy "\#news-aggregator.Copy_Selected\#" \
-        \#news-aggregator.Move\# subscription-move "\#news-aggregator.Move_Selected\#"
+        Copy subscription-copy "Copy selected subscriptions to $title" \
+        Move subscription-move "Move selected subscriptions to $title"
 
 }
 
@@ -82,30 +82,31 @@
     -key source_id \
     -row_pretty_plural "subscriptions" \
     -actions {
-       "\#news-aggregator.Export_Subscriptions\#" "opml" "\#news-aggregator.Export_your_subscriptions_as_an_OPML_file\#"
+       "Export Subscriptions" "opml" "Export your subscriptions as an OPML file"
     } -bulk_actions $bulk_actions -elements {
         title {
-            label "\#news-aggregator.Name\#"
+            label "Name"
             link_url_eval $link
         }
         last_scanned {
-            label "\#news-aggregator.Last_Scan\#"
+            label "Last Scan"
         }
 	last_modified {
-	    label "\#news-aggregator.Last_Update\#"
+	    label "Last Update"
 	}
 	show_description_p {
-	    label "\#news-aggregator.Titles_Only\#"
+	    label "Titles Only?"
 	    display_template {
-		<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>
+		<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>
 	    }
 	}
         feed_url {
-            label "\#news-aggregator.Source\#"
+            label "Source"
             display_template {
-                <a href="@sources.feed_url@" title="\#news-aggregator.View_the_XML\#"
+                <a href="@sources.feed_url@" title="View the XML 
+                source for this subscriptions."
                 ><img src="@sources.xml_graphics_url@" height="14" width="36" 
-                alt="\#news-aggregator.View_the_XML\#" border="0"></a>
+                alt="View the XML source for this subscription" border="0"></a>
             }
         }
     } -orderby {
@@ -144,21 +145,21 @@
     lappend other_feeds [list $title $source_id]
 }
 
-ad_form -name add_subscription -form {
+ad_form -name add_subscription -action subscriptions -form {
     {subscription_id:integer(hidden),key}
     {aggregator_id:integer(hidden) {value $aggregator_id}}
     {feed_url:text(text),optional
         {value $feed_url_val} 
-        {label "#news-aggregator.URL#"}
+        {label "URL"}
 	{value "http://"}
         {html {size 55}}
     }
     {new_source_id:integer(select),optional
-	{label "\#news-aggregator.Feed\#"}
+	{label "Feed"}
 	{options $other_feeds}
     }
     {add_submit:text(submit),optional
-        {label "[_ news-aggregator.Add]"}
+        {label "Add"}
     }
 } -validate {
     {feed_url