Backed out changeset c672c4cd6c7f (bug 928201) for mochitest-mc purply-bustage, rs=bustage on a CLOSED TREE

browser/metro/base/content/downloads.js

@@ -254,7 +254,7 @@ var MetroDownloadsView = {
                                .replace("#1", this._downloadCount)
     } else {
       let runButtonText =
-        Strings.browser.GetStringFromName("downloadOpen");
+        Strings.browser.GetStringFromName("downloadRun");
       message = Strings.browser.formatStringFromName("alertDownloadsDone2",
         [this._lastDownload.displayName], 1);
 
@@ -299,7 +299,7 @@ var MetroDownloadsView = {
     } else {
       title = Strings.browser.formatStringFromName("alertDownloadsDone",
         [this._lastDownload.displayName], 1);
-      msg = Strings.browser.GetStringFromName("downloadOpenNow");
+      msg = Strings.browser.GetStringFromName("downloadRunNow");
       observer = {
         observe: function (aSubject, aTopic, aData) {
           switch (aTopic) {

browser/metro/components/HelperAppDialog.js

@@ -68,7 +68,7 @@ HelperAppLauncherDialog.prototype = {
     let browserBundle = Services.strings.createBundle("chrome://browser/locale/browser.properties");
 
     let runButtonText =
-              browserBundle.GetStringFromName("downloadOpen");
+              browserBundle.GetStringFromName("downloadRun");
     let saveButtonText =
               browserBundle.GetStringFromName("downloadSave");
     let cancelButtonText =
@@ -105,7 +105,7 @@ HelperAppLauncherDialog.prototype = {
     let document = notificationBox.ownerDocument;
     downloadSize = this._getDownloadSize(aLauncher.contentLength);
 
-    let msg = browserBundle.GetStringFromName("alertDownloadSave2");
+    let msg = browserBundle.GetStringFromName("alertDownloadSave");
 
     let fragment =  ContentUtil.populateFragmentFromString(
                       document.createDocumentFragment(),

browser/metro/components/moz.build

@@ -13,15 +13,11 @@ MODULE = 'components'
 # metro/components.manifest
 EXTRA_COMPONENTS += [
     'AlertsService.js',
-    'BrowserStartup.js',
     'ContentDispatchChooser.js',
     'ContentPermissionPrompt.js',
-    'DirectoryProvider.js',
     'DownloadManagerUI.js',
-    'HelperAppDialog.js',
     'LoginManagerPrompter.js',
     'PromptService.js',
-    'Sidebar.js',
 ]
 
 if CONFIG['MOZ_SAFE_BROWSING']:
@@ -32,6 +28,10 @@ if CONFIG['MOZ_SAFE_BROWSING']:
 EXTRA_PP_COMPONENTS += [
     'AboutRedirector.js',
     'BrowserCLH.js',
+    'BrowserStartup.js',
     'components.manifest',
+    'DirectoryProvider.js',
+    'HelperAppDialog.js',
     'SessionStore.js',
+    'Sidebar.js',
 ]

browser/metro/locales/en-US/chrome/browser.properties

@@ -54,11 +54,11 @@ browserForOpenLocation=Open Location
 
 # Download Manager
 downloadsUnknownSize=Unknown size
-downloadOpen=Open
+downloadRun=Run
 downloadSave=Save
 downloadCancel=Cancel
 downloadTryAgain=Try Again
-downloadOpenNow=Open it now
+downloadRunNow=Run it now
 # LOCALIZATION NOTE (downloadShowInFiles): 'Files' refers to the Windows 8 file explorer
 downloadShowInFiles=Show in Files
 
@@ -74,8 +74,8 @@ alertDownloadsDone2=%S has been downloaded
 alertTapToSave=Tap to save this file.
 alertDownloadsSize=Download too big
 alertDownloadsNoSpace=Not enough storage space
-# LOCALIZATION NOTE (alertDownloadSave2): #1 is the file name, #2 is the file size, #3 is the file host
-alertDownloadSave2=Do you want to open or save #1 (#2) from #3?
+# LOCALIZATION NOTE (alertDownloadSave): #1 is the file name, #2 is the file size, #3 is the file host
+alertDownloadSave=Do you want to run or save #1 (#2) from #3?
 # LOCALIZATION NOTE (alertDownloadMultiple): Semi-colon list of plural forms.
 # See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the number of files, #2 is (amount downloaded so far / total amount to download) and #3 is seconds remaining