Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 255623 - "Punctuation fix: Popup should be Pop-up" (more corrections) [p=kbrosnan@gmail.com (Kevin Brosnan) r=Mano a1.9=mconnor]

Browse Source
This commit is contained in:
reed@reedloden.com 2007-12-14 16:26:50 -08:00
parent 0e58830236
commit 1c9fa4b1a1
7 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/locales/en-US/chrome/browser/pageReport.dtd
View File

@ -1,4 +1,4 @@
<!ENTITY caption.label "Blocked Popups">
<!ENTITY caption.label "Blocked Pop-ups">
<!ENTITY intro.label "The following pages were prevented from displaying
unrequested pop-up windows:">

4
browser/locales/en-US/chrome/browser/pageReportFirstTime.dtd
View File

@ -1,6 +1,6 @@
<!ENTITY startDescription.label "A web site has attempted to open a pop-up window without your permission. &brandShortName; has automatically closed the pop-up window. Whenever &brandShortName; blocks these popups, you will see an icon on the status bar.">
<!ENTITY startDescription.label "A web site has attempted to open a pop-up window without your permission. &brandShortName; has automatically closed the pop-up window. Whenever &brandShortName; blocks these pop-ups, you will see an icon on the status bar.">
<!ENTITY endDescription.label "You can click on this icon to see which sites &brandShortName; blocked and to allow those sites to open popups if they are required for the site to function correctly.">
<!ENTITY endDescription.label "You can click on this icon to see which sites &brandShortName; blocked and to allow those sites to open pop-ups if they are required for the site to function correctly.">
<!ENTITY caption.label "About Pop-up Blocking">

2
browser/locales/en-US/chrome/browser/preferences/preferences.properties
View File

@ -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

2
browser/locales/en-US/chrome/help/accessibility.xhtml
View File

@ -213,7 +213,7 @@ Contributors:
<h3 id="blocking_popup_windows">Blocking Pop-up Windows</h3>
<p>See <a href="popup.xhtml">Controlling Popups</a> for information on
<p>See <a href="popup.xhtml">Controlling Pop-ups</a> for information on
blocking pop-up windows.</p>
<h3 id="turning_off_java_applets">Turning Off Java Applets</h3>

8
browser/locales/en-US/chrome/help/firebird-toc.rdf
View File

@ -26,7 +26,7 @@
<nc:subheadings rdf:resource="#prefs-tree"/>
</rdf:Description>
</rdf:li>
<rdf:li> <rdf:Description ID="popup-blocker" nc:name="Controlling Popups" nc:link="popup.xhtml"/> </rdf:li>
<rdf:li> <rdf:Description ID="popup-blocker" nc:name="Controlling Pop-ups" nc:link="popup.xhtml"/> </rdf:li>
<rdf:li> <rdf:Description ID="cookies" nc:name="Managing Cookies" nc:link="cookies.xhtml"/> </rdf:li>
<rdf:li> <rdf:Description ID="tabbed-browsing" nc:name="Tabbed Browsing" nc:link="tabbed_browsing.xhtml"/> </rdf:li>
<rdf:li> <rdf:Description ID="firebird-keyboard-shortcuts" nc:name="Keyboard Shortcuts" nc:link="shortcuts.xhtml"/> </rdf:li>
@ -137,9 +137,9 @@
<rdf:Description about="#popup-blocker">
<nc:subheadings>
<rdf:Seq>
<rdf:li> <rdf:Description ID="popup-blocker-what-are-popups" nc:name="What are Popups?" nc:link="popup.xhtml#what_are_popups"/> </rdf:li>
<rdf:li> <rdf:Description ID="popup-blocker-prefs-win" nc:name="Popup Blocker Options" nc:link="popup.xhtml#popup_blocker_preferences" nc:platform="win os2"/> </rdf:li>
<rdf:li> <rdf:Description ID="popup-blocker-prefs-unix" nc:name="Popup Blocker Preferences" nc:link="popup.xhtml#popup_blocker_preferences" nc:platform="unix mac"/> </rdf:li>
<rdf:li> <rdf:Description ID="popup-blocker-what-are-popups" nc:name="What are Pop-ups?" nc:link="popup.xhtml#what_are_popups"/> </rdf:li>
<rdf:li> <rdf:Description ID="popup-blocker-prefs-win" nc:name="Pop-up Blocker Options" nc:link="popup.xhtml#popup_blocker_preferences" nc:platform="win os2"/> </rdf:li>
<rdf:li> <rdf:Description ID="popup-blocker-prefs-unix" nc:name="Pop-up Blocker Preferences" nc:link="popup.xhtml#popup_blocker_preferences" nc:platform="unix mac"/> </rdf:li>
</rdf:Seq>
</nc:subheadings>
</rdf:Description>

52
browser/locales/en-US/chrome/help/popup.xhtml
View File

@ -12,58 +12,58 @@ Contributors:
-->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>Controlling Popups</title>
<title>Controlling Pop-ups</title>
<link rel="stylesheet" type="text/css" href="chrome://help/skin/helpFileLayout.css"/>
</head>
<body>
<h1>Controlling Popups</h1>
<h1>Controlling Pop-ups</h1>
<p>This document explains all of the &pref.plural; available in &brandFullName;
for controlling popups.</p>
for controlling pop-ups.</p>
<div class="contentsBox">
In this section:
<ul>
<li><a href="#what_are_popups">What are Pop-ups?</a></li>
<li><a href="#popup_blocker_preferences">Popup Blocker &pref.pluralCaps;</a></li>
<li><a href="#popup_blocker_preferences">Pop-up Blocker &pref.pluralCaps;</a></li>
</ul>
</div>
<h2 id="what_are_popups">What are Popups?</h2>
<p>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
<h2 id="what_are_popups">What are Pop-ups?</h2>
<p>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).</p>
underneath &brandShortName; (pop-unders).</p>
<p>&brandShortName; allows you to control both popups and popunders through the
<p>&brandShortName; allows you to control both pop-ups and popunders through the
<a href="prefs.xhtml#content_options">Content panel</a> 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;.</p>
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;.</p>
<p>When blocking a popup, &brandShortName; displays an information bar, as well
<p>When blocking a pop-up, &brandShortName; displays an information bar, as well
as an icon <img src="chrome://browser/skin/Info.png" width="16" height="16"
alt=""/> in the status bar. When you click either the <em>&pref.pluralCaps;</em>
button in the information bar or the icon in the status bar, a menu is displayed
with the following choices:</p>
<ul>
<li>Allow/Block popups for this site</li>
<li>Edit <a href="#popup_blocker_preferences">Popup Blocker
<li>Allow/Block pop-ups for this site</li>
<li>Edit <a href="#popup_blocker_preferences">Pop-up Blocker
&pref.pluralCaps;…</a></li>
<li>Don't show this message (info message) when popups are blocked</li>
<li>(show a blocked popup)</li>
<li>Don't show this message (info message) when pop-ups are blocked</li>
<li>(show a blocked pop-up)</li>
</ul>
<p><strong>Blocking popups may interfere with some web sites</strong>: 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
<p><strong>Blocking pop-ups may interfere with some web sites</strong>: 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.</p>
<p><strong>Blocking popups doesn't always work</strong>: Although &brandShortName; blocks most
popups, some web sites may show popups using uncovered methods, even when blocked.</p>
<p><strong>Blocking pop-ups doesn't always work</strong>: Although &brandShortName; blocks most
pop-ups, some web sites may show pop-ups using uncovered methods, even when blocked.</p>
<h2 id="popup_blocker_preferences">Popup Blocker &pref.pluralCaps;</h2>
<h2 id="popup_blocker_preferences">Pop-up Blocker &pref.pluralCaps;</h2>
<p>The Pop-up Blocker &pref.pluralCaps; are located in the <a
href="prefs.xhtml#content_options">Content panel</a> of &pref.menuPath;.</p>
@ -74,7 +74,7 @@ popups, some web sites may show popups using uncovered methods, even when blocke
<li><strong>Block pop-up windows</strong>: Deselect this &pref.singular; to
disable the pop-up blocker altogether.</li>
<li><strong>Exceptions dialog</strong>: 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:
<ul>
<li><strong>Allow</strong>: Click this to add a web site to the exceptions list.</li>
<li><strong>Remove Site</strong>: Click this to remove a web site from the exceptions list.</li>
@ -84,9 +84,9 @@ popups, some web sites may show popups using uncovered methods, even when blocke
</li>
</ul>
<p><strong>Note</strong>: Blocking popups may not always work and may interfere with
some web sites. For more information about blocking popups, see
<a href="#what_are_popups">What are Popups</a>.</p>
<p><strong>Note</strong>: Blocking pop-ups may not always work and may interfere with
some web sites. For more information about blocking pop-ups, see
<a href="#what_are_popups">What are Pop-ups</a>.</p>
<div class="contentsBox"><em>12 September 2005</em></div>
<p>Copyright &copy; &copyright.years; Contributors to the Mozilla Help Viewer Project.</p>

2
browser/locales/en-US/chrome/help/search-db.rdf
View File

@ -18,7 +18,7 @@
<li><Description nc:name="Anti-Phishing Preferences" nc:link="prefs.xhtml#phishing" nc:platform="unix mac"/></li>
<li><Description nc:name="authentication (definition)" nc:link="glossary.xhtml#authentication"/></li>
<li><Description nc:name="Back Button" nc:link="using_firebird.xhtml#retracing_your_steps"/></li>
<li><Description nc:name="Block Popups" nc:link="popup.xhtml"/></li>
<li><Description nc:name="Block Pop-ups" nc:link="popup.xhtml"/></li>
<li><Description nc:name="bookmark (definition)" nc:link="glossary.xhtml#bookmark"/></li>
<li><Description nc:name="Bookmarks Toolbar (definition)" nc:link="glossary.xhtml#Bookmarks_Toolbar"/></li>
<li><Description nc:name="Browsing" nc:link="using_firebird.xhtml#navigating_web_pages"/></li>