Bug 545217 rename "Smart folders" to "Unified folders", r=bwinton
authorBryan W Clark <clarkbw@gnome.org>
Tue, 16 Mar 2010 19:46:44 +0000
changeset 5185 8f5d55d3a28586201005a7afabc8c0e2e59a082f
parent 5184 ee076bd6178473660e6ba39e8eaee73773759ce4
child 5186 d7c84d29a71a4f62ce5a1e1bb6d4477b9615c930
push id4001
push userbugzilla@standard8.plus.com
push dateTue, 16 Mar 2010 19:47:52 +0000
treeherdercomm-central@d7c84d29a71a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbwinton
bugs545217
Bug 545217 rename "Smart folders" to "Unified folders", r=bwinton
mail/base/content/featureConfigurator.xhtml
mail/base/content/folderPane.js
mail/base/content/mailWindowOverlay.xul
mail/locales/en-US/chrome/messenger/featureConfigurator.dtd
mail/locales/en-US/chrome/messenger/messenger.dtd
mail/locales/en-US/chrome/messenger/messenger.properties
--- a/mail/base/content/featureConfigurator.xhtml
+++ b/mail/base/content/featureConfigurator.xhtml
@@ -120,34 +120,34 @@
         <div class="sync_button pro">
           <span class="button" id="useNewToolbar" tabindex="0">&featureConfigurator.useNewToolbar.button;</span>
         </div>
         <div class="sync_button pro">
           <span class="button" id="useOriginalToolbar" tabindex="0">&featureConfigurator.useOriginalToolbar.button;</span>
         </div>
       </div>
     </div>
-    <h2 class="withstatus">&featureConfigurator.smartFolders.heading;</h2>
+    <h2 class="withstatus">&featureConfigurator.unifiedFolders.heading;</h2>
     <div id="foldermode_status" class="status">
-      <span id="using-smart-folders" class="status">&featureConfigurator.smartFolders.smart.status;</span>
-      <span id="using-all-folders" class="status">&featureConfigurator.smartFolders.all.status;</span>
+      <span id="using-smart-folders" class="status">&featureConfigurator.unifiedFolders.smart.status;</span>
+      <span id="using-all-folders" class="status">&featureConfigurator.unifiedFolders.all.status;</span>
     </div>
     <div class="feature">
       <div class="row">
         <p class="explanation pro"><div class="benefits">&featureConfigurator.benefits.label;</div>
-          &featureConfigurator.smartFolderBenefits.para;
+          &featureConfigurator.unifiedFolderBenefits.para;
         </p>
         <p class="explanation con">
           <div class="disadvantage">&featureConfigurator.alternative.label;</div>
-          &featureConfigurator.smartFolderAlternative.para;
+          &featureConfigurator.unifiedFolderAlternative.para;
         </p>
       </div>
       <div class="row">
         <div class="sync_button pro">
-          <span class="button" id="useSmartFolders" tabindex="0">&featureConfigurator.useSmartFolders.button;</span>
+          <span class="button" id="useSmartFolders" tabindex="0">&featureConfigurator.useUnifiedFolders.button;</span>
         </div>
         <div class="sync_button pro">
           <span class="button" id="useAllFolders" tabindex="0">&featureConfigurator.useAllFolders.button;</span>
         </div>
       </div>
     </div>
     <h2>&featureConfigurator.collapsedHeaders.heading;</h2>
     <div class="feature">
--- a/mail/base/content/folderPane.js
+++ b/mail/base/content/folderPane.js
@@ -137,17 +137,17 @@ let gFolderTreeView = {
    * folder-pane to the view last shown before the application was closed.
    */
   load: function ftv_load(aTree, aJSONFile) {
     const Cc = Components.classes;
     const Ci = Components.interfaces;
     this._treeElement = aTree;
 
     let smartName = document.getElementById("bundle_messenger")
-                            .getString("folderPaneHeader_smart");
+                            .getString("folderPaneModeHeader_smart");
 
     // the folder pane can be used for other trees which may not have these elements.
     if (document.getElementById("folderpane_splitter"))
       document.getElementById("folderpane_splitter").collapsed = false;
     if (document.getElementById("folderPaneBox"))
       document.getElementById("folderPaneBox").collapsed = false;
 
     try {
@@ -164,17 +164,17 @@ let gFolderTreeView = {
       // This is ok.  If we've already migrated we'll end up here
     }
 
     if (document.getElementById('folderpane-title')) {
       let string;
         if (this._mode in this._modeDisplayNames)
           string = this._modeDisplayNames;
         else {
-          let key = "folderPaneHeader_" + this.mode;
+          let key = "folderPaneModeHeader_" + this.mode;
           string = document.getElementById("bundle_messenger").getString(key);
         }
       document.getElementById('folderpane-title').value = string;
     }
 
     if (aJSONFile) {
       // Parse our persistent-open-state json file
       let file = Cc["@mozilla.org/file/directory_service;1"]
@@ -326,17 +326,17 @@ let gFolderTreeView = {
   },
   set mode(aMode) {
     this._mode = aMode;
 
     let string;
     if (this._mode in this._modeDisplayNames)
       string = this._modeDisplayNames[this._mode];
     else {
-      let key = "folderPaneHeader_" + aMode;
+      let key = "folderPaneModeHeader_" + aMode;
       string = document.getElementById("bundle_messenger").getString(key);
     }
     document.getElementById('folderpane-title').value = string;
 
     this._treeElement.setAttribute("mode", aMode);
     this._rebuild();
   },
 
@@ -1441,17 +1441,17 @@ let gFolderTreeView = {
 
       generateMap: function ftv_smart_generateMap(ftv) {
         let map = [];
         let acctMgr = Components.classes["@mozilla.org/messenger/account-manager;1"]
                                 .getService(Components.interfaces.nsIMsgAccountManager);
         let accounts = gFolderTreeView._sortedAccounts();
         let smartServer = this._smartServer;
         smartServer.prettyName = document.getElementById("bundle_messenger")
-                                         .getString("smartAccountName");
+                                         .getString("unifiedAccountName");
         smartServer.canHaveFilters = false;
 
         let smartRoot = smartServer.rootFolder;
         let smartChildren = [];
         for each (let [, [flag, name,]] in Iterator(this._flagNameList)) {
           gFolderTreeView._addSmartFoldersForFlag(smartChildren, accounts,
                                                   smartRoot, flag, name);
         }
--- a/mail/base/content/mailWindowOverlay.xul
+++ b/mail/base/content/mailWindowOverlay.xul
@@ -1103,18 +1103,18 @@
             <menuitem id="menu_showMessage" type="checkbox" label="&showMessageCmd.label;" key="key_toggleMessagePane"
                       accesskey="&showMessageCmd.accesskey;" command="cmd_toggleMessagePane"/>
           </menupopup>
         </menu>
         <menu id="menu_FolderViews" label="&folderView.label;" accesskey="&folderView.accesskey;">
           <menupopup id="menu_FolderViewsPopup"
                      onpopupshowing="InitViewFolderViewsMenu(event)">
             <menuitem id="menu_allFolders" value="smart"
-                      label="&smartFolders.label;"
-                      accesskey="&smartFolders.accesskey;"
+                      label="&unifiedFolders.label;"
+                      accesskey="&unifiedFolders.accesskey;"
                       type="radio" name="viewmessages"
                       oncommand="gFolderTreeView.mode = this.value;"/>
             <menuitem id="menu_allFolders" value="all"
                       label="&allFolders.label;"
                       accesskey="&allFolders.accesskey;"
                       type="radio" name="viewmessages"
                       oncommand="gFolderTreeView.mode = this.value;"/>
             <menuitem id="menu_unreadFolders"
--- a/mail/locales/en-US/chrome/messenger/featureConfigurator.dtd
+++ b/mail/locales/en-US/chrome/messenger/featureConfigurator.dtd
@@ -68,35 +68,35 @@ choice of lower case is intentional, but
 sense because of a specific language context.-->
 <!ENTITY featureConfigurator.useOriginalToolbar.button "use original toolbar">
 
 <!-- LOCALIZATION NOTE (featureConfigurator.useNewToolbar.button): The
 choice of lower case is intentional, but may be overriden if that doesn't make
 sense because of a specific language context.-->
 <!ENTITY featureConfigurator.useNewToolbar.button "use new toolbar">
 
-<!-- LOCALIZATION NOTE (featureConfigurator.smartFolders.heading): The
+<!-- LOCALIZATION NOTE (featureConfigurator.unifiedFolders.heading): The
 words here should echo the name of the mode shown in the folder pane.-->
-<!ENTITY featureConfigurator.smartFolders.heading "Smart folders mode">
+<!ENTITY featureConfigurator.unifiedFolders.heading "Unified Folders mode">
 
-<!-- LOCALIZATION NOTE (featureConfigurator.smartFolders.smart.status): This
-shows that the current mode in the folder pane is the Smart Folders mode.-->
-<!ENTITY featureConfigurator.smartFolders.smart.status "Using the &quot;smart folders&quot; mode.">
+<!-- LOCALIZATION NOTE (featureConfigurator.unifiedFolders.smart.status): This
+shows that the current mode in the folder pane is the Unified Folders mode.-->
+<!ENTITY featureConfigurator.unifiedFolders.smart.status "Using the &quot;unified folders&quot; mode.">
 
-<!-- LOCALIZATION NOTE (featureConfigurator.smartFolders.all.status): This
-shows that the current mode in the folder pane is not the Smart Folders mode.-->
-<!ENTITY featureConfigurator.smartFolders.all.status "Not using the &quot;smart folders&quot; mode.">
+<!-- LOCALIZATION NOTE (featureConfigurator.unifiedFolders.all.status): This
+shows that the current mode in the folder pane is not the Unified Folders mode.-->
+<!ENTITY featureConfigurator.unifiedFolders.all.status "Not using the &quot;unified folders&quot; mode.">
 
-<!ENTITY featureConfigurator.smartFolderBenefits.para "For users with several accounts, this view groups folders like Inbox together, so you get a consolidated view of all your mail.">
-<!ENTITY featureConfigurator.smartFolderAlternative.para "If you like splitting information across accounts then you'll prefer the &quot;All Folders&quot; mode.">
+<!ENTITY featureConfigurator.unifiedFolderBenefits.para "For users with several accounts, this view groups folders like Inbox together, so you get a consolidated view of all your mail.">
+<!ENTITY featureConfigurator.unifiedFolderAlternative.para "If you like splitting information across accounts then you'll prefer the &quot;All Folders&quot; mode.">
 
-<!-- LOCALIZATION NOTE (featureConfigurator.useSmartFolders.button): The
+<!-- LOCALIZATION NOTE (featureConfigurator.useUnifiedFolders.button): The
 choice of lower case is intentional, but may be overriden if that doesn't make
 sense because of a specific language context.-->
-<!ENTITY featureConfigurator.useSmartFolders.button "use &quot;smart folders&quot; mode">
+<!ENTITY featureConfigurator.useUnifiedFolders.button "use &quot;unified folders&quot; mode">
 
 <!-- LOCALIZATION NOTE (featureConfigurator.useAllFolders.button): The
 choice of lower case is intentional, but may be overriden if that doesn't make
 sense because of a specific language context.-->
 <!ENTITY featureConfigurator.useAllFolders.button "use &quot;all folders&quot; mode">
 
 <!ENTITY featureConfigurator.collapsedHeaders.heading "Collapsed headers">
 
--- a/mail/locales/en-US/chrome/messenger/messenger.dtd
+++ b/mail/locales/en-US/chrome/messenger/messenger.dtd
@@ -127,18 +127,18 @@
 <!ENTITY messagePaneWide.accesskey "W">
 <!ENTITY messagePaneVertical.label "Vertical View">
 <!ENTITY messagePaneVertical.accesskey "V">
 <!ENTITY showMessageCmd.label "Message Pane">
 <!ENTITY showMessageCmd.accesskey "M">
 
 <!ENTITY folderView.label "Folders">
 <!ENTITY folderView.accesskey "F">
-<!ENTITY smartFolders.label "Smart">
-<!ENTITY smartFolders.accesskey "S">
+<!ENTITY unifiedFolders.label "Unified">
+<!ENTITY unifiedFolders.accesskey "n">
 <!ENTITY allFolders.label "All">
 <!ENTITY allFolders.accesskey "A">
 <!ENTITY unreadFolders.label "Unread">
 <!ENTITY unreadFolders.accesskey "U">
 <!ENTITY favoriteFolders.label "Favorite">
 <!ENTITY favoriteFolders.accesskey "F">
 <!ENTITY recentFolders.label "Recent">
 <!ENTITY recentFolders.accesskey "R">
--- a/mail/locales/en-US/chrome/messenger/messenger.properties
+++ b/mail/locales/en-US/chrome/messenger/messenger.properties
@@ -434,22 +434,22 @@ updatesItem_downloading.accesskey=D
 updatesItem_resume=Resume Downloading %S…
 updatesItem_resumeFallback=Resume Downloading Update…
 updatesItem_resume.accesskey=D
 updatesItem_pending=Apply Downloaded Update Now…
 updatesItem_pendingFallback=Apply Downloaded Update Now…
 updatesItem_pending.accesskey=D
 
 # Folder Pane Header Title Strings
-folderPaneHeader_all=All Folders
-folderPaneHeader_unread=Unread Folders
-folderPaneHeader_favorite=Favorite Folders
-folderPaneHeader_recent=Recent Folders
-folderPaneHeader_smart=Smart Folders
-smartAccountName=Smart Folders
+folderPaneModeHeader_all=All Folders
+folderPaneModeHeader_unread=Unread Folders
+folderPaneModeHeader_favorite=Favorite Folders
+folderPaneModeHeader_recent=Recent Folders
+folderPaneModeHeader_smart=Unified Folders
+unifiedAccountName=Unified Folders
 
 # Copy / Move to Folder Again
 #LOCALIZATION NOTE %1$S is the name of the folder we will move to. moveToFolderAgainAccessKey
 # should have the same value as copyToFolderAgainAccessKey as they are the same menu item in the UI
 # moveToFolderAgainAccessKey should also be a letter that occurs before %1$S
 moveToFolderAgain=Move to "%1$S" Again
 moveToFolderAgainAccessKey=t
 #LOCALIZATION NOTE %1$S is the name of the folder we will copy to