Bug 603717 - Change "Loading..." to "Connecting..." for initial state for tabs r=beltzner a=blocking-beta7
authorMargaret Leibovic <margaret.leibovic@gmail.com>
Tue, 12 Oct 2010 14:25:17 -0700
changeset 55383 26b5a5c0075e5bf2e28a9bbeecaaaf236e8c8c90
parent 55382 e149f78d512022a8649a647df4b616531ef8f68b
child 55384 7819e11aa46fc371fddd653fcf8a5a29133a731a
push idunknown
push userunknown
push dateunknown
reviewersbeltzner, blocking-beta7
bugs603717
milestone2.0b8pre
Bug 603717 - Change "Loading..." to "Connecting..." for initial state for tabs r=beltzner a=blocking-beta7
browser/base/content/tabbrowser.xml
browser/components/sessionstore/src/nsSessionStore.js
browser/locales/en-US/chrome/browser/tabbrowser.properties
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -459,17 +459,17 @@
                 this.mTab.removeAttribute("progress");
 
                 var location = aRequest.QueryInterface(nsIChannel).URI;
 
                 // For keyword URIs clear the user typed value since they will be changed into real URIs
                 if (location.scheme == "keyword")
                   this.mBrowser.userTypedValue = null;
 
-                if (this.mTab.label == this.mTabBrowser.mStringBundle.getString("tabs.loading"))
+                if (this.mTab.label == this.mTabBrowser.mStringBundle.getString("tabs.connecting"))
                   this.mTabBrowser.setTabTitle(this.mTab);
 
                 if (this.mTab.selected)
                   this.mTabBrowser.mIsBusy = false;
               }
 
               if (oldBlank) {
                 this._callProgressListeners("onUpdateCurrentBrowser",
@@ -869,17 +869,17 @@
           aTab.dispatchEvent(event);
         ]]></body>
       </method>
 
       <method name="setTabTitleLoading">
         <parameter name="aTab"/>
         <body>
           <![CDATA[
-            aTab.label = this.mStringBundle.getString("tabs.loading");
+            aTab.label = this.mStringBundle.getString("tabs.connecting");
             aTab.crop = "end";
             this._tabAttrModified(aTab);
           ]]>
         </body>
       </method>
 
       <method name="setTabTitle">
         <parameter name="aTab"/>
--- a/browser/components/sessionstore/src/nsSessionStore.js
+++ b/browser/components/sessionstore/src/nsSessionStore.js
@@ -3510,17 +3510,17 @@ SessionStoreService.prototype = {
    * Replace "Loading..." with the tab label (with minimal side-effects)
    * @param aString is the string the title is stored in
    * @param aTabbrowser is a tabbrowser object, containing aTab
    * @param aTab is the tab whose title we're updating & using
    *
    * @returns aString that has been updated with the new title
    */
   _replaceLoadingTitle : function sss_replaceLoadingTitle(aString, aTabbrowser, aTab) {
-    if (aString == aTabbrowser.mStringBundle.getString("tabs.loading")) {
+    if (aString == aTabbrowser.mStringBundle.getString("tabs.connecting")) {
       aTabbrowser.setTabTitle(aTab);
       [aString, aTab.label] = [aTab.label, aString];
     }
     return aString;
   },
 
   /**
    * Resize this._closedWindows to the value of the pref, except in the case
--- a/browser/locales/en-US/chrome/browser/tabbrowser.properties
+++ b/browser/locales/en-US/chrome/browser/tabbrowser.properties
@@ -1,8 +1,22 @@
+# LOCALIZATION NOTE: the following strings can be used in the tab title or
+# location bar to represent various states as a web page loads:
+# tabs.connecting = Firefox is sending a HTTP connection request
+# tabs.encryptingConnection = Firefox is sending a HTTPS connection request
+# tabs.searching = Firefox is searching for something (Awesomebar or Web search)
+# tabs.loading = Firefox is loading the web page
+# tabs.waiting = Firefox is waiting for a web resource to load
+# tabs.downloading = Firefox is downloading a file for a helper application (PDF)
+tabs.connecting=Connecting…
+tabs.encryptingConnection=Securing connection…
+tabs.searching=Searching…
 tabs.loading=Loading…
+tabs.waiting=Waiting…
+tabs.downloading=Downloading…
+
 tabs.emptyTabTitle=New Tab
 tabs.closeTab=Close Tab
 tabs.close=Close
 tabs.closeWarningTitle=Confirm close
 tabs.closeWarningMultipleTabs=You are about to close %S tabs. Are you sure you want to continue?
 tabs.closeButtonMultiple=Close tabs
 tabs.closeWarningPromptMe=Warn me when I attempt to close multiple tabs