From 9b650c84efc0d870c65ea05e78edc84072355be1 Mon Sep 17 00:00:00 2001 From: "reed@reedloden.com" Date: Fri, 14 Dec 2007 02:50:05 -0800 Subject: [PATCH] Bug 255623 - "Punctuation fix: Popup should be Pop-up" [p=kbrosnan@gmail.com (Kevin Brosnan) r=Mano a1.9=beltzner] --- browser/locales/en-US/chrome/browser/browser.dtd | 6 +++--- .../locales/en-US/chrome/browser/browser.properties | 12 ++++++------ browser/locales/en-US/chrome/browser/pageInfo.dtd | 2 +- browser/locales/en-US/chrome/browser/pageReport.dtd | 2 +- .../en-US/chrome/browser/pageReportFirstTime.dtd | 4 ++-- .../browser/preferences/preferences.properties | 2 +- .../locales/en-US/chrome/help/accessibility.xhtml | 4 ++-- browser/locales/en-US/chrome/help/firebird-toc.rdf | 2 +- browser/locales/en-US/chrome/help/forieusers.xhtml | 2 +- browser/locales/en-US/chrome/help/popup.xhtml | 6 +++--- .../locales/en-US/chrome/help/using_firebird.xhtml | 12 ++++++------ 11 files changed, 27 insertions(+), 27 deletions(-) diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd index 01b800408dbf..ffa7ec81aecf 100644 --- a/browser/locales/en-US/chrome/browser/browser.dtd +++ b/browser/locales/en-US/chrome/browser/browser.dtd @@ -313,14 +313,14 @@ - + - - + + diff --git a/browser/locales/en-US/chrome/browser/browser.properties b/browser/locales/en-US/chrome/browser/browser.properties index 6a0271190b70..6472e85c003a 100644 --- a/browser/locales/en-US/chrome/browser/browser.properties +++ b/browser/locales/en-US/chrome/browser/browser.properties @@ -31,16 +31,16 @@ xpinstallDisabledMessageLocked=Software installation has been disabled by your s xpinstallDisabledMessage=Software installation is currently disabled. Click Enable and try again. xpinstallDisabledButton=Enable xpinstallDisabledButton.accesskey=n -popupWarning=%S prevented this site from opening a popup window. -popupWarningMultiple=%S prevented this site from opening %S popup windows. +popupWarning=%S prevented this site from opening a pop-up window. +popupWarningMultiple=%S prevented this site from opening %S pop-up windows. popupWarningButton=Options popupWarningButton.accesskey=O popupWarningButtonUnix=Preferences popupWarningButtonUnix.accesskey=P -popupAllow=Allow popups for %S -popupBlock=Block popups for %S -popupWarningDontShowFromMessage=Don't show this message when popups are blocked -popupWarningDontShowFromStatusbar=Don't show info message when popups are blocked +popupAllow=Allow pop-ups for %S +popupBlock=Block pop-ups for %S +popupWarningDontShowFromMessage=Don't show this message when pop-ups are blocked +popupWarningDontShowFromStatusbar=Don't show info message when pop-ups are blocked popupShowPopupPrefix=Show '%S' imageBlockedWarning=%S will now always block images from %S. diff --git a/browser/locales/en-US/chrome/browser/pageInfo.dtd b/browser/locales/en-US/chrome/browser/pageInfo.dtd index 6c7dee169d99..213d483a0ce0 100644 --- a/browser/locales/en-US/chrome/browser/pageInfo.dtd +++ b/browser/locales/en-US/chrome/browser/pageInfo.dtd @@ -95,7 +95,7 @@ - + diff --git a/browser/locales/en-US/chrome/browser/pageReport.dtd b/browser/locales/en-US/chrome/browser/pageReport.dtd index 8c20734b6502..3354611bf383 100644 --- a/browser/locales/en-US/chrome/browser/pageReport.dtd +++ b/browser/locales/en-US/chrome/browser/pageReport.dtd @@ -1,7 +1,7 @@ +unrequested pop-up windows:"> diff --git a/browser/locales/en-US/chrome/browser/pageReportFirstTime.dtd b/browser/locales/en-US/chrome/browser/pageReportFirstTime.dtd index 14e5e6a48929..c2041d3f53f6 100644 --- a/browser/locales/en-US/chrome/browser/pageReportFirstTime.dtd +++ b/browser/locales/en-US/chrome/browser/pageReportFirstTime.dtd @@ -1,7 +1,7 @@ - + - + diff --git a/browser/locales/en-US/chrome/browser/preferences/preferences.properties b/browser/locales/en-US/chrome/browser/preferences/preferences.properties index dab78a91dc85..669eb96e7b64 100644 --- a/browser/locales/en-US/chrome/browser/preferences/preferences.properties +++ b/browser/locales/en-US/chrome/browser/preferences/preferences.properties @@ -15,7 +15,7 @@ cookiepermissionstext=You can specify which web sites are always or never allowe cookiepermissionstitle=Exceptions - Cookies 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. addons_permissions_title=Allowed Sites - Add-ons Installation -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. +popuppermissionstext=You can specify which web sites are allowed to open pop-up windows. Type the exact address of the site you want to allow and then click Allow. popuppermissionstitle=Allowed Sites - Popups 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 diff --git a/browser/locales/en-US/chrome/help/accessibility.xhtml b/browser/locales/en-US/chrome/help/accessibility.xhtml index 2cece975b4bd..379954d48772 100644 --- a/browser/locales/en-US/chrome/help/accessibility.xhtml +++ b/browser/locales/en-US/chrome/help/accessibility.xhtml @@ -211,10 +211,10 @@ Contributors:

Controlling Web Content

-

Blocking Popup Windows

+

Blocking Pop-up Windows

See Controlling Popups for information on - blocking popup windows.

+ blocking pop-up windows.

Turning Off Java Applets

diff --git a/browser/locales/en-US/chrome/help/firebird-toc.rdf b/browser/locales/en-US/chrome/help/firebird-toc.rdf index f5c5a433d79f..a7345ac49edf 100644 --- a/browser/locales/en-US/chrome/help/firebird-toc.rdf +++ b/browser/locales/en-US/chrome/help/firebird-toc.rdf @@ -215,7 +215,7 @@ - + diff --git a/browser/locales/en-US/chrome/help/forieusers.xhtml b/browser/locales/en-US/chrome/help/forieusers.xhtml index e6ae7f4ad3bf..c2a238eee786 100644 --- a/browser/locales/en-US/chrome/help/forieusers.xhtml +++ b/browser/locales/en-US/chrome/help/forieusers.xhtml @@ -91,7 +91,7 @@ your home page. For more information see Tabbed Browsing.
  • Pop-up Window Controls: Lets you allow or suppress both - popup and popunder windows.
    • + pop-up and pop-under windows.
  • Cookie Manager: Lets you change what &brandShortName; will do when accepting cookies.
  • Download Manager: Organizes your downloads by storing diff --git a/browser/locales/en-US/chrome/help/popup.xhtml b/browser/locales/en-US/chrome/help/popup.xhtml index bc2dc82e0064..ab1ff355a62b 100644 --- a/browser/locales/en-US/chrome/help/popup.xhtml +++ b/browser/locales/en-US/chrome/help/popup.xhtml @@ -25,7 +25,7 @@ Contributors:
    In this section:
    @@ -65,14 +65,14 @@ popups, some web sites may show popups using uncovered methods, even when blocke -

    The Popup Blocker &pref.pluralCaps; are located in the The Pop-up Blocker &pref.pluralCaps; are located in the Content panel of &pref.menuPath;.

    From there, you can do the following things:

    • Block pop-up windows: Deselect this &pref.singular; to - disable the popup blocker altogether.
      • + disable the pop-up blocker altogether.
    • Exceptions dialog: This is a list of sites that you want to allow to display popups. The dialog has the following choices:
        diff --git a/browser/locales/en-US/chrome/help/using_firebird.xhtml b/browser/locales/en-US/chrome/help/using_firebird.xhtml index 34d43c24c9c6..c55b96462ded 100644 --- a/browser/locales/en-US/chrome/help/using_firebird.xhtml +++ b/browser/locales/en-US/chrome/help/using_firebird.xhtml @@ -174,7 +174,7 @@ Contributors:
      • Select (highlight) any words in a web page.
      • Right-clickPress &ctrlKey;, click the mouse button, and choose Search [Search Engine] for - "[your selected words]" from the popup menu.
        • + "[your selected words]" from the pop-up menu.

        &brandShortName; opens a new tab and uses the currently selected Search @@ -235,7 +235,7 @@ Contributors:

        1. Position the pointer over the link or image.
        2. Right-clickPress &ctrlKey; - and click on the link or image to display a popup menu.
          3. + and click on the link or image to display a pop-up menu.
        3. Choose Copy Link Location or Copy Image Location. If an image is also a link, you can choose either menu item.
        @@ -276,7 +276,7 @@ Contributors:
        1. Position the mouse pointer within the frame.
        2. Press &ctrlKey; and click onRight-click the frame to display a popup menu.
          3. + class="noMac">Right-click the frame to display a pop-up menu.
        3. Select This Frame > Save Frame As from the submenu. You will see the Save As dialog box.
        4. Choose a location for the saved page.
          5. @@ -291,7 +291,7 @@ Contributors:
          1. Position the mouse pointer over the image.
          2. Right-clickPress &ctrlKey; - and click on the image to display a popup menu.
            3. + and click on the image to display a pop-up menu.
          3. Select Save Image As. You will see the Save Image dialog box.
          4. Choose a location for the saved image.
            5. @@ -304,7 +304,7 @@ Contributors:
            1. Position the mouse pointer over a link to the page.
            2. Right-clickPress &ctrlKey; - and click on the link to display a popup menu.
              3. + and click on the link to display a pop-up menu.
            3. Select Save Link to Disk. You will see the Save As dialog box.
            4. Choose a location for the saved page.
              5. @@ -321,7 +321,7 @@ Contributors:

              Tip: To set an image as your desktop background, right-clickpress &ctrlKey;, click the mouse button on an image and choose Set As Desktop - Background… from the popup menu.

              + Background… from the pop-up menu.

              Printing a Page