Bug 1514772 - Add missing "restarting" panel to the update dialogs. r+a=jorgk
authorRichard Marti <richard.marti@gmail.com>
Tue, 18 Dec 2018 15:38:09 +0100
changeset 33040 6e4ca7bc98b5066178f61791e44d374484b6eedc
parent 33039 1f0cb7f8dc0bf68efab5f02b3b77822210b73090
child 33041 ea62abed1629265310efdd303e24186a7239dbd0
push id2349
push usermozilla@jorgk.com
push dateThu, 20 Dec 2018 11:46:17 +0000
treeherdercomm-beta@ea62abed1629 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1514772
Bug 1514772 - Add missing "restarting" panel to the update dialogs. r+a=jorgk
mail/base/content/aboutDialog.xul
mail/components/preferences/advanced.inc.xul
mail/locales/en-US/chrome/messenger/aboutDialog.dtd
--- a/mail/base/content/aboutDialog.xul
+++ b/mail/base/content/aboutDialog.xul
@@ -98,16 +98,19 @@
                 <label>&update.otherInstanceHandlingUpdates;</label>
               </hbox>
               <hbox id="manualUpdate" align="center">
                 <label>&update.manual.start;</label><label id="manualLink" class="text-link">&update.manual.linkText;</label><label>&update.manual.end;</label>
               </hbox>
               <hbox id="unsupportedSystem" align="center">
                 <label>&update.unsupported.start;</label><label id="unsupportedLink" class="text-link">&update.unsupported.linkText;</label><label>&update.unsupported.end;</label>
               </hbox>
+              <hbox id="restarting" align="center">
+                <image class="update-throbber"/><label>&update.restarting;</label>
+              </hbox>
             </deck>
 #endif
           </vbox>
 
 #ifdef MOZ_UPDATER
           <description class="text-blurb" id="currentChannelText">
             &channel.description.start;<label id="currentChannel"/>&channel.description.end;
           </description>
--- a/mail/components/preferences/advanced.inc.xul
+++ b/mail/components/preferences/advanced.inc.xul
@@ -457,16 +457,19 @@
                   <spacer flex="1"/>
                   <button label="&update.checkForUpdatesButton.label;"
                           accesskey="&update.checkForUpdatesButton.accesskey;"
                           disabled="true"/>
                 </hbox>
                 <hbox id="unsupportedSystem" align="center">
                   <label>&update.unsupported.start;</label><label id="unsupportedLink" class="text-link">&update.unsupported.linkText;</label><label>&update.unsupported.end;</label>
                 </hbox>
+                <hbox id="restarting" align="center">
+                  <image class="update-throbber"/><label>&update.restarting;</label>
+                </hbox>
               </deck>
             </vbox>
             <separator/>
             <radiogroup id="updateRadioGroup"
                         align="start">
               <radio id="autoDesktop"
                      value="true"
                      label="&updateAuto.label;"
--- a/mail/locales/en-US/chrome/messenger/aboutDialog.dtd
+++ b/mail/locales/en-US/chrome/messenger/aboutDialog.dtd
@@ -96,16 +96,17 @@
      update.downloading.end all go into one line, with the amount downloaded inserted in between. As this
      is all in one line, try to make the localized text short (see bug 596813 for screenshots). The — is
      the "em dash" (long dash).
      example: Downloading update — 111 KB of 13 MB -->
 <!ENTITY update.downloading.start   "Downloading update — ">
 <!ENTITY update.downloading.end     "">
 
 <!ENTITY update.applying            "Applying update…">
+<!ENTITY update.restarting          "Restarting…">
 
 <!-- LOCALIZATION NOTE (channel.description.start,channel.description.end): channel.description.start and
      channel.description.end create one sentence, with the current channel label inserted in between.
      example: You are currently on the _Stable_ update channel. -->
 <!ENTITY channel.description.start  "You are currently on the ">
 <!ENTITY channel.description.end    " update channel. ">
 
 <!ENTITY cmdCloseMac.commandKey "w">