diff --git a/browser/locales/en-US/chrome/browser/pageReport.dtd b/browser/locales/en-US/chrome/browser/pageReport.dtd index 3354611bf38..570e7f1673d 100644 --- a/browser/locales/en-US/chrome/browser/pageReport.dtd +++ b/browser/locales/en-US/chrome/browser/pageReport.dtd @@ -1,4 +1,4 @@ - + diff --git a/browser/locales/en-US/chrome/browser/pageReportFirstTime.dtd b/browser/locales/en-US/chrome/browser/pageReportFirstTime.dtd index c2041d3f53f..28f4b9d3163 100644 --- a/browser/locales/en-US/chrome/browser/pageReportFirstTime.dtd +++ b/browser/locales/en-US/chrome/browser/pageReportFirstTime.dtd @@ -1,6 +1,6 @@ - + - + diff --git a/browser/locales/en-US/chrome/browser/preferences/preferences.properties b/browser/locales/en-US/chrome/browser/preferences/preferences.properties index 669eb96e7b6..2c8a8471114 100644 --- a/browser/locales/en-US/chrome/browser/preferences/preferences.properties +++ b/browser/locales/en-US/chrome/browser/preferences/preferences.properties @@ -16,7 +16,7 @@ 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 pop-up windows. Type the exact address of the site you want to allow and then click Allow. -popuppermissionstitle=Allowed Sites - Popups +popuppermissionstitle=Allowed Sites - Pop-ups 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 diff --git a/browser/locales/en-US/chrome/help/accessibility.xhtml b/browser/locales/en-US/chrome/help/accessibility.xhtml index 379954d4877..be53433acb4 100644 --- a/browser/locales/en-US/chrome/help/accessibility.xhtml +++ b/browser/locales/en-US/chrome/help/accessibility.xhtml @@ -213,7 +213,7 @@ Contributors:

Blocking Pop-up Windows

-

See Controlling Popups for information on +

See Controlling Pop-ups for information on 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 a7345ac49ed..69c445df259 100644 --- a/browser/locales/en-US/chrome/help/firebird-toc.rdf +++ b/browser/locales/en-US/chrome/help/firebird-toc.rdf @@ -26,7 +26,7 @@ - + @@ -137,9 +137,9 @@ - - - + + + diff --git a/browser/locales/en-US/chrome/help/popup.xhtml b/browser/locales/en-US/chrome/help/popup.xhtml index ab1ff355a62..bdf6384e1c4 100644 --- a/browser/locales/en-US/chrome/help/popup.xhtml +++ b/browser/locales/en-US/chrome/help/popup.xhtml @@ -12,58 +12,58 @@ Contributors: --> - Controlling Popups + Controlling Pop-ups -

Controlling Popups

+

Controlling Pop-ups

This document explains all of the &pref.plural; available in &brandFullName; - for controlling popups.

+ for controlling pop-ups.

In this section:
-

What are Popups?

-

Popup windows, or popups, are windows that appear automatically without your -permission. They vary in size but usually don't cover the whole screen. Some popups +

What are Pop-ups?

+

Pop-up windows, or pop-ups, are windows that appear automatically without your +permission. They vary in size but usually don't cover the whole screen. Some pop-ups open on top of the current &brandShortName; window, while others appear -underneath &brandShortName; (popunders).

+underneath &brandShortName; (pop-unders).

-

&brandShortName; allows you to control both popups and popunders through the +

&brandShortName; allows you to control both pop-ups and popunders through the Content panel in &pref.pluralCaps;. -Popup blocking is turned on by default, so you don't have to worry about enabling it -to prevent popups from appearing in &brandShortName;.

+Pop-up blocking is turned on by default, so you don't have to worry about enabling it +to prevent pop-ups from appearing in &brandShortName;.

-

When blocking a popup, &brandShortName; displays an information bar, as well +

When blocking a pop-up, &brandShortName; displays an information bar, as well as an icon in the status bar. When you click either the &pref.pluralCaps; button in the information bar or the icon in the status bar, a menu is displayed with the following choices:

-

Blocking popups may interfere with some web sites: Some web sites, -including some banking sites, use popups for important features. Blocking all popups -disables such features. To allow specific web sites to use popups, while blocking +

Blocking pop-ups may interfere with some web sites: Some web sites, +including some banking sites, use pop-ups for important features. Blocking all pop-ups +disables such features. To allow specific web sites to use pop-ups, while blocking all others, you can add specific web sites to the list of allowed sites.

-

Blocking popups doesn't always work: Although &brandShortName; blocks most -popups, some web sites may show popups using uncovered methods, even when blocked.

+

Blocking pop-ups doesn't always work: Although &brandShortName; blocks most +pop-ups, some web sites may show pop-ups using uncovered methods, even when blocked.

- +

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

@@ -74,7 +74,7 @@ popups, some web sites may show popups using uncovered methods, even when blocke
  • Block pop-up windows: Deselect this &pref.singular; to 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: + to display pop-ups. The dialog has the following choices: -

    Note: Blocking popups may not always work and may interfere with -some web sites. For more information about blocking popups, see -What are Popups.

    +

    Note: Blocking pop-ups may not always work and may interfere with +some web sites. For more information about blocking pop-ups, see +What are Pop-ups.

    12 September 2005

    Copyright © ©right.years; Contributors to the Mozilla Help Viewer Project.

    diff --git a/browser/locales/en-US/chrome/help/search-db.rdf b/browser/locales/en-US/chrome/help/search-db.rdf index 4569d77b118..a818980b062 100644 --- a/browser/locales/en-US/chrome/help/search-db.rdf +++ b/browser/locales/en-US/chrome/help/search-db.rdf @@ -18,7 +18,7 @@
    • -
    • +