From 0ec1cc1fb36855752577c80bed6ee25b8117a4fa Mon Sep 17 00:00:00 2001
From: "jwalden%mit.edu" <jwalden%mit.edu>
Date: Tue, 7 Jun 2005 20:16:29 +0000
Subject: [PATCH] Bug 293523 - Change a couple instances of "Options" to
 "Preferences" in the blocked popup bar UI in Mac/Linux builds.  r=mconnor,
 a=asa

---
 browser/base/content/browser-sets.inc                   | 6 +++++-
 browser/base/content/browser.js                         | 4 ++++
 browser/locales/en-US/chrome/browser/browser.dtd        | 4 ++++
 browser/locales/en-US/chrome/browser/browser.properties | 1 +
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index 35d3f8ad7d39..2ab6e1944eb6 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -187,7 +187,11 @@
                  accesskey="&allowPopups.accesskey;" 
                  oncommand="gPopupBlockerObserver.toggleAllowPopupsForSite(event);"/>
     <broadcaster id="blockedPopupEditSettings" 
-                 label="&editPopupSettings.label;" 
+#ifdef XP_WIN
+                 label="&editPopupSettings.label;"
+#else
+                 label="&editPopupSettingsUnix.label;" 
+#endif
                  accesskey="&editPopupSettings.accesskey;" 
                  oncommand="gPopupBlockerObserver.editPopupSettings();"/>
     <broadcaster id="blockedPopupDontShowMessage" 
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index f8a47e90b4b1..1ec547720855 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -218,7 +218,11 @@ const gPopupBlockerObserver = {
         var brandShortName = brandBundle.getString("brandShortName");
         var message;
         var popupCount = gBrowser.selectedBrowser.pageReport.length;
+#ifdef XP_WIN
         var popupButtonText = bundle_browser.getString("popupWarningButton");
+#else
+        var popupButtonText = bundle_browser.getString("popupWarningButtonUnix");
+#endif
         if (popupCount > 1) 
           message = bundle_browser.getFormattedString("popupWarningMultiple", [brandShortName, popupCount]);
         else
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index ccaab2a99c9a..27d17493064c 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -341,6 +341,10 @@
 <!ENTITY pageReportIcon.tooltip            "Change popup blocking settings for this web site">
 
 <!ENTITY allowPopups.accesskey "p">
+<!-- On Windows we use the term "Options" to describe settings, but
+     on Linux and Mac OS X we use "Preferences" - carry that distinction
+     over into this string, which is used in the "popup blocked" info bar . -->
+<!ENTITY editPopupSettingsUnix.label "Edit Popup Blocker Preferences...">
 <!ENTITY editPopupSettings.label "Edit Popup Blocker Options...">
 <!ENTITY editPopupSettings.accesskey "E">
 <!ENTITY dontShowMessage.accesskey "D">
diff --git a/browser/locales/en-US/chrome/browser/browser.properties b/browser/locales/en-US/chrome/browser/browser.properties
index bfef260edba5..61d6a9dc3e7d 100644
--- a/browser/locales/en-US/chrome/browser/browser.properties
+++ b/browser/locales/en-US/chrome/browser/browser.properties
@@ -73,6 +73,7 @@ themeWarningButton=Edit Options...
 popupWarning=%S prevented this site from opening a popup window.
 popupWarningMultiple=%S prevented this site from opening %S popup windows.
 popupWarningButton=Options
+popupWarningButtonUnix=Preferences
 popupAllow=Allow popups for %S
 popupBlock=Block popups for %S
 popupWarningDontShowFromMessage=Don't show this message when popups are blocked