Bug 90984 Prefer "website" to "web site" p=tmeader@gmail.com r=me sr=jag

suite/locales/en-US/chrome/common/help/cert_dialog_help.xhtml

@@ -30,7 +30,7 @@
     <li><a href="#certificate_backup">Certificate Backup</a></li>
     <li><a href="#user_identification_request">User Identification Request</a></li>
     <li><a href="#new_certificate_authority">New Certificate Authority</a></li>
-    <li><a href="#web_site_certificates">Web Site Certificates</a></li>
+    <li><a href="#web_site_certificates">Website Certificates</a></li>
   </ul>
 </div>
 
@@ -75,9 +75,9 @@
 	include any of the following:
     <ul>
       <li><strong>SSL Client Certificate:</strong> Certificate used to identify you
-        to web sites.</li>
+        to websites.</li>
       <li><strong>SSL Server Certificate:</strong> Certificate used to identify a
-        web site server to browsers.</li>
+        website server to browsers.</li>
       <li><strong>Email Signer Certificate:</strong> Certificate used to identify you
         for the purposes of digitally signing email messages.</li>
       <li><strong>Email Recipient Certificate:</strong> Certificate used to identify
@@ -199,8 +199,8 @@ were encrypted with your corresponding public key.</p>
   and its associated private key, depending on what you use it for. For example:</p>
 
 <ul>
-	<li>If you lose a certificate that identifies you to important web sites, you will not be
+	<li>If you lose a certificate that identifies you to important websites, you will not be
-	  able to access those web sites until you obtain a new certificate. </li>
+	  able to access those websites until you obtain a new certificate. </li>
 	<li>If you lose a certificate used to encrypt email messages, you will not be able to read
 	  any of your encrypted email&mdash;including both encrypted messages that you have sent and
 	  encrypted messages that you have received. In this case, if you cannot obtain a backup of
@@ -214,13 +214,13 @@ were encrypted with your corresponding public key.</p>
 <h2 id="user_identification_request">User Identification Request</h2>
 
 
-<p>Some web sites require that you identify yourself with a certificate rather than a name
+<p>Some websites require that you identify yourself with a certificate rather than a name
   and password, because certificates provide a more reliable form of identification. This
   method of identifying yourself over the Internet is sometimes called
   <a href="glossary.xhtml#client_authentication">client authentication</a>.</p>
 
 <p>However, Certificate Manager may have more than one certificate on file that can be used
-  for the purposes of identifying yourself to a web site. In this case, Certificate Manager
+  for the purposes of identifying yourself to a website. In this case, Certificate Manager
   presents the User Identification Request dialog box, which displays two kinds of
   information:</p>
 
@@ -228,7 +228,7 @@ were encrypted with your corresponding public key.</p>
   This section of the dialog box lists the following information:</p>
 	<ul>
 		<li><strong>Host name:</strong> The name of the server requesting identification,
-		  used as part of its URL. For example, the host name for the Netscape web site
+		  used as part of its URL. For example, the host name for the Netscape website
 		  is <tt>home.netscape.com</tt>.</li>
 		<li><strong>Organization:</strong> The name of the organization that runs the web
 		  site.</li>
@@ -238,9 +238,9 @@ were encrypted with your corresponding public key.</p>
 	</ul>
 
 <p><strong>Choose a certificate to present as identification:</strong> The certificates you
-  have available for the purposes of identifying yourself to a web site are listed in the
+  have available for the purposes of identifying yourself to a website are listed in the
   drop-down list in this section of the dialog box. Choose the certificate that seems most
-  likely to be recognized by the web site you want to visit.</p>
+  likely to be recognized by the website you want to visit.</p>
 
 <p>To help you decide, the following details of the selected certificate are displayed:</p>
 	<ul>
@@ -268,7 +268,7 @@ were encrypted with your corresponding public key.</p>
   following options:</p>
 
 <ul>
-	<li><strong>Trust this CA to identify web sites: </strong>Web site certificates for some
+	<li><strong>Trust this CA to identify websites: </strong>Website certificates for some
 	  sites, such as those that handle financial transactions, can be extremely important,
 	  and inappropriate or false identification can have negative consequences.</li>
 	<li><strong>Trust this CA to identify email users: </strong>If you intend to send email
@@ -286,7 +286,7 @@ were encrypted with your corresponding public key.</p>
 
 <p>Before you decide to trust a new CA, make sure that you know who is operating it. Make
   sure the CA's policies and procedures are appropriate for the kinds of certificates it
-  issues. For example, if the CA issues certificates identifying web sites you use for
+  issues. For example, if the CA issues certificates identifying websites you use for
   financial transactions, make sure you are comfortable with the level of assurance the CA
   provides.</p>
 
@@ -295,33 +295,33 @@ were encrypted with your corresponding public key.</p>
 	  download. If you decide you don't want to download this certificate, click Cancel.</li>
 </ul>
 
-<h2 id="web_site_certificates">Web Site Certificates</h2>
+<h2 id="web_site_certificates">Website Certificates</h2>
 
-<p>One of the windows listed here may appear when you attempt to go to a web site that
+<p>One of the windows listed here may appear when you attempt to go to a website that
   supports the use of <a href="glossary.xhtml#secure_sockets_layer">SSL</a> for
   <a href="glossary.xhtml#authentication">authentication</a> and
   <a href="glossary.xhtml#encryption">encryption</a>.</p>
 
 <div class="contentsBox">In this section:
   <ul>
-    <li><a href="#web_site_certified_by_an_unknown_authority">Web Site Certified by an Unknown Authority</a></li>
+    <li><a href="#web_site_certified_by_an_unknown_authority">Website Certified by an Unknown Authority</a></li>
     <li><a href="#server_certificate_expired">Server Certificate Expired</a></li>
     <li><a href="#server_certificate_not_yet_valid">Server Certificate Not Yet Valid</a></li>
     <li><a href="#domain_name_mismatch">Domain Name Mismatch</a></li>
   </ul>
 </div>
 
-<h3 id="web_site_certified_by_an_unknown_authority">Web Site Certified by an Unknown
+<h3 id="web_site_certified_by_an_unknown_authority">Website Certified by an Unknown
   Authority</h3>
 
 
-<p>Many web sites use certificates to identify themselves when you visit the site. If
+<p>Many websites use certificates to identify themselves when you visit the site. If
   Certificate Manager doesn't recognize the <a href="glossary.xhtml#certificate_authority">
-  certificate authority (CA)</a> that issued a web site's certificate, it displays an alert
+  certificate authority (CA)</a> that issued a website's certificate, it displays an alert
-  that allows you to examine the new web site certificate and decide what to do.</p>
+  that allows you to examine the new website certificate and decide what to do.</p>
 
 <ul>
-	<li><strong>Examine Certificate:</strong> Click this button to view the web site's
+	<li><strong>Examine Certificate:</strong> Click this button to view the website's
 	certificate.</li>
 </ul>
 
@@ -329,17 +329,17 @@ were encrypted with your corresponding public key.</p>
 <ul>
 
 	<li><strong>Accept this certificate permanently.</strong> Select this option to accept
-	  the certificate (despite the apparent problem) and connect to the web site.
+	  the certificate (despite the apparent problem) and connect to the website.
 	  Certificate Manager will recognize this certificate as legitimate identification until
 	  the certificate expires.</li>
 	<li><strong>Accept this certificate temporarily for this session.</strong> Select this
-	  option to accept the certificate temporarily and connect to the web site. Certificate
+	  option to accept the certificate temporarily and connect to the website. Certificate
 	  Manager will recognize this certificate as legitimate identification only until the
 	  next time you launch the browser. You may see the same alert the next time you attempt
-	  to visit the web site.</li>
+	  to visit the website.</li>
-	<li><strong>Do not accept this certificate and do not connect to this web site.</strong>
+	<li><strong>Do not accept this certificate and do not connect to this website.</strong>
-	  Select this option if you decide not to visit the web site at all. This option might be
+	  Select this option if you decide not to visit the website at all. This option might be
-	  appropriate, for example, if you perform financial transactions at the web site. In
+	  appropriate, for example, if you perform financial transactions at the website. In
 	  this case you might want to report the problem to the bank or other organization that
 	  runs the site and confirm that the site's certificate is valid before you go any
 	  further.</li>
@@ -355,7 +355,7 @@ were encrypted with your corresponding public key.</p>
   of any required intermediate CAs and if necessary, install the missing certificate in the
   server.</p>
 
-<p>If you decide to contact the web site's webmaster about this issue, you can include the
+<p>If you decide to contact the website's webmaster about this issue, you can include the
   following information:</p>
 
 <ul>
@@ -391,10 +391,10 @@ were encrypted with your corresponding public key.</p>
   time. When a certificate expires, the owner of the certificate needs to get a new
   one.</p>
 
-<p>Certificate Manager warns you when you attempt to visit a web site whose server
+<p>Certificate Manager warns you when you attempt to visit a website whose server
   certificate has expired. The first thing you should do is make sure the time and date
   displayed by your computer is correct. If your computer's clock is set to a date that is
-  after the expiration date, Certificate Manager treats the web site's certificate as
+  after the expiration date, Certificate Manager treats the website's certificate as
   expired. </p>
 
 <p>If your computer's clock is set correctly, you need to make a decision about whether to
@@ -422,7 +422,7 @@ were encrypted with your corresponding public key.</p>
   <a href="glossary.xhtml#certificate">certificate</a> is valid for a specified period of
   time.</p>
 
-<p>Certificate Manager warns you when you attempt to visit a web site whose server
+<p>Certificate Manager warns you when you attempt to visit a website whose server
   certificate's validity period has not yet started. The first thing you should do is make
   sure the time and date displayed by your own computer is correct. If your computer's clock
   is set to the wrong date, Certificate Manager may treat the server certificate as not yet
@@ -451,13 +451,13 @@ were encrypted with your corresponding public key.</p>
 
 <p>A server <a href="glossary.xhtml#certificate">certificate</a> specifies the name of the
   server in the form of the site's domain name. For example, the domain name for the Mozilla
-  web site is <tt>www.mozilla.org</tt>. If the domain name in a server's certificate
+  website is <tt>www.mozilla.org</tt>. If the domain name in a server's certificate
-  doesn't match the actual domain name of the web site, it may be a sign that someone is
+  doesn't match the actual domain name of the website, it may be a sign that someone is
-  attempting to intercept your communication with the web site.</p>
+  attempting to intercept your communication with the website.</p>
 
 <p>The decision whether to trust the site anyway depends on what you intend to do at the site
   and what else you know about it. Most commercial sites will make sure that the host name
-  for a web site certificate matches the web site's actual host name.</p>
+  for a website certificate matches the website's actual host name.</p>
 
 <p>You can take these actions from the Domain Name Mismatch dialog box:</p>
 
@@ -475,7 +475,7 @@ were encrypted with your corresponding public key.</p>
 </ul>
 
 <p>If you decide to accept the certificate anyway for this session, you should be cautious
-  about what you do on the web site, and you should treat any information you find there as
+  about what you do on the website, and you should treat any information you find there as
   potentially suspect.</p>
 
 </body>

suite/locales/en-US/chrome/common/help/certs_help.xhtml

@@ -43,7 +43,7 @@ these steps:</p>
 <ul>
 <li><a href="#your_certificates">Your Certificates</a></li>
 <li><a href="#other_peoples_certificates">Other People's Certificates</a></li>
-<li><a href="#web_site_certificates">Web Site Certificates</a></li>
+<li><a href="#web_site_certificates">Website Certificates</a></li>
 <li><a href="#authorities">Authorities</a></li>
 </ul>
 
@@ -123,7 +123,7 @@ their names.</li>
 
 <p>If someone obtains the file containing a certificate that you have backed up
   and successfully imports the certificate, that person can send messages or
-  access web sites while pretending to be you. This can be a problem, for
+  access websites while pretending to be you. This can be a problem, for
   example, if you digitally sign important email messages or manage your bank
   or investment accounts over the Internet.</p>
 
@@ -187,12 +187,12 @@ their names.</li>
   encrypted email to that person or to verify digital signatures on messages
   from that person.</p>
 
-<h2 id="web_site_certificates">Web Site Certificates</h2>
+<h2 id="web_site_certificates">Website Certificates</h2>
 
-<p>The Web Sites tab in the Certificate Manager displays certificates you have
+<p>The Websites tab in the Certificate Manager displays certificates you have
-  on file that identify web sites.</p>
+  on file that identify websites.</p>
 
-<p>Web site certificates are grouped under the names of the organizations that
+<p>Website certificates are grouped under the names of the organizations that
   issued them:</p>
 
 <ul>
@@ -211,19 +211,19 @@ their names.</li>
   certificates.</li>
 <li><strong>Edit:</strong> View or change the trust settings that Certificate
   Manager associates with the selected certificates. You can use these settings
-  to designate a web site certificate as one that you trust or don't trust for
+  to designate a website certificate as one that you trust or don't trust for
   identification purposes.</li>
 <li><strong>Delete:</strong> Delete the selected certificates.</li>
 </ul>
 
-<h3 id="edit_web_site_certificate_trust_settings">Edit Web Site Certificate
+<h3 id="edit_web_site_certificate_trust_settings">Edit Website Certificate
   Trust Settings</h3>
 
-<p>When you select a web site certificate from the
+<p>When you select a website certificate from the
-  <a href="#web_site_certificates">Web Sites</a> tab in the Certificate Manager
+  <a href="#web_site_certificates">Websites</a> tab in the Certificate Manager
-  and click Edit, you see a window entitled &quot;Edit web site certificate trust
+  and click Edit, you see a window entitled &quot;Edit website certificate trust
   settings&quot;. Here you specify whether you want to trust the selected
-  certificate for identifying the web site and setting up an encrypted
+  certificate for identifying the website and setting up an encrypted
   connection.</p>
 
 <p>The dialog box contains these elements:</p>
@@ -237,33 +237,33 @@ their names.</li>
   <ul>
   <li><strong>Trust the authenticity of this certificate:</strong> If you
     select this option, Certificate Manager will henceforth trust this
-    certificate for the purposes of identifying this web site or setting up an
+    certificate for the purposes of identifying this website or setting up an
     encrypted connection. If you select this option and then attempt to visit
-    the web site, your browser will access the site with few, if any,
+    the website, your browser will access the site with few, if any,
     warnings.</li>
   <li><strong>Do not trust the authenticity of this certificate:</strong>
     If you select this option, Certificate Manager will no longer trust this
-    certificate for the purposes of identifying this web site or setting up an
+    certificate for the purposes of identifying this website or setting up an
     encrypted connection. If you select this option and then attempt to visit
-    the web site, you will see one or more warning messages before you can
+    the website, you will see one or more warning messages before you can
     access the site.</li>
   </ul>
 </li>
 <li><strong>Edit CA Trust:</strong> Click this button to specify trust settings
-  for the certificate authority (CA) that issued the web site certificate.
+  for the certificate authority (CA) that issued the website certificate.
   These settings allow you to trust or not to trust different kinds of
   certificates issued by that certificate authority. For example, you can
-  choose to trust all web site certificates issued by the authority.</li>
+  choose to trust all website certificates issued by the authority.</li>
 </ul>
 
 <p>Click OK to confirm your choice.</p>
 
-<h3 id="delete_web_site_certificates">Delete Web Site Certificates</h3>
+<h3 id="delete_web_site_certificates">Delete Website Certificates</h3>
 
-<p>Before deleting a web site certificate from the
+<p>Before deleting a website certificate from the
-  <a href="#web_site_certificates">Web Sites</a> tab in the Certificate
+  <a href="#web_site_certificates">Websites</a> tab in the Certificate
   Manager, make sure that you won't need it again for the purposes of
-  identifying a web site and setting up an encrypted connection.</p>
+  identifying a website and setting up an encrypted connection.</p>
 
 <h2 id="authorities">Authorities</h2>
 
@@ -326,10 +326,10 @@ their names.</li>
 <p>The settings have these effects:</p>
 
 <ul>
-<li><strong>This certificate can identify web sites:</strong> Certificate
+<li><strong>This certificate can identify websites:</strong> Certificate
   Manager will trust certificates issued by this CA for the purpose of
-  identifying web sites and encrypting web site connections. If you deselect
+  identifying websites and encrypting website connections. If you deselect
-  this checkbox, Certificate Manager will not trust web site certificates
+  this checkbox, Certificate Manager will not trust website certificates
   issued by this CA.</li>
 <li><strong>This certificate can identify mail users:</strong> Certificate
   Manager will trust certificates issued by this CA for the purpose of signing

suite/locales/en-US/chrome/common/help/certs_prefs_help.xhtml

@@ -43,20 +43,20 @@
 
 <h3 id="client_certificate_selection">Client Certificate Selection</h3>
 
-<p>Some web sites require you to identify yourself with a certificate. The option you select
+<p>Some websites require you to identify yourself with a certificate. The option you select
   here determines how Navigator identifies the certificate to present among those you may
   have on file:</p>
 <ul>
 	<li><strong>Select Automatically:</strong> Click this option if you want Navigator to
 	  select a certificate without asking you. This is the default setting.</li>
 	<li><strong>Ask Every Time:</strong> Click this option if you want Navigator to ask you
-	  which certificate to use each time a web site requests one.</li>
+	  which certificate to use each time a website requests one.</li>
 </ul>
 
 <h3 id="manage_certificates">Manage Certificates</h3>
 
 <p>Certificates are the digital equivalent of ID cards&mdash;they help other people identify
-  you, and they help you identify other people, web sites, and organizations.</p>
+  you, and they help you identify other people, websites, and organizations.</p>
 
 <p>To examine or configure the certificates you have on file, click Manage Certificates.</p>
 

suite/locales/en-US/chrome/common/help/composer_help.xhtml

@@ -1653,7 +1653,7 @@ and Backgrounds</a></p>
 <p>Use the Page Properties dialog box to enter properties such as
 the title, author, and description of the document you're currently
 working on. This information is useful if you plan to use the page
-on a web site, since search engines use this type of information to
+on a website, since search engines use this type of information to
 index your page. You can view this information from the browser
 window by opening the View menu and choosing Page Info.</p>
 
@@ -2163,7 +2163,7 @@ program. You also must use an FTP program if you want to create
 subdirectories or to rename files on the web server. Ask your
 service provider if they recommend a particular FTP program. You
 can usually find information on FTP programs in the Help or Support
-sections of your service provider's web site. FTP programs are also
+sections of your service provider's website. FTP programs are also
 available from shareware sites such as ZDNet Downloads.</p>
 
 <p>[ <a href="#publish_top">Return to beginning of
@@ -2604,7 +2604,7 @@ name as a subdirectory at the publishing site.</li>
 delete subdirectories at the publishing site. Ask your service
 provider if they recommend a particular FTP program. You can
 usually find information on FTP programs in the Help or Support
-sections of your service provider's web site. FTP programs are also
+sections of your service provider's website. FTP programs are also
 available from shareware sites such as ZDNet Downloads.</li>
 
 <li>Don't use subdirectory names that end with ".html" or ".htm".
@@ -2662,8 +2662,8 @@ that you can successfully view the page
 hardware, telephone connections, modems, and network connections
 are functioning properly.</li>
 
-<li>Use the Navigator browser to try to view a page at the web site you are
+<li>Use the Navigator browser to try to view a page at the website you are
-attempting to publish to. If you can successfully view other web sites but
+attempting to publish to. If you can successfully view other websites but
 cannot view a page at the publishing site, your ISP or web hosting service
 may be experiencing technical problems.</li>
 
@@ -2761,7 +2761,7 @@ allocated to you by your ISP or web hosting service.</p>
 publishing site. Ask your service provider if they recommend a
 particular FTP program. You can usually find information on FTP
 programs in the Help or Support sections of your service provider's
-web site. FTP programs are also available from shareware sites such
+website. FTP programs are also available from shareware sites such
 as ZDNet Downloads.</li>
 
 <li>Find out from your ISP or web hosting service about increasing
@@ -2896,7 +2896,7 @@ published pages or images, you must use an FTP (File Transfer
 Protocol) program. Ask your service provider if they recommend a
 particular FTP program. You can usually find information on FTP
 programs in the Help or Support sections of your service provider's
-web site. FTP programs are also available from shareware sites such
+website. FTP programs are also available from shareware sites such
 as ZDNet Downloads.</p>
 
 <p>[ <a href="#publish_top">Return to beginning of
@@ -2945,7 +2945,7 @@ enter, ask your ISP or system administrator.</p>
 
 <li><b>HTTP address of your home page</b>: Specifies the complete
 address of your publishing home directory. This is the web address
-of the home page at your web site. Do not include a filename or
+of the home page at your website. Do not include a filename or
 subdirectory as part of the URL.</li>
 
 <li style="list-style-type: none; list-style-position: outside; list-style-image: none;">

suite/locales/en-US/chrome/common/help/cs_nav_prefs_appearance.xhtml

@@ -81,9 +81,9 @@ toolbar buttons.. </li>
 
 <li><b>Show Tooltips</b>: Select this if you want to have tips appear when the 
 cursor is placed over parts of the Mozilla user interface and some websites. 
-<li><b>Show Web Site Icons</b>: Select this if you want see site-specific icons, 
+<li><b>Show Website Icons</b>: Select this if you want see site-specific icons, 
 if available, in place of the bookmark icon <img src="chrome://communicator/skin/bookmarks/bookmark-item.gif" alt="Location Bar"
->. Web site icons are shown to the left of the Location Bar and Browser tabs. 
+>. Website icons are shown to the left of the Location Bar and Browser tabs. 
 </ul>
 <p>&nbsp;</p><hr>
 <a name="preferences:fontsIDX"></a> <a NAME="fonts"></a> 

suite/locales/en-US/chrome/common/help/cs_nav_prefs_navigator.xhtml

@@ -239,7 +239,7 @@ automatically complete text you previously entered into the Location bar. </li>
 </li>
 <ul>
 <li><b>Autocomplete best match as you type</b>: As you type in the Location Bar, 
-Mozilla will automatically complete your web address using the visited web site 
+Mozilla will automatically complete your web address using the visited website 
 it most closely matches.</li>
 <li><b>Show list of matching results</b>: As you type in the Location Bar, Mozilla 
 will show a drop-down list of matching visited web addresses.</li>
@@ -247,7 +247,7 @@ will show a drop-down list of matching visited web addresses.</li>
 you to search the default search engine for words you enter.</li>
 <li>
 <div align="center"><b>Match only website you've typed previously</b>: Shows 
-only web sites that you've typed in the Location Bar and not sites that were 
+only websites that you've typed in the Location Bar and not sites that were 
 opened in other ways, such as clicking a link on a web page.</div>
 </li>
 </ul>

suite/locales/en-US/chrome/common/help/cs_priv_prefs_popup.xhtml

@@ -38,25 +38,25 @@
 <p>When blocking a popup, &brandShortName; can be set up to play a sound, as
   well as display an icon
   <img src="chrome://navigator/skin/icons/popup-blocked.png" alt="Popup control
-  icon"></img> in the status bar. You can use this icon to add a web site
+  icon"></img> in the status bar. You can use this icon to add a website
   you're viewing to an exceptions list so that the site is allowed to again
   display popups.</p>
 
-<p><strong>Blocking popups may interfere with some web sites</strong>: Some web
+<p><strong>Blocking popups may interfere with some websites</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
+  Blocking all popups disables such features. To allow specific websites to
-  use popups, while blocking all others, you can add specific web sites to the
+  use popups, while blocking all others, you can add specific websites to the
   list of allowed sites. For more information, see
   <a href="#privacy_and_security_preferences_popup_windows">Privacy &amp;
   Security Preferences - Popup Windows</a>.</p>
 
 <p><strong>Blocking popups doesn't always work</strong>: Although
-  &brandShortName; blocks most popups, some web sites, even when blocked, may
+  &brandShortName; blocks most popups, some websites, even when blocked, may
   use other methods to show popups.</p>
 
-<p><strong>Allowing popups from certain web sites</strong>: After you've
+<p><strong>Allowing popups from certain websites</strong>: After you've
   enabled popup blocking, you can still allow specific sites to display popups.
-  Browse to the web site, and then from the Tools menu, choose Popup Manager,
+  Browse to the website, and then from the Tools menu, choose Popup Manager,
   and then choose Allow Popups From This Site.</p>
 
 <p>The next section describes how to control popups through preferences and
@@ -82,13 +82,13 @@
 <li><strong>Allowed Sites:</strong> Click this to view and edit the list of web
   sites that you want to allow to display popups.
 <ul>
-<li><strong>Allowed web sites</strong>: The list of allowed web sites appears
+<li><strong>Allowed websites</strong>: The list of allowed websites appears
-  when you click "Allowed Sites." You can add or remove web sites that should
+  when you click "Allowed Sites." You can add or remove websites that should
   be allowed to show popups.</li>
-<li><strong>Add</strong>: Click this after typing in a web site that you want
+<li><strong>Add</strong>: Click this after typing in a website that you want
   to add to the list.</li>
-<li><strong>Remove</strong>: Click this to remove a selected web site.</li>
+<li><strong>Remove</strong>: Click this to remove a selected website.</li>
-<li><strong>Remove All</strong>: Click this to remove all of the web sites in
+<li><strong>Remove All</strong>: Click this to remove all of the websites in
   the current list.</li></ul></li></ul>
 
 <h3>When a popup window has been blocked</h3>
@@ -107,18 +107,18 @@
   alt="Popup control icon"></img> in the Navigator status bar to indicate that
   a popup is blocked. <strong>Note</strong>: After the popup control icon
   <img src="chrome://navigator/skin/icons/popup-blocked.png" alt="Popup control
-  icon"></img> appears, it remains visible until you visit another web site.
+  icon"></img> appears, it remains visible until you visit another website.
   </li></ul>
 
-<p><strong>Using the popup control icon to add allowed web sites</strong>: You
+<p><strong>Using the popup control icon to add allowed websites</strong>: You
-  can use the popup control icon to quickly add a web site to the list of
+  can use the popup control icon to quickly add a website to the list of
-  allowed web sites. Click the icon
+  allowed websites. Click the icon
   <img src="chrome://navigator/skin/icons/popup-blocked.png" alt="Popup control
-  icon"></img> to open the list of allowed web sites. The current web site is
+  icon"></img> to open the list of allowed websites. The current website is
   already filled in. Click Add and then click OK to confirm your addition.</p>
 
 <p><strong>Note</strong>: Blocking popups may not always work and may interfere
-  with some web sites. For more information about blocking popups, see
+  with some websites. For more information about blocking popups, see
   <a href="#controlling_popups">Controlling Popups</a>.</p>
 
 <p>Copyright &copy; 2003-2004 The Mozilla Foundation.</p>

suite/locales/en-US/chrome/common/help/customize_help.xhtml

@@ -560,7 +560,7 @@ Personal Toolbar Bookmark Folders</a>&quot; for more information on adding bookm
 marks folder to the Personal Toolbar. 
 </ol>
 <p><b>Note</b>: The bookmark icon <img src="chrome://communicator/skin/bookmarks/bookmark-item.gif" alt="image of bookmark icon"
-> may appear as another page-specific icon if you have checked Show Web Site 
+> may appear as another page-specific icon if you have checked Show Website 
 Icons in preferences. See <a href="cs_nav_prefs_appearance.html#appearance">Appearance 
 Preferences - Appearance</a> for more information on changing this preferences.</p>
 <p>Each item in the Personal Toolbar folder appears as a toolbar button. You 
@@ -631,7 +631,7 @@ see <a href="#cust_taskbar">Component Bar</a>.</li>
 <li>Status information: Displays information like the web-page URL and load status 
 information.</li>
 <li>Cookie notification icon <img src="chrome://cookie/content/taskbar-cookie.gif" alt="cookie notification icon">: 
-Appears when a web site has used a cookie in a way that requires you to be notified. 
+Appears when a website has used a cookie in a way that requires you to be notified. 
 For more information, see <a href="using_priv_help.html#cookie_notify">Cookie 
 Notification</a>.</li>
 <li>Work Offline <img src="chrome://communicator/skin/icons/offline.gif" alt="work offline icon"> 
@@ -727,7 +727,7 @@ your list of bookmarks any way you want.</p>
 <a NAME="cust_bkmk_create"></a> 
 <a name="bookmarks:creating_bookmarksIDX"></a> 
 <h2>Creating New Bookmarks</h2>
-<p>You can bookmark your favorite web sites to make it easy to return to them.</p>
+<p>You can bookmark your favorite websites to make it easy to return to them.</p>
 <p>To bookmark the current page, perform one of these steps:</p>
 <ul>
 <li>To add a bookmark to the Bookmarks menu, open the Bookmarks menu and choose 
@@ -785,7 +785,7 @@ the Bookmarks tab, and drag the bookmark icon <img src="chrome://communicator/sk
 <p><b>Note</b>s:</p>
 <ul>
 <li>The bookmark icon <img src="chrome://communicator/skin/bookmarks/bookmark-item.gif" alt="image of bookmark icon"
-> may appear as another page-specific icon if you have checked Show Web Site 
+> may appear as another page-specific icon if you have checked Show Website 
 Icons in preferences. See <a href="cs_nav_prefs_appearance.html#appearance">Appearance 
 Preferences - Appearance</a> for more information on changing this preferences.</li>
 <li>After adding a bookmark using any of the methods listed above, it can be 
@@ -857,7 +857,7 @@ designate a new bookmarks folder.</p>
 <p>You can rename the bookmark (the name appears in your bookmark list), add 
 descriptive information, or set a keyword. (You can type a bookmark's keyword 
 into the location field to go to the bookmarked site.) 
-<p>You can also set Mozilla to check bookmarked web sites for changes.</p>
+<p>You can also set Mozilla to check bookmarked websites for changes.</p>
 <ol>
 <li>Open the Bookmarks menu and choose Manage Bookmarks.</li>
 <li>In your Bookmarks window, click a bookmark.</li>

suite/locales/en-US/chrome/common/help/glossary.xhtml

@@ -165,13 +165,13 @@
   Newsgroups, Instant Messenger, and so on.</dd>
   
 <dt id="cookie">cookie</dt><dd>A small bit of information stored
-  on your computer by some web sites. When you visit such a site, the site asks
+  on your computer by some websites. When you visit such a site, the site asks
   your browser to place one or more cookies on your hard disk. Later, when you
   return to the site, your browser sends the site the cookies that belong to
-  it. Cookies help web sites keep track of information about you, such as the
+  it. Cookies help websites keep track of information about you, such as the
   contents of your shopping cart. You can set your cookie preferences to
   control how cookies are used and how much information you are willing to let
-  web sites store on them. See also <a href="#foreign_cookie">foreign
+  websites store on them. See also <a href="#foreign_cookie">foreign
   cookie</a>.</dd>
   
 <dt id="cookie_manager">Cookie Manager</dt><dd>The part of the browser
@@ -185,7 +185,7 @@
 <dt id="cryptography">cryptography</dt><dd>
   The art and practice of scrambling (encrypting) and unscrambling (decrypting)
   information. For example, cryptographic techniques are used to scramble an
-  unscramble information flowing between commercial web sites and your browser.
+  unscramble information flowing between commercial websites and your browser.
   See also <a href="#public-key_cryptography">public-key cryptography</a>.</dd>
   
 <dt id="decryption">decryption</dt><dd>
@@ -268,15 +268,15 @@
   
 <dt id="foreign_cookie">foreign cookie</dt><dd>A cookie from one
   site that gets stored on your computer when you visit a different site.
-  Sometimes a web site displays content that is hosted on another web site.
+  Sometimes a website displays content that is hosted on another website.
   That content can be anything from an image to text or an advertisement. The
-  second web site that hosts such elements also has the ability to store a
+  second website that hosts such elements also has the ability to store a
   cookie in your browser, even though you don't visit it directly. Also known
   as &quot;third-party cookie.&quot;</dd>
   
 <dt id="form_manager">Form Manager</dt><dd>The part of the browser
   that can help you save the personal data you enter into online forms, such as
-  your name, address, phone, and so on. Then, when a web site presents you with
+  your name, address, phone, and so on. Then, when a website presents you with
   a form, Form Manager can fill it in automatically.</dd>
   
 <dt id="helper_application">helper application</dt><dd>Any application
@@ -291,7 +291,7 @@
   
 <dt id="home_page">home page</dt><dd>The page your browser is set
   to display every time you launch it or when you click the Home button. Also
-  used to refer to the main page for a web site, from which you can explore the
+  used to refer to the main page for a website, from which you can explore the
   rest of the site.</dd>
   
 <dt id="hypertext_markup_language">Hypertext Markup Language
@@ -301,10 +301,10 @@
   
 <dt id="implicit_consent">implicit consent</dt><dd>Also known as
   implied or &quot;opt-out&quot; consent. Used to describe privacy settings
-  that may allow web sites to gather information about you (for example by
+  that may allow websites to gather information about you (for example by
   means of <a href="#cookie">cookies</a> and online forms) unless you
   explicitly choose to withhold your consent by selecting an option on a page
-  that the web site provides for that purpose. Your consent may not be
+  that the website provides for that purpose. Your consent may not be
   requested when the information is actually gathered.</dd>
   
 <dt id="internet_message_access_protocol">Internet Message Access Protocol
@@ -368,7 +368,7 @@
 
   A symmetric key used by Certificate Manager to encrypt information. For
   example, Password Manager uses Certificate Manager and your master key to
-  encrypt email passwords, web site passwords, and other stored sensitive
+  encrypt email passwords, website passwords, and other stored sensitive
   information. See also <a href="#symmetric_encryption">symmetric
   encryption</a>.</dd>
   
@@ -376,7 +376,7 @@
   Certificate Manager to protect the master key and/or private keys stored on a
   <a href="#security_device">security device</a>. Certificate Manager needs to
   access your private keys, for example, when you sign email messages or use
-  one of your own certificates to identify yourself to a web site. It needs to
+  one of your own certificates to identify yourself to a website. It needs to
   access your master key when Password Manager or Form Manager reads or adds to
   your personal information. You can set or change your master password from
   the Master Passwords preferences panel. Each security device requires a
@@ -384,7 +384,7 @@
   <a href="#master_key">master key</a>.</dd>
   
 <dt id="misrepresentation">misrepresentation</dt><dd>Presentation of an entity
-  as a person or organization that it is not. For example, a web site might
+  as a person or organization that it is not. For example, a website might
   pretend to be a furniture store when it is really just a site that takes
   credit card payments but never sends any goods. See also
   <a href="#spoofing">spoofing</a>.</dd>
@@ -414,7 +414,7 @@
   that Certificate Manager follows to perform an online check of a
   certificate's validity each time the certificate is used. This process
   involves checking the certificate against a list of valid certificates
-  maintained at a specified web site. Your computer must be online for OCSP to
+  maintained at a specified website. Your computer must be online for OCSP to
   work.</dd>
   
 <dt id="p3p">
@@ -459,7 +459,7 @@
 <dt id="platform_for_privacy_preferences">Platform for Privacy Preferences
   (P3P)</dt><dd>A standard published by the World Wide Web Consortium (W3C)
   designed to help users to gain more control over the use of personal
-  information by Web sites they visit. For general information on the standard
+  information by Websites they visit. For general information on the standard
   itself, see the online document <a href="http://www.w3.org/P3P/"
   target="_blank">P3P Public Overview</a>.</dd>
   
@@ -607,7 +607,7 @@
   device</a> used by Certificate Manager to store private keys associated with
   your certificates. In addition to private keys, the software security device
   stores the master key used by Password Manager to encrypt email passwords,
-  web site passwords, and other sensitive information. See also
+  website passwords, and other sensitive information. See also
 <a href="#private_key">private
   key</a> and <a href="#master_password">master key</a>.</dd>
   
@@ -692,10 +692,10 @@
   Wide Web that is specified by a unique address or URL and that may contain
   text, hyperlinks, and graphics.</dd>
   
-<dt id="web_site">web site</dt><dd>A group of related web pages linked by
+<dt id="web_site">website</dt><dd>A group of related web pages linked by
   hyperlinks and managed by a single company, organization, or individual. A
-  web site may include text, graphics, audio and video files, and links to
+  website may include text, graphics, audio and video files, and links to
-  other web sites.</dd>
+  other websites.</dd>
   
 <dt id="world_wide_web">World Wide Web</dt><dd>Also known as the
   Web. A portion of the Internet that is made up of web pages stored by web

suite/locales/en-US/chrome/common/help/help-glossary.rdf

@@ -111,7 +111,7 @@
         <rdf:li> <rdf:Description nc:name="trust" nc:link="glossary.xhtml#trust"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="Uniform Resource Locator (URL)" nc:link="glossary.xhtml#uniform_resource_locator"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="web page" nc:link="glossary.xhtml#web_page"/> </rdf:li>
-        <rdf:li> <rdf:Description nc:name="web site" nc:link="glossary.xhtml#web_site"/> </rdf:li>
+        <rdf:li> <rdf:Description nc:name="website" nc:link="glossary.xhtml#web_site"/> </rdf:li>
         <rdf:li> <rdf:Description nc:name="World Wide Web" nc:link="glossary.xhtml#world_wide_web"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>

suite/locales/en-US/chrome/common/help/help-index1.rdf

@@ -289,7 +289,7 @@
      </rdf:li>
      <rdf:li>
        <rdf:Description ID="Certificates:web_site"
-         nc:name="web site identity"
+         nc:name="website identity"
 	 nc:link="using_certs_help.html#certificates:web_siteIDX"/>
      </rdf:li>
      <rdf:li>

suite/locales/en-US/chrome/common/help/suite-toc.rdf

@@ -796,7 +796,7 @@
 <rdf:Description about="#privacy-doc">
     <nc:subheadings>
       <rdf:Seq>
-        <rdf:li><rdf:Description ID="privacy-doc-visit" nc:name="What Information Does My Browser Give to a Web Site?"  		nc:link="chrome://help/locale/privacy_help.xhtml#what_information_does_my_browser_give_to_a_web_site"/> </rdf:li>
+        <rdf:li><rdf:Description ID="privacy-doc-visit" nc:name="What Information Does My Browser Give to a Website?"  		nc:link="chrome://help/locale/privacy_help.xhtml#what_information_does_my_browser_give_to_a_web_site"/> </rdf:li>
         <rdf:li><rdf:Description ID="privacy-doc-cookies" nc:name="What Are Cookies, and How Do They Work?"  		nc:link="chrome://help/locale/privacy_help.xhtml#what_are_cookies_and_how_do_they_work"/> </rdf:li>
         <rdf:li><rdf:Description ID="privacy-doc-email" nc:name="How Can I Control Web Pages in Email Messages?"  		nc:link="chrome://help/locale/privacy_help.xhtml#how_can_i_control_web_pages_in_email_messages"/> </rdf:li>
         <rdf:li><rdf:Description ID="privacy-doc-unauth" nc:name="How Do I Make Sure Unauthorized People Don't Use Information About Me?"  		nc:link="chrome://help/locale/privacy_help.xhtml#how_do_i_make_sure_unauthorized_people_dont_use_information_about_me"/> </rdf:li>
@@ -972,7 +972,7 @@
       <rdf:Seq>
         <rdf:li><rdf:Description ID="using-help-certs-manage-my" nc:name="That Identify You" nc:link="chrome://help/locale/using_certs_help.html#using_certs_my"/> </rdf:li>
         <rdf:li><rdf:Description ID="using-help-certs-manage-others" nc:name="That Identify Others" nc:link="chrome://help/locale/using_certs_help.html#using_certs_others"/> </rdf:li>
-        <rdf:li><rdf:Description ID="using-help-certs-manage-sites" nc:name="That Identify Web Sites" nc:link="chrome://help/locale/using_certs_help.html#using_certs_sites"/> </rdf:li>
+        <rdf:li><rdf:Description ID="using-help-certs-manage-sites" nc:name="That Identify Websites" nc:link="chrome://help/locale/using_certs_help.html#using_certs_sites"/> </rdf:li>
         <rdf:li><rdf:Description ID="using-help-certs-manage-cas" nc:name="That Identify CAs" nc:link="chrome://help/locale/using_certs_help.html#using_certs_cas"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
@@ -1058,7 +1058,7 @@
       <rdf:Seq>
         <rdf:li><rdf:Description ID="my_certs" nc:name="Your Certificates" nc:link="chrome://help/locale/certs_help.xhtml#your_certificates"/> </rdf:li>
         <rdf:li><rdf:Description ID="others_certs" nc:name="Other People's Certificates" nc:link="chrome://help/locale/certs_help.xhtml#other_peoples_certificates"/> </rdf:li>
-        <rdf:li><rdf:Description ID="web_certs" nc:name="Web Site Certificates" nc:link="chrome://help/locale/certs_help.xhtml#web_site_certificates"/> </rdf:li>
+        <rdf:li><rdf:Description ID="web_certs" nc:name="Website Certificates" nc:link="chrome://help/locale/certs_help.xhtml#web_site_certificates"/> </rdf:li>
         <rdf:li><rdf:Description ID="ca_certs" nc:name="Authorities" nc:link="chrome://help/locale/certs_help.xhtml#authorities"/> </rdf:li>
 
       </rdf:Seq>
@@ -1085,8 +1085,8 @@
 <rdf:Description about="#web_certs">
     <nc:subheadings>
       <rdf:Seq>
-        <rdf:li><rdf:Description ID="edit_web_certs" nc:name="Edit Web Site Certificate Settings" nc:link="chrome://help/locale/certs_help.xhtml#edit_web_site_certificate_trust_settings"/> </rdf:li>
+        <rdf:li><rdf:Description ID="edit_web_certs" nc:name="Edit Website Certificate Settings" nc:link="chrome://help/locale/certs_help.xhtml#edit_web_site_certificate_trust_settings"/> </rdf:li>
-        <rdf:li><rdf:Description ID="delete_web_certs" nc:name="Delete Web Site Certificate" nc:link="chrome://help/locale/certs_help.xhtml#delete_web_site_certificates"/> </rdf:li>
+        <rdf:li><rdf:Description ID="delete_web_certs" nc:name="Delete Website Certificate" nc:link="chrome://help/locale/certs_help.xhtml#delete_web_site_certificates"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
@@ -1110,7 +1110,7 @@
         <rdf:li><rdf:Description ID="backup_your_cert" nc:name="Certificate Backup" nc:link="chrome://help/locale/cert_dialog_help.xhtml#certificate_backup"/> </rdf:li>
         <rdf:li><rdf:Description ID="which_cert" nc:name="User Identification Request" nc:link="chrome://help/locale/cert_dialog_help.xhtml#user_identification_request"/> </rdf:li>
         <rdf:li><rdf:Description ID="new_ca" nc:name="New Certificate Authority" nc:link="chrome://help/locale/cert_dialog_help.xhtml#new_certificate_authority"/> </rdf:li>
-        <rdf:li><rdf:Description ID="cert-dialog-help-website" nc:name="Web Site Certificates" nc:link="chrome://help/locale/cert_dialog_help.xhtml#web_site_certificates"/> </rdf:li>
+        <rdf:li><rdf:Description ID="cert-dialog-help-website" nc:name="Website Certificates" nc:link="chrome://help/locale/cert_dialog_help.xhtml#web_site_certificates"/> </rdf:li>
       </rdf:Seq>
     </nc:subheadings>
   </rdf:Description>
@@ -1127,7 +1127,7 @@
 <rdf:Description about="#cert-dialog-help-website">
     <nc:subheadings>
       <rdf:Seq>
-        <rdf:li><rdf:Description ID="new_web_cert" nc:name="Web Site Certified by an Unknown Authority" nc:link="chrome://help/locale/cert_dialog_help.xhtml#web_site_certified_by_an_unknown_authority"/> </rdf:li>
+        <rdf:li><rdf:Description ID="new_web_cert" nc:name="Website Certified by an Unknown Authority" nc:link="chrome://help/locale/cert_dialog_help.xhtml#web_site_certified_by_an_unknown_authority"/> </rdf:li>
         <rdf:li><rdf:Description ID="exp_web_cert" nc:name="Server Certificate Expired" nc:link="chrome://help/locale/cert_dialog_help.xhtml#server_certificate_expired"/> </rdf:li>
         <rdf:li><rdf:Description ID="not_yet_web_cert" nc:name="Server Certificate Not Yet Valid" nc:link="chrome://help/locale/cert_dialog_help.xhtml#server_certificate_not_yet_valid"/> </rdf:li>
         <rdf:li><rdf:Description ID="bad_name_web_cert" nc:name="Domain Name Mismatch" nc:link="chrome://help/locale/cert_dialog_help.xhtml#domain_name_mismatch"/> </rdf:li>