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

@@ -313,14 +313,14 @@
 <!ENTITY pageStylePersistentOnly.label "Basic Page Style">
 <!ENTITY pageStylePersistentOnly.accesskey "b">
 
-<!ENTITY pageReportIcon.tooltip            "Change popup blocking settings for this web site">
+<!ENTITY pageReportIcon.tooltip            "Change pop-up 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 editPopupSettingsUnix.label "Edit Pop-up Blocker Preferences…">
-<!ENTITY editPopupSettings.label "Edit Popup Blocker Options…">
+<!ENTITY editPopupSettings.label "Edit Pop-up Blocker Options…">
 <!ENTITY editPopupSettings.accesskey "E">
 <!ENTITY dontShowMessage.accesskey "D">
 

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.
+popupWarning=%S prevented this site from opening a pop-up window.
-popupWarningMultiple=%S prevented this site from opening %S popup windows.
+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
+popupAllow=Allow pop-ups for %S
-popupBlock=Block popups for %S
+popupBlock=Block pop-ups for %S
-popupWarningDontShowFromMessage=Don't show this message when popups are blocked
+popupWarningDontShowFromMessage=Don't show this message when pop-ups are blocked
-popupWarningDontShowFromStatusbar=Don't show info message when popups 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.

browser/locales/en-US/chrome/browser/pageInfo.dtd

@@ -95,7 +95,7 @@
 <!ENTITY  permBlock             "Block">
 <!ENTITY  permissionsFor        "Permissions for:">
 <!ENTITY  permImage             "Load Images">
-<!ENTITY  permPopup             "Open Popup Windows">
+<!ENTITY  permPopup             "Open Pop-up Windows">
 <!ENTITY  permCookie            "Set Cookies">
 <!ENTITY  permInstall           "Install Extensions or Themes">
 

browser/locales/en-US/chrome/browser/pageReport.dtd

@@ -1,7 +1,7 @@
 <!ENTITY caption.label "Blocked Popups">
 
 <!ENTITY intro.label "The following pages were prevented from displaying 
-unrequested popup windows:">
+unrequested pop-up windows:">
 
 <!ENTITY done.label "Done">
 <!ENTITY done.accesskey "D">

browser/locales/en-US/chrome/browser/pageReportFirstTime.dtd

@@ -1,7 +1,7 @@
-<!ENTITY startDescription.label            "A web site has attempted to open a popup window without your permission. &brandShortName; has automatically closed the popup 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 popups, 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 caption.label                     "About Popup Blocking">
+<!ENTITY caption.label                     "About Pop-up Blocking">
 
 <!ENTITY done.label "Done">

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

browser/locales/en-US/chrome/help/accessibility.xhtml

@@ -211,10 +211,10 @@ Contributors:
 
   <h2 id="controlling_web_content">Controlling Web Content</h2>
 
-  <h3 id="blocking_popup_windows">Blocking Popup Windows</h3>
+  <h3 id="blocking_popup_windows">Blocking Pop-up Windows</h3>
 
   <p>See <a href="popup.xhtml">Controlling Popups</a> for information on
-    blocking popup windows.</p>
+    blocking pop-up windows.</p>
 
   <h3 id="turning_off_java_applets">Turning Off Java Applets</h3>
 

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

@@ -215,7 +215,7 @@
   <rdf:Description about="#a11y-web-content">
     <nc:subheadings>
       <rdf:Seq>
-        <rdf:li> <rdf:Description ID="a11y-popup-windows" nc:name="Blocking Popup Windows" nc:link="accessibility.xhtml#blocking_popup_windows"/> </rdf:li>
+        <rdf:li> <rdf:Description ID="a11y-popup-windows" nc:name="Blocking Pop-up Windows" nc:link="accessibility.xhtml#blocking_popup_windows"/> </rdf:li>
         <rdf:li> <rdf:Description ID="a11y-java" nc:name="Turning Off Java Applets" nc:link="accessibility.xhtml#turning_off_java_applets"/> </rdf:li>
         <rdf:li> <rdf:Description ID="a11y-javascript" nc:name="Restricting JavaScript Behavior" nc:link="accessibility.xhtml#restricting_javascript_behavior"/> </rdf:li>
       </rdf:Seq>

browser/locales/en-US/chrome/help/forieusers.xhtml

@@ -91,7 +91,7 @@
     your home page.  For more information see <a
     href="tabbed_browsing.xhtml">Tabbed Browsing</a>.</li>
   <li><strong>Pop-up Window Controls</strong>: Lets you allow or suppress both
-    popup and popunder windows.</li>
+    pop-up and pop-under windows.</li>
   <li><strong>Cookie Manager</strong>: Lets you change what &brandShortName; will
     do when accepting cookies.</li>
   <li><strong>Download Manager</strong>: Organizes your downloads by storing

browser/locales/en-US/chrome/help/popup.xhtml

@@ -25,7 +25,7 @@ Contributors:
 <div class="contentsBox">
   In this section:
   <ul>
-    <li><a href="#what_are_popups">What are Popups?</a></li>
+    <li><a href="#what_are_popups">What are Pop-ups?</a></li>
     <li><a href="#popup_blocker_preferences">Popup Blocker &pref.pluralCaps;</a></li>
   </ul>
 </div>
@@ -65,14 +65,14 @@ popups, some web sites may show popups using uncovered methods, even when blocke
 
 <h2 id="popup_blocker_preferences">Popup Blocker &pref.pluralCaps;</h2>
 
-<p>The Popup Blocker &pref.pluralCaps; are located in the <a
+<p>The Pop-up Blocker &pref.pluralCaps; are located in the <a
   href="prefs.xhtml#content_options">Content panel</a> of &pref.menuPath;.</p>
 
 <p>From there, you can do the following things:</p>
 
 <ul>
   <li><strong>Block pop-up windows</strong>: Deselect this &pref.singular; to
-    disable the popup blocker altogether.</li>
+    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:
   <ul>

browser/locales/en-US/chrome/help/using_firebird.xhtml

@@ -174,7 +174,7 @@ Contributors:
   <li>Select (highlight) any words in a web page.</li>
   <li><span class="noMac">Right-click</span><span class="mac">Press &ctrlKey;,
     click the mouse button,</span> and choose <em>Search [Search Engine] for
-    "[your selected words]"</em> from the popup menu.</li>
+    "[your selected words]"</em> from the pop-up menu.</li>
 </ol>
 
 <p>&brandShortName; opens a new tab and uses the currently selected Search
@@ -235,7 +235,7 @@ Contributors:
 <ol>
   <li>Position the pointer over the link or image.</li>
   <li><span class="noMac">Right-click</span><span class="mac">Press &ctrlKey;
-    and click on</span> the link or image to display a popup menu.</li>
+    and click on</span> the link or image to display a pop-up menu.</li>
   <li>Choose Copy Link Location or Copy Image Location. If an image is also a
     link, you can choose either menu item.</li>
 </ol>
@@ -276,7 +276,7 @@ Contributors:
 <ol>
   <li>Position the mouse pointer within the frame.</li>
   <li><span class="mac">Press &ctrlKey; and click on</span><span
-    class="noMac">Right-click</span> the frame to display a popup menu.</li>
+    class="noMac">Right-click</span> the frame to display a pop-up menu.</li>
   <li>Select <span class="menuPath">This Frame &gt; Save Frame As</span> from
     the submenu. You will see the Save As dialog box.</li>
   <li>Choose a location for the saved page.</li>
@@ -291,7 +291,7 @@ Contributors:
 <ol>
   <li>Position the mouse pointer over the image.</li>
   <li><span class="noMac">Right-click</span><span class="mac">Press &ctrlKey;
-    and click on</span> the image to display a popup menu.</li>
+    and click on</span> the image to display a pop-up menu.</li>
   <li>Select <span class="menuPath">Save Image As</span>. You will see the
     Save Image dialog box.</li>
   <li>Choose a location for the saved image.</li>
@@ -304,7 +304,7 @@ Contributors:
 <ol>
   <li>Position the mouse pointer over a link to the page.</li>
   <li><span class="noMac">Right-click</span><span class="mac">Press &ctrlKey;
-    and click on</span> the link to display a popup menu.</li>
+    and click on</span> the link to display a pop-up menu.</li>
   <li>Select <span class="menuPath">Save Link to Disk</span>. You will see the
     Save As dialog box.</li>
   <li>Choose a location for the saved page.</li>
@@ -321,7 +321,7 @@ Contributors:
 <p><strong>Tip</strong>: To set an image as your desktop background,
   <span class="noMac">right-click</span><span class="mac">press &ctrlKey;,
   click the mouse button</span> on an image and choose <em>Set As Desktop
-  Background…</em> from the popup menu.</p>
+  Background…</em> from the pop-up menu.</p>
 
 <h3 id="printing_a_page">Printing a Page</h3>