Part 2 of Bug 461711: rebrand "RSS News & Blogs" to "Blogs & News Feeds". r=philor, sr=neil

mail/base/content/defaultClientDialog.xul

@@ -60,7 +60,7 @@
   <listbox rows="3" seltype="single" id="defaultClientList">   
     <listitem id="checkMail" type="checkbox" label="&email.label;"/>
     <listitem id="checkNews" type="checkbox" label="&newsgroups.label;"/>
-    <listitem id="checkRSS"  type="checkbox" label="&rss.label;"/>    
+    <listitem id="checkRSS"  type="checkbox" label="&feeds.label;"/>
   </listbox>
 
   <separator class="thin"/>

mail/locales/en-US/chrome/messenger/defaultClientDialog.dtd

@@ -3,7 +3,7 @@
 
 <!ENTITY email.label "E-Mail">
 <!ENTITY newsgroups.label "Newsgroups">
-<!ENTITY rss.label "RSS Feeds">
+<!ENTITY feeds.label "Feeds">
 
 <!ENTITY checkOnStartup.label "Always perform this check when starting &brandShortName;">
 <!ENTITY checkOnStartup.accesskey "A">

mail/locales/en-US/chrome/messenger/msgAccountCentral.dtd

@@ -16,5 +16,5 @@
 <!ENTITY junkSettings.label           "Junk mail settings">
 <!ENTITY offlineLink.label            "Offline settings">
 
-<!ENTITY rssSectionHdr.label          "RSS News &amp; Blogs"> 
-<!ENTITY subscibeRSS.label            "Manage subscriptions">
+<!ENTITY feedsSectionHdr.label        "Feeds">
+<!ENTITY subscribeFeeds.label         "Manage subscriptions">

mailnews/base/resources/content/msgAccountCentral.xul

@@ -122,13 +122,15 @@
 
       <row id="rssHeader" class="acctCentralTitleRow">
         <hbox class="acctCentralRowTitleBox">
-          <description>&rssSectionHdr.label;</description> 
+          <description>&feedsSectionHdr.label;</description>
         </hbox>
       </row>
       <separator id="rssHeader.separator" class="thin"/>
       <row id="SubscribeRSS" class="acctCentralRow">
-        <hbox> 
-          <label class="acctCentralText acctCentralLinkText" value="&subscibeRSS.label;" chromedir="&locale.dir;" onclick="Subscribe();"/> 
+        <hbox>
+          <label class="acctCentralText acctCentralLinkText"
+                 value="&subscribeFeeds.label;"
+                 chromedir="&locale.dir;" onclick="Subscribe();"/>
         </hbox> 
       </row>
       <separator id="SubscribeRSS.separator" class="thin"/>

mailnews/base/resources/content/start.xhtml

@@ -63,7 +63,7 @@
 <ul>
   <li>&feat_multiacc.label;</li>
   <li>&feat_junk.label;</li>
-  <li>&feat_rss.label;</li>
+  <li>&feat_feeds.label;</li>
   <li>&feat_filters.label;</li>
   <li>&feat_htmlmsg.label;</li>
   <li>&feat_abook.label;</li>

suite/common/defaultClientDialog.xul

@@ -63,7 +63,7 @@
     <listitem value="BROWSER" type="checkbox" label="&browser.label;"/>
     <listitem value="MAIL" type="checkbox" label="&email.label;"/>
     <listitem value="NEWS" type="checkbox" label="&newsgroups.label;"/>
-    <listitem value="RSS" type="checkbox" label="&rss.label;"/>
+    <listitem value="RSS" type="checkbox" label="&feeds.label;"/>
   </listbox>
 
   <separator class="thin"/>

suite/locales/en-US/chrome/common/defaultClientDialog.dtd

@@ -4,7 +4,7 @@
 <!ENTITY browser.label "Browser">
 <!ENTITY email.label "E-Mail">
 <!ENTITY newsgroups.label "Newsgroups">
-<!ENTITY rss.label "RSS Feeds">
+<!ENTITY feeds.label "Feeds">
 
 <!ENTITY checkOnStartup.label "Always perform this check when starting &brandShortName;">
 <!ENTITY checkOnStartup.accesskey "A">

suite/locales/en-US/chrome/mailnews/msgAccountCentral.dtd

@@ -55,6 +55,6 @@
 <!ENTITY junkSettings.label           "Junk mail settings">
 <!ENTITY offlineLink.label            "Offline settings">
 
-<!ENTITY rssSectionHdr.label          "RSS News &amp; Blogs"> 
-<!ENTITY subscibeRSS.label            "Manage subscriptions"> 
+<!ENTITY feedsSectionHdr.label        "Feeds">
+<!ENTITY subscribeFeeds.label         "Manage subscriptions">
 

suite/locales/en-US/chrome/mailnews/newsblog/am-newsblog.dtd

@@ -1,4 +1,4 @@
-<!ENTITY newsblogTitle.label "RSS Account Settings">
+<!ENTITY accountTitle.label "Account Settings">
 
 <!ENTITY biffStart.label "Check for new articles every ">
 <!ENTITY biffStart.accesskey "k">
@@ -13,8 +13,8 @@
 <!ENTITY manageSubscriptions.label "Manage Subscriptions…"> 
 <!ENTITY manageSubscriptions.accesskey "M">
 
-<!-- entities from defaults/isp/rss.rdf -->
-<!ENTITY rss.accountName            "News &amp; Blogs">
-<!ENTITY rss.wizardShortName        "RSS">  
-<!ENTITY rss.wizardLongName         "RSS News &amp; Blogs">
-<!ENTITY rss.wizardLongName.accesskey "R">
+<!-- entities from rss.rdf -->
+<!ENTITY feeds.accountName "Blogs &amp; News Feeds">
+<!ENTITY feeds.wizardShortName "Feeds">
+<!ENTITY feeds.wizardLongName "Blogs &amp; News Feeds">
+<!ENTITY feeds.wizardLongName.accesskey "F">

suite/locales/en-US/chrome/mailnews/start.dtd

@@ -45,7 +45,7 @@ client, supporting advanced junk mail detection and other useful features.">
 <!ENTITY features.title "Features">
 <!ENTITY feat_multiacc.label "Support for multiple accounts">
 <!ENTITY feat_junk.label "Junk Mail detection">
-<!ENTITY feat_rss.label "RSS Reader">
+<!ENTITY feat_feeds.label "Feed Reader">
 <!ENTITY feat_filters.label "Message Filters">
 <!ENTITY feat_htmlmsg.label "HTML message support">
 <!ENTITY feat_abook.label "Address Book">