Bug 685302 - Use "website" instead of "web site" consistently across all strings in the UI. r=dao

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

@@ -296,7 +296,7 @@ can reach it easily. -->
 <!ENTITY appMenuSafeMode.accesskey "R">
 
 <!ENTITY openCmd.commandkey           "l">
-<!ENTITY urlbar.placeholder           "Go to a Web Site">
+<!ENTITY urlbar.placeholder           "Go to a Website">
 <!ENTITY urlbar.accesskey             "d">
 <!ENTITY urlbar.switchToTab.label     "Switch to tab:">
 

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

@@ -111,7 +111,7 @@
 <!ENTITY  securityView.unknown   "Unknown">
 
 
-<!ENTITY  securityView.identity.header   "Web Site Identity">
+<!ENTITY  securityView.identity.header   "Website Identity">
 <!ENTITY  securityView.identity.owner    "Owner:">
 <!ENTITY  securityView.identity.domain   "Website:">
 <!ENTITY  securityView.identity.verifier "Verified by:">

browser/locales/en-US/chrome/browser/preferences/privacy.dtd

@@ -42,7 +42,7 @@
 <!ENTITY  historyHeader.custom.label       "Use custom settings for history">
 <!ENTITY  historyHeader.post.label         "">
 
-<!ENTITY  rememberDescription.label      "&brandShortName; will remember your browsing, download, form and search history, and keep cookies from Web sites you visit.">
+<!ENTITY  rememberDescription.label      "&brandShortName; will remember your browsing, download, form and search history, and keep cookies from websites you visit.">
 
 <!-- LOCALIZATION NOTE (rememberActions.pre.label): include a trailing space as needed -->
 <!-- LOCALIZATION NOTE (rememberActions.middle.label): include a starting and trailing space as needed -->

security/manager/locales/en-US/chrome/pippki/pippki.properties

@@ -98,8 +98,8 @@ clientAuthMessage1=Organization: "%S"
 clientAuthMessage2=Issued Under: "%S"
 
 #Page Info
-pageInfo_SiteNotVerified=Web Site Identity Not Verified
-pageInfo_WebSiteVerified=Web Site Identity Verified
+pageInfo_SiteNotVerified=Website Identity Not Verified
+pageInfo_WebSiteVerified=Website Identity Verified
 pageInfo_Identity_Verified=The website %S supports authentication for the page you are viewing. The identity of this website has been verified by %S, a certificate authority you trust for this purpose.
 pageInfo_ViewCertificate=View the security certificate that verifies this website's identity.
 pageInfo_NoEncryption=Connection Not Encrypted

toolkit/locales/en-US/chrome/global/aboutRights.dtd

@@ -38,7 +38,7 @@
 
 <!-- point 4 text for unbranded builds -->
 <!ENTITY rights.intro-point4a-unbranded "If this product incorporates web services, any applicable service terms for the service(s) should be linked to the ">
-<!ENTITY rights.intro-point4b-unbranded "Web Site Services">
+<!ENTITY rights.intro-point4b-unbranded "Website Services">
 <!ENTITY rights.intro-point4c-unbranded " section.">
 
 <!ENTITY rights2.webservices-header "&brandFullName; Web-Based Information Services">