From 2cb5c0d54a5b7cd93da7303b1ed0730058d95b52 Mon Sep 17 00:00:00 2001
From: Matt Brubeck <mbrubeck@mozilla.com>
Date: Fri, 1 Nov 2013 16:10:49 -0700
Subject: [PATCH] Bug 928201 - Change Run to Open in Metro download bar
 [r=emtwo]

---
 browser/metro/base/content/downloads.js               | 4 ++--
 browser/metro/components/HelperAppDialog.js           | 4 ++--
 browser/metro/components/Sidebar.js                   | 6 +++---
 browser/metro/components/moz.build                    | 8 ++++----
 browser/metro/locales/en-US/chrome/browser.properties | 8 ++++----
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/browser/metro/base/content/downloads.js b/browser/metro/base/content/downloads.js
index e7a8fd94ce9..05ec75da7a3 100644
--- a/browser/metro/base/content/downloads.js
+++ b/browser/metro/base/content/downloads.js
@@ -254,7 +254,7 @@ var MetroDownloadsView = {
                                .replace("#1", this._downloadCount)
     } else {
       let runButtonText =
-        Strings.browser.GetStringFromName("downloadRun");
+        Strings.browser.GetStringFromName("downloadOpen");
       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("downloadRunNow");
+      msg = Strings.browser.GetStringFromName("downloadOpenNow");
       observer = {
         observe: function (aSubject, aTopic, aData) {
           switch (aTopic) {
diff --git a/browser/metro/components/HelperAppDialog.js b/browser/metro/components/HelperAppDialog.js
index fb48e798c74..fee02a6338f 100644
--- a/browser/metro/components/HelperAppDialog.js
+++ b/browser/metro/components/HelperAppDialog.js
@@ -74,7 +74,7 @@ HelperAppLauncherDialog.prototype = {
     let browserBundle = Services.strings.createBundle("chrome://browser/locale/browser.properties");
 
     let runButtonText =
-              browserBundle.GetStringFromName("downloadRun");
+              browserBundle.GetStringFromName("downloadOpen");
     let saveButtonText =
               browserBundle.GetStringFromName("downloadSave");
     let cancelButtonText =
@@ -111,7 +111,7 @@ HelperAppLauncherDialog.prototype = {
     let document = notificationBox.ownerDocument;
     downloadSize = this._getDownloadSize(aLauncher.contentLength);
 
-    let msg = browserBundle.GetStringFromName("alertDownloadSave");
+    let msg = browserBundle.GetStringFromName("alertDownloadSave2");
 
     let fragment =  ContentUtil.populateFragmentFromString(
                       document.createDocumentFragment(),
diff --git a/browser/metro/components/Sidebar.js b/browser/metro/components/Sidebar.js
index 93b36415c9f..7caae6c8c16 100644
--- a/browser/metro/components/Sidebar.js
+++ b/browser/metro/components/Sidebar.js
@@ -1,6 +1,6 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const Ci = Components.interfaces;
 const Cc = Components.classes;
diff --git a/browser/metro/components/moz.build b/browser/metro/components/moz.build
index e8468394f6c..486d3597720 100644
--- a/browser/metro/components/moz.build
+++ b/browser/metro/components/moz.build
@@ -13,11 +13,15 @@ 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']:
@@ -28,10 +32,6 @@ if CONFIG['MOZ_SAFE_BROWSING']:
 EXTRA_PP_COMPONENTS += [
     'AboutRedirector.js',
     'BrowserCLH.js',
-    'BrowserStartup.js',
     'components.manifest',
-    'DirectoryProvider.js',
-    'HelperAppDialog.js',
     'SessionStore.js',
-    'Sidebar.js',
 ]
diff --git a/browser/metro/locales/en-US/chrome/browser.properties b/browser/metro/locales/en-US/chrome/browser.properties
index 7bfd78e94bc..20be5bc2d65 100644
--- a/browser/metro/locales/en-US/chrome/browser.properties
+++ b/browser/metro/locales/en-US/chrome/browser.properties
@@ -54,11 +54,11 @@ browserForOpenLocation=Open Location
 
 # Download Manager
 downloadsUnknownSize=Unknown size
-downloadRun=Run
+downloadOpen=Open
 downloadSave=Save
 downloadCancel=Cancel
 downloadTryAgain=Try Again
-downloadRunNow=Run it now
+downloadOpenNow=Open 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 (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 (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 (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