Bug 346486 Hard-coded application name in browser.properties, ui-r=beltzner, r+a=mconnor

browser/base/content/browser.js

@@ -4973,12 +4973,17 @@ nsContextMenu.prototype = {
         savedmenu.toggleImageBlocking(!aBlock);
       }
 
+      var uri = gBrowser.selectedBrowser.webNavigation.currentURI;
+      var brandBundle = document.getElementById("bundle_brand");
+      var app = brandBundle.getString("brandShortName");
       var bundle_browser = document.getElementById("bundle_browser");
       var message;
       if (aBlock)
-        message = bundle_browser.getString("imageWarningBlocked");
+        message = bundle_browser.getFormattedString("imageBlockedWarning",
+                                                    [app, uri.host]);
       else 
-        message = bundle_browser.getString("imageWarningAllowed");
+        message = bundle_browser.getFormattedString("imageAllowedWarning",
+                                                    [app, uri.host]);
 
       var notificationBox = gBrowser.getNotificationBox();
       var notification = notificationBox.getNotificationWithValue("images-blocked");

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

@@ -90,8 +90,8 @@ popupWarningDontShowFromMessage=Don't show this message when popups are blocked
 popupWarningDontShowFromStatusbar=Don't show info message when popups are blocked
 popupShowPopupPrefix=Show '%S'
 
-imageWarningBlocked=Firefox will now always block images from this site
-imageWarningAllowed=Firefox will now allow images from this site
+imageBlockedWarning=%S will now always block images from %S.
+imageAllowedWarning=%S will now allow images from %S.
 undo=Undo
 undo.accessKey=U