Bug 1265362 - Update strings for the new user interface of blocked downloads. r=past
authorPaolo Amadini <paolo.mozmail@amadzone.org>
Fri, 22 Apr 2016 16:55:53 +0100
changeset 332355 8943b294f4eaf31be2bb722490b0218571bf2a61
parent 332354 df4e550128b976a664216e57f78f80c36d78f275
child 332356 f36212ee8d4abb16f40bbb396e4af939aa7708c8
push id6048
push userkmoir@mozilla.com
push dateMon, 06 Jun 2016 19:02:08 +0000
treeherdermozilla-beta@46d72a56c57d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerspast
bugs1265362
milestone48.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 1265362 - Update strings for the new user interface of blocked downloads. r=past MozReview-Commit-ID: LAuZSSz1B11
browser/components/downloads/DownloadsCommon.jsm
browser/locales/en-US/chrome/browser/downloads/downloads.properties
--- a/browser/components/downloads/DownloadsCommon.jsm
+++ b/browser/components/downloads/DownloadsCommon.jsm
@@ -583,26 +583,26 @@ this.DownloadsCommon = {
       default:
         Cu.reportError("Unexpected dialog type: " + dialogType);
         return "cancel";
     }
 
     let message;
     switch (verdict) {
       case Downloads.Error.BLOCK_VERDICT_UNCOMMON:
-        message = s.unblockTypeUncommon;
+        message = s.unblockTypeUncommon2;
         break;
       case Downloads.Error.BLOCK_VERDICT_POTENTIALLY_UNWANTED:
-        message = s.unblockTypePotentiallyUnwanted;
+        message = s.unblockTypePotentiallyUnwanted2;
         break;
       default: // Assume Downloads.Error.BLOCK_VERDICT_MALWARE
         message = s.unblockTypeMalware;
         break;
     }
-    message += "\n\n" + s.unblockTip;
+    message += "\n\n" + s.unblockTip2;
 
     Services.ww.registerNotification(function onOpen(subj, topic) {
       if (topic == "domwindowopened" && subj instanceof Ci.nsIDOMWindow) {
         // Make sure to listen for "DOMContentLoaded" because it is fired
         // before the "load" event.
         subj.addEventListener("DOMContentLoaded", function onLoad() {
           subj.removeEventListener("DOMContentLoaded", onLoad);
           if (subj.document.documentURI ==
--- a/browser/locales/en-US/chrome/browser/downloads/downloads.properties
+++ b/browser/locales/en-US/chrome/browser/downloads/downloads.properties
@@ -45,29 +45,29 @@ stateDirty=Blocked: May contain a virus 
 # period.  You may need to adjust "downloadDetails.width" in "downloads.dtd" if
 # this turns out to be longer than the other existing status strings.
 # Note: These strings don't exist in the UI yet.  See bug 1053890.
 blockedMalware=This file contains a virus or malware.
 blockedPotentiallyUnwanted=This file may harm your computer.
 blockedUncommon2=This file is not commonly downloaded.
 
 # LOCALIZATION NOTE (unblockHeaderUnblock, unblockHeaderOpen,
-#                    unblockTypeMalware, unblockTypePotentiallyUnwanted,
-#                    unblockTypeUncommon, unblockTip, unblockButtonOpen,
+#                    unblockTypeMalware, unblockTypePotentiallyUnwanted2,
+#                    unblockTypeUncommon2, unblockTip2, unblockButtonOpen,
 #                    unblockButtonUnblock, unblockButtonConfirmBlock):
 # These strings are displayed in the dialog shown when the user asks a blocked
 # download to be unblocked.  The severity of the threat is expressed in
 # descending order by the unblockType strings, it is higher for files detected
 # as malware and lower for uncommon downloads.
 unblockHeaderUnblock=Are you sure you want to allow this download?
 unblockHeaderOpen=Are you sure you want to open this file?
 unblockTypeMalware=This file contains a virus or other malware that will harm your computer.
-unblockTypePotentiallyUnwanted=This file, disguised as a helpful download, will make unexpected changes to your programs and settings.
-unblockTypeUncommon=This file has been downloaded from an unfamiliar and potentially dangerous website and may not be safe to open.
-unblockTip=You can search for an alternate download source or try to download the file again later.
+unblockTypePotentiallyUnwanted2=This file is disguised as a helpful download, but it can make unexpected changes to your programs and settings.
+unblockTypeUncommon2=This file is not commonly downloaded and may not be safe to open. It may contain a virus or make unexpected changes to your programs and settings.
+unblockTip2=You can search for an alternate download source or try again later.
 unblockButtonOpen=Open
 unblockButtonUnblock=Allow download
 unblockButtonConfirmBlock=Remove file
 
 # LOCALIZATION NOTE (sizeWithUnits):
 # %1$S is replaced with the size number, and %2$S with the measurement unit.
 sizeWithUnits=%1$S %2$S
 sizeUnknown=Unknown size