Bug 1255404 - detangle handling.properties in android. r=Pike
authorZibi Braniecki <zbraniecki@mozilla.com>
Sun, 27 Aug 2017 17:36:41 -0700
changeset 377616 f89f3519cc7e757413a2a2b7414557eb1cf1ef4b
parent 377615 8c39c4756749e933d13e2feba33ef7934fb4e782
child 377617 a605f25b48899be7bea48fbbf5269c9d1f3bd8b0
push id32412
push userarchaeopteryx@coole-files.de
push dateWed, 30 Aug 2017 08:45:09 +0000
treeherdermozilla-central@ae9e6b6d3132 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersPike
bugs1255404
milestone57.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1255404 - detangle handling.properties in android. r=Pike MozReview-Commit-ID: CTl8gNpnbLc
mobile/android/components/HelperAppDialog.js
mobile/android/locales/en-US/chrome/browser.properties
mobile/android/locales/en-US/chrome/handling.properties
mobile/android/locales/jar.mn
--- a/mobile/android/components/HelperAppDialog.js
+++ b/mobile/android/components/HelperAppDialog.js
@@ -261,17 +261,17 @@ HelperAppLauncherDialog.prototype = {
     return useNewButtonOrder;
   },
 
   _refuseDownload: function(aLauncher) {
     aLauncher.cancel(Cr.NS_BINDING_ABORTED);
 
     Services.console.logStringMessage("Refusing download of non-downloadable file.");
 
-    let bundle = Services.strings.createBundle("chrome://browser/locale/handling.properties");
+    let bundle = Services.strings.createBundle("chrome://browser/locale/browser.properties");
     let failedText = bundle.GetStringFromName("download.blocked");
 
     Snackbars.show(failedText, Snackbars.LENGTH_LONG);
   },
 
   _downloadWithAndroidDownloadManager(aLauncher) {
     let mimeType = aLauncher.MIMEInfo.MIMEType;
     if (!mimeType) {
--- a/mobile/android/locales/en-US/chrome/browser.properties
+++ b/mobile/android/locales/en-US/chrome/browser.properties
@@ -42,16 +42,17 @@ alertSearchEngineDuplicateToast='%S' is 
 # LOCALIZATION NOTE (alertShutdownSanitize): This text is shown as a snackbar during shutdown if the
 # user has enabled "Clear private data on exit".
 alertShutdownSanitize=Clearing private data…
 
 alertPrintjobToast=Printing…
 
 downloadCancelPromptTitle1=Abort Download
 downloadCancelPromptMessage1=Do you want to abort this download?
+download.blocked=Unable to download file
 
 addonError.titleError=Error
 addonError.titleBlocked=Blocked add-on
 addonError.learnMore=Learn more
 
 # LOCALIZATION NOTE (unsignedAddonsDisabled.title, unsignedAddonsDisabled.message):
 # These strings will appear in a dialog when Firefox detects that installed add-ons cannot be verified.
 unsignedAddonsDisabled.title=Unverified add-ons
deleted file mode 100644
--- a/mobile/android/locales/en-US/chrome/handling.properties
+++ /dev/null
@@ -1,5 +0,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/.
-
-download.blocked=Unable to download file
--- a/mobile/android/locales/jar.mn
+++ b/mobile/android/locales/jar.mn
@@ -23,17 +23,16 @@
   locale/@AB_CD@/browser/browser.properties       (%chrome/browser.properties)
   locale/@AB_CD@/browser/config.dtd               (%chrome/config.dtd)
   locale/@AB_CD@/browser/config.properties        (%chrome/config.properties)
   locale/@AB_CD@/browser/checkbox.dtd             (%chrome/checkbox.dtd)
   locale/@AB_CD@/browser/devicePrompt.properties  (%chrome/devicePrompt.properties)
   locale/@AB_CD@/browser/pippki.properties        (%chrome/pippki.properties)
   locale/@AB_CD@/browser/sync.properties          (%chrome/sync.properties)
   locale/@AB_CD@/browser/phishing.dtd             (%chrome/phishing.dtd)
-  locale/@AB_CD@/browser/handling.properties      (%chrome/handling.properties)
   locale/@AB_CD@/browser/aboutLogins.dtd          (%chrome/aboutLogins.dtd)
   locale/@AB_CD@/browser/aboutLogins.properties  (%chrome/aboutLogins.properties)
   locale/@AB_CD@/browser/passwordmgr.properties   (%chrome/passwordmgr.properties)
 #ifndef RELEASE_OR_BETA
   locale/@AB_CD@/browser/webcompatReporter.properties (%chrome/webcompatReporter.properties)
 #endif
 % resource search-plugins chrome://browser/locale/searchplugins/
 
@@ -66,17 +65,16 @@ relativesrcdir toolkit/locales:
   locale/@AB_CD@/browser/overrides/global/aboutWebrtc.properties  (%chrome/global/aboutWebrtc.properties)
 
 % override chrome://global/locale/about.dtd chrome://browser/locale/overrides/about.dtd
 % override chrome://global/locale/aboutAbout.dtd chrome://browser/locale/overrides/aboutAbout.dtd
 % override chrome://global/locale/aboutReader.properties chrome://browser/locale/overrides/aboutReader.properties
 % override chrome://global/locale/aboutRights.dtd chrome://browser/locale/overrides/aboutRights.dtd
 % override chrome://global/locale/charsetMenu.properties chrome://browser/locale/overrides/charsetMenu.properties
 % override chrome://global/locale/commonDialogs.properties chrome://browser/locale/overrides/commonDialogs.properties
-% override chrome://mozapps/locale/handling/handling.properties chrome://browser/locale/handling.properties
 % override chrome://global/locale/intl.properties chrome://browser/locale/overrides/intl.properties
 % override chrome://global/locale/intl.css chrome://browser/locale/overrides/intl.css
 % override chrome://global/locale/search/search.properties chrome://browser/locale/overrides/search/search.properties
 % override chrome://pluginproblem/locale/pluginproblem.dtd chrome://browser/locale/overrides/plugins/pluginproblem.dtd
 % override chrome://global/locale/aboutSupport.dtd chrome://browser/locale/overrides/global/aboutSupport.dtd
 % override chrome://global/locale/aboutSupport.properties chrome://browser/locale/overrides/global/aboutSupport.properties
 % override chrome://global/locale/crashes.dtd chrome://browser/locale/overrides/crashreporter/crashes.dtd
 % override chrome://global/locale/crashes.properties chrome://browser/locale/overrides/crashreporter/crashes.properties