Bug 1255404 - detangle handling.properties in android. r?pike
MozReview-Commit-ID: CTl8gNpnbLc
--- 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)
#ifndef RELEASE_OR_BETA
locale/@AB_CD@/browser/webcompatReporter.properties (%chrome/webcompatReporter.properties)
#endif
% resource search-plugins chrome://browser/locale/searchplugins/
# overrides for toolkit l10n, also for en-US
@@ -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://passwordmgr/locale/passwordmgr.properties chrome://browser/locale/overrides/passwordmgr/passwordmgr.properties
% 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