Bug 346795 wording of text in automatic updates dialog after new update has been downloaded, patch by beltzner, r=mconnor

toolkit/locales/en-US/chrome/mozapps/update/updates.dtd

@@ -57,17 +57,16 @@
                                            &brandShortName; will try again by downloading a complete Update.">
 
 <!ENTITY  finished.title                  "Update Downloaded">
-<!ENTITY  finished.intro                  "The update was successfully downloaded and verified. You must now restart 
-                                           &brandShortName; so that the update can be installed.">
+<!ENTITY  finished.text                   "The update was successfully downloaded and verified, and will be installed
+                                           the next time &brandShortName; starts.">
 
 <!ENTITY  finishedBackground.title        "Update Ready to Install">
-<!ENTITY  finishedBackground.intro        "&brandShortName; has just completed downloading an important update 
-                                           and must now be restarted so that the update can be installed.">
+<!ENTITY  finishedBackground.text         "&brandShortName; has downloaded and verified an important update. 
+                                           Click the link below for more details.">
 <!ENTITY  finishedBackground.name         "Update:">
-<!ENTITY  finishedBackground.instruction1 "Click Restart &brandShortName; Now to close all &brandShortName; windows and install
-                                           the update.">
-<!ENTITY  finishedBackground.instruction2 "Click Later to continue without restarting. The update will be installed
-                                           the next time you start &brandShortName;.">
+<!ENTITY  finishedBackground.detail1      "Click Restart &brandShortName; Now to install the update now. 
+<!ENTITY  finishedBackground.detail2      "Click Later to close this dialog and continue browsing. &brandShortName;
+                                           will install the update the next time it starts.">
 
 <!ENTITY  installed.title                 "Update Installed">
 <!ENTITY  installed.intro                 "The update was successfully installed.">

toolkit/locales/en-US/chrome/mozapps/update/updates.properties

@@ -59,7 +59,7 @@ laterButton.accesskey=a
 neverButton=Never
 neverButton.accesskey=N
 restartLaterTitle=Software Update
-restartLaterMessage=The update you just downloaded will be installed the next time you start %S.
+restartLaterMsg=The update will be installed the next time %S starts.
 
 resumePausedAfterCloseTitle=Software Update
 resumePausedAfterCloseMessage=You have paused downloading this update. Do you want %S to download the update in the background while you continue to browse?

toolkit/mozapps/update/content/updates.js

@@ -1545,7 +1545,7 @@ var gFinishedPage = {
   onWizardCancel: function() {
     var ps = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
                        .getService(Components.interfaces.nsIPromptService);
-    var message = gUpdates.strings.getFormattedString("restartLaterMessage",
+    var message = gUpdates.strings.getFormattedString("restartLaterMsg",
       [gUpdates.brandName]);
     ps.alert(window, gUpdates.strings.getString("restartLaterTitle"), 
              message);

toolkit/mozapps/update/content/updates.xul

@@ -172,13 +172,13 @@
   <wizardpage id="finished" pageid="finished"
               label="&finished.title;" object="gFinishedPage"
               onpageshow="gFinishedPage.onPageShow();">
-    <label>&finished.intro;</label>
+    <label>&finished.text;</label>
   </wizardpage>
   
   <wizardpage id="finishedBackground" pageid="finishedBackground"
               label="&finishedBackground.title;" object="gFinishedPage"
               onpageshow="gFinishedPage.onPageShowBackground();">
-    <label>&finishedBackground.intro;</label>
+    <label>&finishedBackground.text;</label>
     <separator/>
     <hbox align="center">
       <label>&finishedBackground.name;</label>
@@ -186,9 +186,9 @@
       <label id="finishedBackgroundLink" class="text-link" value="&details.link;"/>
     </hbox>
     <spacer flex="1"/>
-    <label>&finishedBackground.instruction1;</label>
+    <label>&finishedBackground.detail1;</label>
     <separator class="thin"/>
-    <label>&finishedBackground.instruction2;</label>
+    <label>&finishedBackground.detail2;</label>
   </wizardpage>
   
   <wizardpage id="installed" pageid="installed"