bug 346764 - unifies strings and entities for install/download permissions. patch by beltzner,r=gavin,a181=dbaron

browser/base/content/browser.js

@@ -726,8 +726,8 @@ function xpinstallEditPermissions(aDocShell)
                    allowVisible   : true,
                    prefilledHost  : webNav.currentURI.host,
                    permissionType : "install",
-                   windowTitle    : bundlePreferences.getString("installpermissionstitle"),
-                   introText      : bundlePreferences.getString("installpermissionstext") };
+                   windowTitle    : bundlePreferences.getString("addonspermissionstitle"),
+                   introText      : bundlePreferences.getString("addonspermissionstext") };
     wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
                    .getService(Components.interfaces.nsIWindowMediator);
     var existingWindow = wm.getMostRecentWindow("Browser:Permissions");

browser/components/preferences/security.js

@@ -82,8 +82,8 @@ var gSecurityPane = {
 
     var params = this._addonParams;
     if (!params.windowTitle || !params.introText) {
-      params.windowTitle = bundlePrefs.getString("installpermissionstitle");
-      params.introText = bundlePrefs.getString("installpermissionstext");
+      params.windowTitle = bundlePrefs.getString("addonspermissionstitle");
+      params.introText = bundlePrefs.getString("addonspermissionstext");
     }
 
     document.documentElement.openWindow("Browser:Permissions",

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

@@ -38,12 +38,10 @@ labelDefaultFont=Default (%S)
 
 cookiepermissionstext=You can specify which web sites are always or never allowed to use cookies.  Type the exact address of the site you want to manage and then click Block, Allow for Session, or Allow.
 cookiepermissionstitle=Exceptions - Cookies
-installpermissionstext=You can specify which web sites are allowed to install software. Type the exact address of the site you want to allow and then click Allow.
-installpermissionstitle=Allowed Sites - Software Installation
+addonspermissionstext=You can specify which web sites are allowed to install add-ons. Type the exact address of the site you want to allow and then click Allow.
+addonspermissionstitle=Allowed Sites - Add-ons
 popuppermissionstext=You can specify which web sites are allowed to open popup windows. Type the exact address of the site you want to allow and then click Allow.
 popuppermissionstitle=Allowed Sites - Popups
-downloadpermissionstext=You can specify which web sites are allowed to download files to your computer. Type the exact address of the site you want to allow and then click Allow.
-downloadpermissionstitle=Allowed Sites - Downloading Software
 imagepermissionstext=You can specify which web sites are allowed to load images. Type the exact address of the site you want to manage and then click Block or Allow.
 imagepermissionstitle=Exceptions - Images
 invalidURI=Please enter a valid hostname