Pontoon: Update English (Canada) (en-CA) localization of Firefox
authorKohei Yoshino <kohei.yoshino@gmail.com>
Mon, 06 Aug 2018 03:53:37 +0000
changeset 850 21452305e9aa248343974dc46229cc29544b985f
parent 849 d040595e2a4bf99af37e767215da28edb23f3156
child 851 b6a95e24f0b52be7616af57e70cc58fa2663af86
push id43
push userpontoon@mozilla.com
push dateMon, 06 Aug 2018 03:53:40 +0000
Pontoon: Update English (Canada) (en-CA) localization of Firefox Localization authors: - Kohei Yoshino <kohei.yoshino@gmail.com>
browser/browser/preferences/blocklists.ftl
browser/browser/preferences/clearSiteData.ftl
browser/browser/preferences/permissions.ftl
browser/browser/preferences/preferences.ftl
browser/browser/preferences/siteDataSettings.ftl
browser/browser/preferences/translation.ftl
browser/chrome/browser/aboutPrivateBrowsing.dtd
browser/chrome/browser/browser.dtd
browser/chrome/browser/browser.properties
browser/chrome/browser/pageInfo.dtd
browser/chrome/browser/pageInfo.properties
browser/chrome/browser/preferences/preferences.properties
browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
browser/chrome/browser/sanitize.dtd
browser/chrome/browser/siteData.properties
browser/chrome/overrides/appstrings.properties
browser/chrome/overrides/netError.dtd
browser/extensions/onboarding/onboarding.properties
browser/installer/custom.properties
browser/installer/nsisstrings.properties
devtools/client/appcacheutils.properties
devtools/shared/gclicommands.properties
devtools/startup/aboutdevtools.dtd
dom/chrome/appstrings.properties
dom/chrome/netError.dtd
dom/chrome/nsWebBrowserPersist.properties
netwerk/necko.properties
security/manager/chrome/pippki/certManager.dtd
security/manager/chrome/pippki/pippki.dtd
security/manager/chrome/pippki/pippki.properties
toolkit/chrome/global/aboutRights.dtd
toolkit/chrome/global/aboutSupport.dtd
toolkit/chrome/global/commonDialogs.properties
--- a/browser/browser/preferences/blocklists.ftl
+++ b/browser/browser/preferences/blocklists.ftl
@@ -20,11 +20,11 @@ blocklist-button-ok =
 # It combines the list name and description.
 # e.g. "Standard (Recommended). This list does a pretty good job."
 #
 # Variables:
 #   $listName {string, "Standard (Recommended)."} - List name.
 #   $description {string, "This list does a pretty good job."} - Description of the list.
 blocklist-item-list-template = { $listName } { $description }
 blocklist-item-moz-std-name = Disconnect.me basic protection (Recommended).
-blocklist-item-moz-std-desc = Allows some trackers so web sites function properly.
+blocklist-item-moz-std-desc = Allows some trackers so websites function properly.
 blocklist-item-moz-full-name = Disconnect.me strict protection.
-blocklist-item-moz-full-desc = Blocks known trackers. Some web sites may not function properly.
+blocklist-item-moz-full-desc = Blocks known trackers. Some websites may not function properly.
--- a/browser/browser/preferences/clearSiteData.ftl
+++ b/browser/browser/preferences/clearSiteData.ftl
@@ -1,16 +1,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 clear-site-data-window =
     .title = Clear Data
     .style = width: 35em
-clear-site-data-description = Clearing all cookies and site data stored by { -brand-short-name } may sign you out of web sites and remove offline web content. Clearing cache data will not affect your logins.
+clear-site-data-description = Clearing all cookies and site data stored by { -brand-short-name } may sign you out of websites and remove offline web content. Clearing cache data will not affect your logins.
 clear-site-data-close-key =
     .key = w
 # The parameters in parentheses in this string describe disk usage
 # in the format ($amount $unit), e.g. "Cookies and Site Data (24 KB)"
 # Variables:
 #   $amount (Number) - Amount of site data currently stored on disk
 #   $unit (String) - Abbreviation of the unit that $amount is in, e.g. "MB"
 clear-site-data-cookies-with-data =
@@ -19,32 +19,32 @@ clear-site-data-cookies-with-data =
 # This string is a placeholder for while the data used to fill
 # clear-site-data-cookies-with-data is loading. This placeholder is usually
 # only shown for a very short time (< 1s), so it should be very similar
 # or the same as clear-site-data-cookies-with-data (except the amount and unit),
 # to avoid flickering.
 clear-site-data-cookies-empty =
     .label = Cookies and Site Data
     .accesskey = S
-clear-site-data-cookies-info = You may get signed out of web sites if cleared
+clear-site-data-cookies-info = You may get signed out of websites if cleared
 # The parameters in parentheses in this string describe disk usage
 # in the format ($amount $unit), e.g. "Cached Web Content (24 KB)"
 # Variables:
 #   $amount (Number) - Amount of cache currently stored on disk
 #   $unit (String) - Abbreviation of the unit that $amount is in, e.g. "MB"
 clear-site-data-cache-with-data =
     .label = Cached Web Content ({ $amount } { $unit })
     .accesskey = W
 # This string is a placeholder for while the data used to fill
 # clear-site-data-cache-with-data is loading. This placeholder is usually
 # only shown for a very short time (< 1s), so it should be very similar
 # or the same as clear-site-data-cache-with-data (except the amount and unit),
 # to avoid flickering.
 clear-site-data-cache-empty =
     .label = Cached Web Content
     .accesskey = W
-clear-site-data-cache-info = Will require web sites to reload images and data
+clear-site-data-cache-info = Will require websites to reload images and data
 clear-site-data-cancel =
     .label = Cancel
     .accesskey = C
 clear-site-data-clear =
     .label = Clear
     .accesskey = l
--- a/browser/browser/preferences/permissions.ftl
+++ b/browser/browser/preferences/permissions.ftl
@@ -2,45 +2,45 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 permissions-window =
     .title = Exceptions
     .style = width: 36em
 permissions-close-key =
     .key = w
-permissions-address = Address of web site
+permissions-address = Address of website
     .accesskey = d
 permissions-block =
     .label = Block
     .accesskey = B
 permissions-session =
     .label = Allow for Session
     .accesskey = S
 permissions-allow =
     .label = Allow
     .accesskey = A
 permissions-site-name =
-    .label = Web Site
+    .label = Website
 permissions-status =
     .label = Status
 permissions-remove =
-    .label = Remove Web Site
+    .label = Remove Website
     .accesskey = R
 permissions-remove-all =
-    .label = Remove All Web Sites
+    .label = Remove All Websites
     .accesskey = e
 permissions-button-cancel =
     .label = Cancel
     .accesskey = C
 permissions-button-ok =
     .label = Save Changes
     .accesskey = S
 permissions-searchbox =
-    .placeholder = Search Web Site
+    .placeholder = Search Website
 permissions-capabilities-allow =
     .label = Allow
 permissions-capabilities-block =
     .label = Block
 permissions-capabilities-prompt =
     .label = Always Ask
 
 ## Invalid Hostname Dialog
@@ -48,85 +48,85 @@ permissions-capabilities-prompt =
 permissions-invalid-uri-title = Invalid Hostname Entered
 permissions-invalid-uri-label = Please enter a valid hostname
 
 ## Exceptions - Tracking Protection
 
 permissions-exceptions-tracking-protection-window =
     .title = Exceptions - Tracking Protection
     .style = { permissions-window.style }
-permissions-exceptions-tracking-protection-desc = You have disabled Tracking Protection on these web sites.
+permissions-exceptions-tracking-protection-desc = You have disabled Tracking Protection on these websites.
 
 ## Exceptions - Cookies
 
 permissions-exceptions-cookie-window =
     .title = Exceptions - Cookies and Site Data
     .style = { permissions-window.style }
-permissions-exceptions-cookie-desc = You can specify which web sites are always or never allowed to use cookies and site data.  Type the exact address of the site you want to manage and then click Block, Allow for Session, or Allow.
+permissions-exceptions-cookie-desc = You can specify which websites are always or never allowed to use cookies and site data.  Type the exact address of the site you want to manage and then click Block, Allow for Session, or Allow.
 
 ## Exceptions - Pop-ups
 
 permissions-exceptions-popup-window =
-    .title = Allowed Web Sites - Pop-ups
+    .title = Allowed Websites - Pop-ups
     .style = { permissions-window.style }
-permissions-exceptions-popup-desc = 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.
+permissions-exceptions-popup-desc = You can specify which websites are allowed to open pop-up windows. Type the exact address of the site you want to allow and then click Allow.
 
 ## Exceptions - Saved Logins
 
 permissions-exceptions-saved-logins-window =
     .title = Exceptions - Saved Logins
     .style = { permissions-window.style }
-permissions-exceptions-saved-logins-desc = Logins for the following web sites will not be saved
+permissions-exceptions-saved-logins-desc = Logins for the following websites will not be saved
 
 ## Exceptions - Add-ons
 
 permissions-exceptions-addons-window =
-    .title = Allowed Web Sites - Add-ons Installation
+    .title = Allowed Websites - Add-ons Installation
     .style = { permissions-window.style }
-permissions-exceptions-addons-desc = 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.
+permissions-exceptions-addons-desc = You can specify which websites are allowed to install add-ons. Type the exact address of the site you want to allow and then click Allow.
 
 ## Exceptions - Autoplay Media
 
 permissions-exceptions-autoplay-media-window =
     .title = Allowed Websites - Autoplay
     .style = { permissions-window.style }
 permissions-exceptions-autoplay-media-desc = You can specify which websites are allowed to automatically play media elements. Type the exact address of the site you want to allow and then click Allow.
 permissions-exceptions-autoplay-media-desc2 = You can specify which websites are always or never allowed to autoplay media with sound. Type the address of the site you want to manage and then click Block or Allow.
 
 ## Site Permissions - Notifications
 
 permissions-site-notification-window =
     .title = Settings - Notification Permissions
     .style = { permissions-window.style }
-permissions-site-notification-desc = The following web sites have requested to send you notifications. You can specify which web sites are allowed to send you notifications. You can also block new requests asking to allow notifications.
+permissions-site-notification-desc = The following websites have requested to send you notifications. You can specify which websites are allowed to send you notifications. You can also block new requests asking to allow notifications.
 permissions-site-notification-disable-label =
     .label = Block new requests asking to allow notifications
-permissions-site-notification-disable-desc = This will prevent any web sites not listed above from requesting permission to send notifications. Blocking notifications may break some web site features.
+permissions-site-notification-disable-desc = This will prevent any websites not listed above from requesting permission to send notifications. Blocking notifications may break some website features.
 
 ## Site Permissions - Location
 
 permissions-site-location-window =
     .title = Settings - Location Permissions
     .style = { permissions-window.style }
-permissions-site-location-desc = The following web sites have requested to access your location. You can specify which web sites are allowed to access your location. You can also block new requests asking to access your location.
+permissions-site-location-desc = The following websites have requested to access your location. You can specify which websites are allowed to access your location. You can also block new requests asking to access your location.
 permissions-site-location-disable-label =
     .label = Block new requests asking to access your location
-permissions-site-location-disable-desc = This will prevent any web sites not listed above from requesting permission to access your location. Blocking access to your location may break some web site features.
+permissions-site-location-disable-desc = This will prevent any websites not listed above from requesting permission to access your location. Blocking access to your location may break some website features.
 
 ## Site Permissions - Camera
 
 permissions-site-camera-window =
     .title = Settings - Camera Permissions
     .style = { permissions-window.style }
-permissions-site-camera-desc = The following web sites have requested to access your camera. You can specify which web sites are allowed to access your camera. You can also block new requests asking to access your camera.
+permissions-site-camera-desc = The following websites have requested to access your camera. You can specify which websites are allowed to access your camera. You can also block new requests asking to access your camera.
 permissions-site-camera-disable-label =
     .label = Block new requests asking to access your camera
-permissions-site-camera-disable-desc = This will prevent any web sites not listed above from requesting permission to access your camera. Blocking access to your camera may break some web site features.
+permissions-site-camera-disable-desc = This will prevent any websites not listed above from requesting permission to access your camera. Blocking access to your camera may break some website features.
 
 ## Site Permissions - Microphone
 
 permissions-site-microphone-window =
     .title = Settings - Microphone Permissions
     .style = { permissions-window.style }
-permissions-site-microphone-desc = The following web sites have requested to access your microphone. You can specify which web sites are allowed to access your microphone. You can also block new requests asking to access your microphone.
+permissions-site-microphone-desc = The following websites have requested to access your microphone. You can specify which websites are allowed to access your microphone. You can also block new requests asking to access your microphone.
 permissions-site-microphone-disable-label =
     .label = Block new requests asking to access your microphone
-permissions-site-microphone-disable-desc = This will prevent any web sites not listed above from requesting permission to access your microphone. Blocking access to your microphone may break some web site features.
+permissions-site-microphone-disable-desc = This will prevent any websites not listed above from requesting permission to access your microphone. Blocking access to your microphone may break some website features.
--- a/browser/browser/preferences/preferences.ftl
+++ b/browser/browser/preferences/preferences.ftl
@@ -1,13 +1,13 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-do-not-track-description = Send web sites a “Do Not Track” signal that you don’t want to be tracked
+do-not-track-description = Send websites a “Do Not Track” signal that you don’t want to be tracked
 do-not-track-learn-more = Learn more
 do-not-track-option-default =
     .label = Only when using Tracking Protection
 do-not-track-option-always =
     .label = Always
 pref-page =
     .title =
         { PLATFORM() ->
@@ -578,23 +578,23 @@ history-clear-button =
 
 ## Privacy Section - Site Data
 
 sitedata-header = Cookies and Site Data
 sitedata-total-size-calculating = Calculating site data and cache size…
 # Variables:
 #   $value (Number) - Value of the unit (for example: 4.6, 500)
 #   $unit (String) - Name of the unit (for example: "bytes", "KB")
-sitedata-total-size = Your stored cookies, site data and cache are currently using { $value } { $unit } of disc space.
+sitedata-total-size = Your stored cookies, site data and cache are currently using { $value } { $unit } of disk space.
 sitedata-learn-more = Learn more
 sitedata-accept-cookies-option =
-    .label = Accept cookies and site data from web sites (recommended)
+    .label = Accept cookies and site data from websites (recommended)
     .accesskey = A
 sitedata-block-cookies-option =
-    .label = Block cookies and site data (may cause web sites to break)
+    .label = Block cookies and site data (may cause websites to break)
     .accesskey = B
 sitedata-keep-until = Keep until
     .accesskey = u
 sitedata-keep-until-expire =
     .label = They expire
 sitedata-keep-until-closed =
     .label = { -brand-short-name } is closed
 sitedata-accept-third-party-desc = Accept third-party cookies and site data
@@ -666,17 +666,17 @@ content-blocking-tracking-protection-opt
     .label = Block only in private windows
 content-blocking-tracking-protection-option-disabled =
     .label = Never block
 content-blocking-tracking-protection-change-blocklist = Change Block List…
 
 ## Privacy Section - Tracking
 
 tracking-header = Tracking Protection
-tracking-desc = Tracking Protection blocks online trackers that collect your browsing data across multiple web sites. <a data-l10n-name="learn-more">Learn more about Tracking Protection and your privacy</a>
+tracking-desc = Tracking Protection blocks online trackers that collect your browsing data across multiple websites. <a data-l10n-name="learn-more">Learn more about Tracking Protection and your privacy</a>
 tracking-mode-label = Use Tracking Protection to block known trackers
 tracking-mode-always =
     .label = Always
     .accesskey = y
 tracking-mode-private =
     .label = Only in private windows
     .accesskey = l
 tracking-mode-never =
@@ -731,17 +731,17 @@ autoplay-option-dont =
     .label = Don’t Autoplay
 permissions-block-popups =
     .label = Block pop-up windows
     .accesskey = B
 permissions-block-popups-exceptions =
     .label = Exceptions…
     .accesskey = E
 permissions-addon-install-warning =
-    .label = Warn you when web sites try to install add-ons
+    .label = Warn you when websites try to install add-ons
     .accesskey = W
 permissions-addon-exceptions =
     .label = Exceptions…
     .accesskey = E
 permissions-a11y-privacy-checkbox =
     .label = Prevent accessibility services from accessing your browser
     .accesskey = a
 permissions-a11y-privacy-link = Learn more
--- a/browser/browser/preferences/siteDataSettings.ftl
+++ b/browser/browser/preferences/siteDataSettings.ftl
@@ -2,19 +2,19 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
 ## Settings
 
 site-data-settings-window =
     .title = Manage Cookies and Site Data
-site-data-settings-description = The following web sites store cookies and site data on your computer. { -brand-short-name } keeps data from web sites with persistent storage until you delete it, and deletes data from web sites with non-persistent storage as space is needed.
+site-data-settings-description = The following websites store cookies and site data on your computer. { -brand-short-name } keeps data from websites with persistent storage until you delete it, and deletes data from websites with non-persistent storage as space is needed.
 site-data-search-textbox =
-    .placeholder = Search web sites
+    .placeholder = Search websites
     .accesskey = S
 site-data-column-host =
     .label = Site
 site-data-column-cookies =
     .label = Cookies
 site-data-column-storage =
     .label = Storage
 site-data-column-last-used =
@@ -43,10 +43,10 @@ site-data-remove-shown =
 ## Removing
 
 site-data-removing-window =
     .title = { site-data-removing-header }
 site-data-removing-dialog =
     .title = { site-data-removing-header }
     .buttonlabelaccept = Remove
 site-data-removing-header = Removing Cookies and Site Data
-site-data-removing-desc = Removing cookies and site data may log you out of web sites. Are you sure you want to make the changes?
-site-data-removing-table = Cookies and site data for the following web sites will be removed
+site-data-removing-desc = Removing cookies and site data may log you out of websites. Are you sure you want to make the changes?
+site-data-removing-table = Cookies and site data for the following websites will be removed
--- a/browser/browser/preferences/translation.ftl
+++ b/browser/browser/preferences/translation.ftl
@@ -13,17 +13,17 @@ translation-languages-column =
 translation-languages-button-remove =
     .label = Remove Language
     .accesskey = R
 translation-languages-button-remove-all =
     .label = Remove All Languages
     .accesskey = e
 translation-sites-disabled-desc = Translation will not be offered for the following sites
 translation-sites-column =
-    .label = Web Sites
+    .label = Websites
 translation-sites-button-remove =
     .label = Remove Site
     .accesskey = S
 translation-sites-button-remove-all =
     .label = Remove All Sites
     .accesskey = i
 translation-button-close =
     .label = Close
--- a/browser/chrome/browser/aboutPrivateBrowsing.dtd
+++ b/browser/chrome/browser/aboutPrivateBrowsing.dtd
@@ -1,17 +1,12 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!-- LOCALIZATION NOTE (aboutPrivateBrowsing.title):
-     Please ensure this exactly matches tabs.emptyPrivateTabTitle in tabbrowser.properties -->
-<!ENTITY aboutPrivateBrowsing.title                      "Private Browsing">
-<!ENTITY aboutPrivateBrowsing.notPrivate.title           "Open a private window?">
-
 <!ENTITY aboutPrivateBrowsing.notPrivate                 "You are currently not in a private window.">
 <!ENTITY privatebrowsingpage.openPrivateWindow.label     "Open a Private Window">
 <!ENTITY privatebrowsingpage.openPrivateWindow.accesskey "P">
 
 <!ENTITY privateBrowsing.title                           "Private Browsing">
 <!ENTITY privateBrowsing.title.tracking                  "Private Browsing with Tracking Protection">
 <!ENTITY aboutPrivateBrowsing.info.notsaved.before       "When you browse in a Private Window, Firefox ">
 <!ENTITY aboutPrivateBrowsing.info.notsaved.emphasize    "does not save">
@@ -28,10 +23,10 @@
 <!ENTITY aboutPrivateBrowsing.note.before                "Private Browsing ">
 <!ENTITY aboutPrivateBrowsing.note.emphasize             "doesn’t make you anonymous">
 <!ENTITY aboutPrivateBrowsing.note.after                 " on the Internet. Your employer or Internet service provider can still know what page you visit.">
 <!ENTITY aboutPrivateBrowsing.learnMore3.before          "Learn more about ">
 <!ENTITY aboutPrivateBrowsing.learnMore3.title           "Private Browsing">
 <!ENTITY aboutPrivateBrowsing.learnMore3.after           ".">
 
 <!ENTITY trackingProtection.title                        "Tracking Protection">
-<!ENTITY trackingProtection.description2                 "Some web sites use trackers that can monitor your activity across the Internet. With Tracking Protection Firefox will block many trackers that can collect information about your browsing behaviour.">
+<!ENTITY trackingProtection.description2                 "Some websites use trackers that can monitor your activity across the Internet. With Tracking Protection Firefox will block many trackers that can collect information about your browsing behaviour.">
 <!ENTITY trackingProtection.startTour1                   "See how it works">
--- a/browser/chrome/browser/browser.dtd
+++ b/browser/chrome/browser/browser.dtd
@@ -245,27 +245,27 @@ These should match what Safari and other
 <!ENTITY urlbar.webRTCShareScreenNotificationAnchor.tooltip       "Manage sharing your windows or screen with the site">
 
 <!ENTITY urlbar.servicesNotificationAnchor.tooltip        "Open install message panel">
 <!ENTITY urlbar.translateNotificationAnchor.tooltip       "Translate this page">
 <!ENTITY urlbar.translatedNotificationAnchor.tooltip      "Manage page translation">
 <!ENTITY urlbar.emeNotificationAnchor.tooltip             "Manage use of DRM software">
 <!ENTITY urlbar.midiNotificationAnchor.tooltip            "Open MIDI panel">
 
-<!ENTITY urlbar.cameraBlocked.tooltip            "You have blocked your camera for this web site.">
-<!ENTITY urlbar.microphoneBlocked.tooltip        "You have blocked your microphone for this web site.">
-<!ENTITY urlbar.screenBlocked.tooltip            "You have blocked this web site from sharing your screen.">
-<!ENTITY urlbar.geolocationBlocked.tooltip       "You have blocked location information for this web site.">
-<!ENTITY urlbar.webNotificationsBlocked.tooltip  "You have blocked notifications for this web site.">
-<!ENTITY urlbar.persistentStorageBlocked.tooltip "You have blocked persistent storage for this web site.">
-<!ENTITY urlbar.popupBlocked.tooltip             "You have blocked pop-ups for this web site.">
+<!ENTITY urlbar.cameraBlocked.tooltip            "You have blocked your camera for this website.">
+<!ENTITY urlbar.microphoneBlocked.tooltip        "You have blocked your microphone for this website.">
+<!ENTITY urlbar.screenBlocked.tooltip            "You have blocked this website from sharing your screen.">
+<!ENTITY urlbar.geolocationBlocked.tooltip       "You have blocked location information for this website.">
+<!ENTITY urlbar.webNotificationsBlocked.tooltip  "You have blocked notifications for this website.">
+<!ENTITY urlbar.persistentStorageBlocked.tooltip "You have blocked persistent storage for this website.">
+<!ENTITY urlbar.popupBlocked.tooltip             "You have blocked pop-ups for this website.">
 <!ENTITY urlbar.autoplayMediaBlocked.tooltip     "You have blocked autoplay media with sound for this website.">
-<!ENTITY urlbar.canvasBlocked.tooltip            "You have blocked canvas data extraction for this web site.">
-<!ENTITY urlbar.flashPluginBlocked.tooltip       "You have blocked this web site from using the Adobe Flash plugin.">
-<!ENTITY urlbar.midiBlocked.tooltip              "You have blocked MIDI access for this web site.">
+<!ENTITY urlbar.canvasBlocked.tooltip            "You have blocked canvas data extraction for this website.">
+<!ENTITY urlbar.flashPluginBlocked.tooltip       "You have blocked this website from using the Adobe Flash plugin.">
+<!ENTITY urlbar.midiBlocked.tooltip              "You have blocked MIDI access for this website.">
 
 <!ENTITY urlbar.openHistoryPopup.tooltip                "Show history">
 
 <!ENTITY searchItem.title             "Search">
 
 <!-- Toolbar items -->
 <!ENTITY homeButton.label             "Home">
 
@@ -812,23 +812,23 @@ you can use these alternative items. Oth
 <!ENTITY identity.activeBlocked "&brandShortName; has blocked parts of this page that are not secure.">
 <!ENTITY identity.passiveLoaded "Parts of this page are not secure (such as images).">
 <!ENTITY identity.activeLoaded "You have disabled protection on this page.">
 <!ENTITY identity.weakEncryption "This page uses weak encryption.">
 
 <!-- Strings for connection state warnings in the subview. -->
 <!ENTITY identity.description.insecure "Your connection to this site is not private. Information you submit could be viewed by others (like passwords, messages, credit cards, etc.).">
 <!ENTITY identity.description.insecureLoginForms "The login information you enter on this page is not secure and could be compromised.">
-<!ENTITY identity.description.weakCipher "Your connection to this web site uses weak encryption and is not private.">
-<!ENTITY identity.description.weakCipher2 "Other people can view your information or modify the web site’s behaviour.">
+<!ENTITY identity.description.weakCipher "Your connection to this website uses weak encryption and is not private.">
+<!ENTITY identity.description.weakCipher2 "Other people can view your information or modify the website’s behaviour.">
 <!ENTITY identity.description.activeBlocked "&brandShortName; has blocked parts of this page that are not secure.">
 <!ENTITY identity.description.passiveLoaded "Your connection is not private and information you share with the site could be viewed by others.">
-<!ENTITY identity.description.passiveLoaded2 "This web site contains content that is not secure (such as images).">
+<!ENTITY identity.description.passiveLoaded2 "This website contains content that is not secure (such as images).">
 <!ENTITY identity.description.passiveLoaded3 "Although &brandShortName; has blocked some content, there is still content on the page that is not secure (such as images).">
-<!ENTITY identity.description.activeLoaded "This web site contains content that is not secure (such as scripts) and your connection to it is not private.">
+<!ENTITY identity.description.activeLoaded "This website contains content that is not secure (such as scripts) and your connection to it is not private.">
 <!ENTITY identity.description.activeLoaded2 "Information you share with this site could be viewed by others (like passwords, messages, credit cards, etc.).">
 
 <!ENTITY identity.enableMixedContentBlocking.label "Enable protection">
 <!ENTITY identity.enableMixedContentBlocking.accesskey "E">
 <!ENTITY identity.disableMixedContentBlocking.label "Disable protection for now">
 <!ENTITY identity.disableMixedContentBlocking.accesskey "D">
 <!ENTITY identity.learnMore "Learn More">
 
--- a/browser/chrome/browser/browser.properties
+++ b/browser/chrome/browser/browser.properties
@@ -117,17 +117,17 @@ webextPerms.description.privacy=Read and
 webextPerms.description.proxy=Control browser proxy settings
 webextPerms.description.sessions=Access recently closed tabs
 webextPerms.description.tabs=Access browser tabs
 webextPerms.description.tabHide=Hide and show browser tabs
 webextPerms.description.topSites=Access browsing history
 webextPerms.description.unlimitedStorage=Store unlimited amount of client-side data
 webextPerms.description.webNavigation=Access browser activity during navigation
 
-webextPerms.hostDescription.allUrls=Access your data for all web sites
+webextPerms.hostDescription.allUrls=Access your data for all websites
 
 # LOCALIZATION NOTE (webextPerms.hostDescription.wildcard)
 # %S will be replaced by the DNS domain for which a webextension
 # is requesting access (e.g., mozilla.org)
 webextPerms.hostDescription.wildcard=Access your data for sites in the %S domain
 
 # LOCALIZATION NOTE (webextPerms.hostDescription.tooManyWildcards):
 # Semi-colon list of plural forms.
@@ -468,17 +468,17 @@ newTabButton.tooltip=Open a new tab (%S)
 
 # Offline web applications
 offlineApps.available2=Will you allow %S to store data on your computer?
 offlineApps.allowStoring.label=Allow Storing Data
 offlineApps.allowStoring.accesskey=A
 offlineApps.dontAllow.label=Don’t Allow
 offlineApps.dontAllow.accesskey=n
 
-offlineApps.usage=This web site (%S) is now storing more than %SMB of data on your computer for offline use.
+offlineApps.usage=This website (%S) is now storing more than %SMB of data on your computer for offline use.
 offlineApps.manageUsage=Show settings
 offlineApps.manageUsageAccessKey=S
 
 # Canvas permission prompt
 # LOCALIZATION NOTE (canvas.siteprompt): %S is hostname
 canvas.siteprompt=Will you allow %S to use your HTML5 canvas image data? This may be used to uniquely identify your computer.
 canvas.notAllow=Don’t Allow
 canvas.notAllow.accesskey=n
@@ -944,17 +944,17 @@ permissions.remove.tooltip = Clear this 
 # between the Firefox version and the "What's new" link in the About dialog,
 # e.g.: "48.0.2 (32-bit) <What's new>" or "51.0a1 (2016-09-05) (64-bit)".
 aboutDialog.architecture.sixtyFourBit = 64-bit
 aboutDialog.architecture.thirtyTwoBit = 32-bit
 
 # LOCALIZATION NOTE (certImminentDistrust.message):
 # Shown in the browser console when visiting a website that is trusted today,
 # but won't be in the future unless the site operator makes a change.
-certImminentDistrust.message = The security certificate in use on this web site will no longer be trusted in a future release. For more information, visit https://wiki.mozilla.org/CA/Upcoming_Distrust_Actions
+certImminentDistrust.message = The security certificate in use on this website will no longer be trusted in a future release. For more information, visit https://wiki.mozilla.org/CA/Upcoming_Distrust_Actions
 
 midi.Allow.label = Allow
 midi.Allow.accesskey = A
 midi.DontAllow.label = Don’t Allow
 midi.DontAllow.accesskey = n
 midi.remember=Remember this decision
 midi.shareWithFile.message = Will you allow this local file to access your MIDI Devices?
 # LOCALIZATION NOTE (midi.shareWithSite.message): %S is the name of the site URL (https://...) requesting MIDI access
--- a/browser/chrome/browser/pageInfo.dtd
+++ b/browser/chrome/browser/pageInfo.dtd
@@ -53,29 +53,26 @@
 
 <!ENTITY  securityTab           "Security">
 <!ENTITY  securityTab.accesskey "S">
 <!ENTITY  securityView.certView "View Certificate">
 <!ENTITY  securityView.accesskey "V">
 <!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   "Web site:">
+<!ENTITY  securityView.identity.domain   "Website:">
 <!ENTITY  securityView.identity.verifier "Verified by:">
 <!ENTITY  securityView.identity.validity "Expires on:">
 
 <!ENTITY  securityView.privacy.header                   "Privacy &amp; History">
-<!ENTITY  securityView.privacy.history                  "Have I visited this web site before today?">
-<!ENTITY  securityView.privacy.cookies                  "Is this web site storing information (cookies) on my computer?">
-<!ENTITY  securityView.privacy.viewCookies              "View Cookies">
-<!ENTITY  securityView.privacy.viewCookies.accessKey    "k">
+<!ENTITY  securityView.privacy.history                  "Have I visited this website prior to today?">
 <!ENTITY  securityView.privacy.siteData                 "Is this website storing information on my computer?">
 <!ENTITY  securityView.privacy.clearSiteData            "Clear Cookies and Site Data">
 <!ENTITY  securityView.privacy.clearSiteData.accessKey  "C">
-<!ENTITY  securityView.privacy.passwords                "Have I saved any passwords for this web site?">
+<!ENTITY  securityView.privacy.passwords                "Have I saved any passwords for this website?">
 <!ENTITY  securityView.privacy.viewPasswords            "View Saved Passwords">
 <!ENTITY  securityView.privacy.viewPasswords.accessKey  "w">
 
 <!ENTITY  securityView.technical.header                 "Technical Details">
 
 <!ENTITY  helpButton.label                              "Help">
--- a/browser/chrome/browser/pageInfo.properties
+++ b/browser/chrome/browser/pageInfo.properties
@@ -39,32 +39,25 @@ generalMetaTag=Meta (1 tag)
 generalMetaTags=Meta (%S tags)
 
 feedRss=RSS
 feedAtom=Atom
 feedXML=XML
 feedSubscribe=Subscribe
 feedSubscribe.accesskey=u
 
-securityNoOwner=This web site does not supply ownership information.
+securityNoOwner=This website does not supply ownership information.
 # LOCALIZATION NOTE (securityVisitsNumber):
 # Semi-colon list of plural forms.
 # See: https://developer.mozilla.org/en/docs/Localization_and_Plurals
 # #1 is the number of visits and can be used in all plural forms as needed, e.g.
 # for '1': 'Yes, #1 time'
 securityVisitsNumber=Yes, once;Yes, #1 times
 securityNoVisits=No
 
-# LOCALIZATION NOTE: The next string is for the disk usage of the
-# database
-#   e.g. indexedDBUsage : "50.23 MB"
-#   %1$S = size (in bytes or megabytes, ...)
-#   %2$S = unit of measure (bytes, KB, MB, ...)
-indexedDBUsage=This web site is using %1$S %2$S
-
 # LOCALIZATION NOTE(securitySiteDataCookies,securitySiteDataOnly): This is for site data disk usage.
 #   It confirms that a website is indeed using this much space.
 #   e.g. Is this website storing site data? "Yes, 50.23 MB"
 #   %1$S = size (in bytes or megabytes, ...)
 #   %2$S = unit of measure (bytes, KB, MB, ...)
 securitySiteDataCookies=Yes, cookies and %1$S %2$S of site data
 securitySiteDataOnly=Yes, %1$S %2$S of site data
 # LOCALIZATION NOTE(securitySiteDataCookiesOnly,securitySiteDataNo):
--- a/browser/chrome/browser/preferences/preferences.properties
+++ b/browser/chrome/browser/preferences/preferences.properties
@@ -15,61 +15,61 @@ labelDefaultFont=Default (%S)
 labelDefaultFontUnnamed=Default
 
 veryLargeMinimumFontTitle=Large minimum font size
 veryLargeMinimumFontWarning=You have selected a very large minimum font size (more than 24 pixels). This may make it difficult or impossible to use some important configuration pages like this one.
 acceptVeryLargeMinimumFont=Keep my changes anyway
 
 #### Permissions Manager
 
-trackingprotectionpermissionstext2=You have disabled Tracking Protection on these web sites.
+trackingprotectionpermissionstext2=You have disabled Tracking Protection on these websites.
 trackingprotectionpermissionstitle=Exceptions - Tracking Protection
-cookiepermissionstext1=You can specify which web sites are always or never allowed to use cookies and site data.  Type the exact address of the site you want to manage and then click Block, Allow for Session, or Allow.
+cookiepermissionstext1=You can specify which websites are always or never allowed to use cookies and site data.  Type the exact address of the site you want to manage and then click Block, Allow for Session, or Allow.
 cookiepermissionstitle1=Exceptions - Cookies and Site Data
-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_title2=Allowed Web 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.
-popuppermissionstitle2=Allowed Web Sites - Pop-ups
-notificationspermissionstext6=The following web sites have requested to send you notifications. You can specify which web sites are allowed to send you notifications. You can also block new requests asking to allow notifications.
+addonspermissionstext=You can specify which websites are allowed to install add-ons. Type the exact address of the site you want to allow and then click Allow.
+addons_permissions_title2=Allowed Websites - Add-ons Installation
+popuppermissionstext=You can specify which websites are allowed to open pop-up windows. Type the exact address of the site you want to allow and then click Allow.
+popuppermissionstitle2=Allowed Websites - Pop-ups
+notificationspermissionstext6=The following websites have requested to send you notifications. You can specify which websites are allowed to send you notifications. You can also block new requests asking to allow notifications.
 notificationspermissionstitle2=Settings - Notification Permissions
 notificationspermissionsdisablelabel=Block new requests asking to allow notifications
-notificationspermissionsdisabledescription=This will prevent any web sites not listed above from requesting permission to send notifications. Blocking notifications may break some web site features.
-locationpermissionstext2=The following web sites have requested to access your location. You can specify which web sites are allowed to access your location. You can also block new requests asking to access your location.
+notificationspermissionsdisabledescription=This will prevent any websites not listed above from requesting permission to send notifications. Blocking notifications may break some website features.
+locationpermissionstext2=The following websites have requested to access your location. You can specify which websites are allowed to access your location. You can also block new requests asking to access your location.
 locationpermissionstitle=Settings - Location Permissions
 locationpermissionsdisablelabel=Block new requests asking to access your location
-locationpermissionsdisabledescription=This will prevent any web sites not listed above from requesting permission to access your location. Blocking access to your location may break some web site features.
-camerapermissionstext2=The following web sites have requested to access your camera. You can specify which web sites are allowed to access your camera. You can also block new requests asking to access your camera.
+locationpermissionsdisabledescription=This will prevent any websites not listed above from requesting permission to access your location. Blocking access to your location may break some website features.
+camerapermissionstext2=The following websites have requested to access your camera. You can specify which websites are allowed to access your camera. You can also block new requests asking to access your camera.
 camerapermissionstitle=Settings - Camera Permissions
 camerapermissionsdisablelabel=Block new requests asking to access your camera
-camerapermissionsdisabledescription=This will prevent any web sites not listed above from requesting permission to access your camera. Blocking access to your camera may break some web site features.
-microphonepermissionstext2=The following web sites have requested to access your microphone. You can specify which web sites are allowed to access your microphone. You can also block new requests asking to access your microphone.
+camerapermissionsdisabledescription=This will prevent any websites not listed above from requesting permission to access your camera. Blocking access to your camera may break some website features.
+microphonepermissionstext2=The following websites have requested to access your microphone. You can specify which websites are allowed to access your microphone. You can also block new requests asking to access your microphone.
 microphonepermissionstitle=Settings - Microphone Permissions
 microphonepermissionsdisablelabel=Block new requests asking to access your microphone
-microphonepermissionsdisabledescription=This will prevent any web sites not listed above from requesting permission to access your microphone. Blocking access to your microphone may break some web site features.
+microphonepermissionsdisabledescription=This will prevent any websites not listed above from requesting permission to access your microphone. Blocking access to your microphone may break some website features.
 invalidURI=Please enter a valid hostname
 invalidURITitle=Invalid Hostname Entered
 savedLoginsExceptions_title=Exceptions - Saved Logins
-savedLoginsExceptions_desc3=Logins for the following web sites will not be saved
+savedLoginsExceptions_desc3=Logins for the following websites will not be saved
 
 #### Block List Manager
 
 # LOCALIZATION NOTE (mozNameTemplate): This template constructs the name of the
 # block list in the block lists dialog. It combines the list name and
 # description.
 #   e.g. mozNameTemplate : "Standard (Recommended). This list does a pretty good job."
 #   %1$S = list name (fooName), %2$S = list descriptive text (fooDesc)
 mozNameTemplate=%1$S %2$S
 # LOCALIZATION NOTE (mozstdName, etc.): These labels appear in the tracking
 # protection block lists dialog, mozNameTemplate is used to create the final
 # string. Note that in the future these two strings (name, desc) could be
 # displayed on two different lines.
 mozstdName=Disconnect.me basic protection (Recommended).
-mozstdDesc=Allows some trackers so web sites function properly.
+mozstdDesc=Allows some trackers so websites function properly.
 mozfullName=Disconnect.me strict protection.
-mozfullDesc2=Blocks known trackers. Some web sites may not function properly.
+mozfullDesc2=Blocks known trackers. Some websites may not function properly.
 
 #### Master Password
 
 pw_change2empty_in_fips_mode=You are currently in FIPS mode. FIPS requires a non-empty Master Password.
 pw_change_failed_title=Password Change Failed
 
 #### Fonts
 
@@ -128,24 +128,24 @@ prompt=Always Ask
 
 #### Site Data Manager
 
 # LOCALIZATION NOTE (totalSiteDataSize2, siteUsage, siteUsagePersistent):
 #   This is the total usage of site data, where we insert storage size and unit.
 #   e.g., "The total usage is currently 200 MB"
 #   %1$S = size
 #   %2$S = unit (MB, KB, etc.)
-totalSiteDataSize2=Your stored cookies, site data and cache are currently using %1$S %2$S of disc space.
+totalSiteDataSize2=Your stored cookies, site data and cache are currently using %1$S %2$S of disk space.
 siteUsage=%1$S %2$S
 siteUsagePersistent=%1$S %2$S (Persistent)
 loadingSiteDataSize1=Calculating site data and cache size…
 
 acceptRemove=Remove
 # LOCALIZATION NOTE (siteDataSettings3.description): %S = brandShortName
-siteDataSettings3.description=The following web sites store cookies and site data on your computer. %S keeps data from web sites with persistent storage until you delete it, and deletes data from web sites with non-persistent storage as space is needed.
+siteDataSettings3.description=The following websites store cookies and site data on your computer. %S keeps data from websites with persistent storage until you delete it, and deletes data from websites with non-persistent storage as space is needed.
 # LOCALIZATION NOTE (removeAllSiteData, removeAllSiteDataShown):
 # removeAllSiteData and removeAllSiteDataShown are both used on the same one button,
 # never displayed together and can share the same accesskey.
 # When only partial sites are shown as a result of keyword search,
 # removeAllShown is displayed as button label.
 # removeAll is displayed when no keyword search and all sites are shown.
 removeAllSiteData.label=Remove All
 removeAllSiteData.accesskey=e
@@ -155,17 +155,17 @@ removeAllSiteDataShown.accesskey=e
 spaceAlert.learnMoreButton.label=Learn More
 spaceAlert.learnMoreButton.accesskey=L
 spaceAlert.over5GB.prefButton.label=Open Preferences
 spaceAlert.over5GB.prefButton.accesskey=O
 # LOCALIZATION NOTE (spaceAlert.over5GB.prefButtonWin.label): On Windows Preferences is called Options
 spaceAlert.over5GB.prefButtonWin.label=Open Options
 spaceAlert.over5GB.prefButtonWin.accesskey=O
 # LOCALIZATION NOTE (spaceAlert.over5GB.message1): %S = brandShortName
-spaceAlert.over5GB.message1=%S is running out of disc space. Web site contents may not display properly. You can clear stored data in Preferences > Privacy & Security > Cookies and Site Data.
+spaceAlert.over5GB.message1=%S is running out of disk space. Website contents may not display properly. You can clear stored data in Preferences > Privacy & Security > Cookies and Site Data.
 # LOCALIZATION NOTE (spaceAlert.over5GB.messageWin1):
 # - On Windows Preferences is called Options
 # - %S = brandShortName
-spaceAlert.over5GB.messageWin1=%S is running out of disc space. Web site contents may not display properly. You can clear stored data in Options > Privacy & Security > Cookies and Site Data.
+spaceAlert.over5GB.messageWin1=%S is running out of disk space. Website contents may not display properly. You can clear stored data in Options > Privacy & Security > Cookies and Site Data.
 spaceAlert.under5GB.okButton.label=OK, Got it
 spaceAlert.under5GB.okButton.accesskey=K
 # LOCALIZATION NOTE (spaceAlert.under5GB.message): %S = brandShortName
-spaceAlert.under5GB.message=%S is running out of disc space. Web site contents may not display properly. Visit “Learn More” to optimize your disc usage for better browsing experience.
+spaceAlert.under5GB.message=%S is running out of disk space. Website contents may not display properly. Visit “Learn More” to optimize your disk usage for better browsing experience.
--- a/browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
+++ b/browser/chrome/browser/safebrowsing/phishing-afterload-warning-message.dtd
@@ -14,17 +14,17 @@
   report-phishing.dtd are never shown at the same time, the same accesskey can
   be used for them. -->
 <!ENTITY safeb.palm.notdeceptive.accesskey "d">
 
 <!-- Localization note (safeb.palm.advisory.desc) - Please don't translate <a id="advisory_provider"/> tag.  It will be replaced at runtime with advisory link-->
 <!ENTITY safeb.palm.advisory.desc2 "Advisory provided by <a id='advisory_provider'/>.">
 
 
-<!ENTITY safeb.blocked.malwarePage.title2 "Visiting this web site may harm your computer">
+<!ENTITY safeb.blocked.malwarePage.title2 "Visiting this website may harm your computer">
 <!ENTITY safeb.blocked.malwarePage.shortDesc2 "&brandShortName; blocked this page because it might attempt to install malicious software that may steal or delete personal information on your computer.">
 
 <!-- Localization note (safeb.blocked.malwarePage.errorDesc.override, safeb.blocked.malwarePage.errorDesc.noOverride, safeb.blocked.malwarePage.learnMore) - All <span> and <a> tags are replaced by the appropriate links and text during runtime. -->
 
 <!ENTITY safeb.blocked.malwarePage.errorDesc.override "<span id='malware_sitename'/> has been <a id='error_desc_link'>reported as containing malicious software</a>. You can <a id='report_detection'>report a detection problem</a> or <a id='ignore_warning_link'>ignore the risk</a> and go to this unsafe site.">
 
 <!ENTITY safeb.blocked.malwarePage.errorDesc.noOverride "<span id='malware_sitename'/> has been <a id='error_desc_link'>reported as containing malicious software</a>. You can <a id='report_detection'>report a detection problem</a>.">
 
--- a/browser/chrome/browser/sanitize.dtd
+++ b/browser/chrome/browser/sanitize.dtd
@@ -43,17 +43,17 @@ that require it.  -->
 <!ENTITY itemHistoryAndDownloads.label     "Browsing &amp; Download History">
 <!ENTITY itemHistoryAndDownloads.accesskey "B">
 <!ENTITY itemFormSearchHistory.label       "Form &amp; Search History">
 <!ENTITY itemFormSearchHistory.accesskey   "F">
 <!ENTITY itemCookies.label                 "Cookies">
 <!ENTITY itemCookies.accesskey             "C">
 <!ENTITY itemCache.label                   "Cache">
 <!ENTITY itemCache.accesskey               "a">
-<!ENTITY itemOfflineApps.label             "Offline Web Site Data">
+<!ENTITY itemOfflineApps.label             "Offline Website Data">
 <!ENTITY itemOfflineApps.accesskey         "O">
 <!ENTITY itemActiveLogins.label            "Active Logins">
 <!ENTITY itemActiveLogins.accesskey        "L">
 <!ENTITY itemSitePreferences.label         "Site Preferences">
 <!ENTITY itemSitePreferences.accesskey     "S">
 
 <!-- LOCALIZATION NOTE (sanitizeEverythingUndoWarning): Second warning paragraph
      that appears when "Time range to clear" is set to "Everything".  See UI
--- a/browser/chrome/browser/siteData.properties
+++ b/browser/chrome/browser/siteData.properties
@@ -1,8 +1,8 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 clearSiteDataPromptTitle=Clear all cookies and site data
 # LOCALIZATION NOTE (clearSiteDataPromptText): %S = brandShortName
-clearSiteDataPromptText=Selecting ‘Clear Now’ will clear all cookies and site data stored by %S. This may sign you out of web sites and remove offline web content.
+clearSiteDataPromptText=Selecting “Clear Now” will clear all cookies and site data stored by %S. This may sign you out of websites and remove offline web content.
 clearSiteDataNow=Clear Now
--- a/browser/chrome/overrides/appstrings.properties
+++ b/browser/chrome/overrides/appstrings.properties
@@ -18,26 +18,26 @@ unknownSocketType=Firefox doesn’t know how to communicate with the server.
 netReset=The connection to the server was reset while the page was loading.
 notCached=This document is no longer available.
 netOffline=Firefox is currently in offline mode and can’t browse the Web.
 isprinting=The document cannot change while Printing or in Print Preview.
 deniedPortAccess=This address uses a network port which is normally used for purposes other than Web browsing. Firefox has cancelled the request for your protection.
 proxyResolveFailure=Firefox is configured to use a proxy server that can’t be found.
 proxyConnectFailure=Firefox is configured to use a proxy server that is refusing connections.
 contentEncodingError=The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression.
-unsafeContentType=The page you are trying to view cannot be shown because it is contained in a file type that may not be safe to open. Please contact the web site owners to inform them of this problem.
+unsafeContentType=The page you are trying to view cannot be shown because it is contained in a file type that may not be safe to open. Please contact the website owners to inform them of this problem.
 externalProtocolTitle=External Protocol Request
 externalProtocolPrompt=An external application must be launched to handle %1$S: links.\n\n\nRequested link:\n\n%2$S\n\nApplication: %3$S\n\n\nIf you were not expecting this request it may be an attempt to exploit a weakness in that other program. Cancel this request unless you are sure it is not malicious.\n
 #LOCALIZATION NOTE (externalProtocolUnknown): The following string is shown if the application name can't be determined
 externalProtocolUnknown=<Unknown>
 externalProtocolChkMsg=Remember my choice for all links of this type.
 externalProtocolLaunchBtn=Launch application
 malwareBlocked=The site at %S has been reported as an attack site and has been blocked based on your security preferences.
 harmfulBlocked=The site at %S has been reported as a potentially harmful site and has been blocked based on your security preferences.
 unwantedBlocked=The site at %S has been reported as serving unwanted software and has been blocked based on your security preferences.
 deceptiveBlocked=This web page at %S has been reported as a deceptive site and has been blocked based on your security preferences.
 cspBlocked=This page has a content security policy that prevents it from being loaded in this way.
 corruptedContentErrorv2=The site at %S has experienced a network protocol violation that cannot be repaired.
 remoteXUL=This page uses an unsupported technology that is no longer available by default in Firefox.
 ## LOCALIZATION NOTE (sslv3Used) - Do not translate "%S".
 sslv3Used=Firefox cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol.
-inadequateSecurityError=The web site tried to negotiate an inadequate level of security.
-blockedByPolicy=Your organization has blocked access to this page or web site.
+inadequateSecurityError=The website tried to negotiate an inadequate level of security.
+blockedByPolicy=Your organization has blocked access to this page or website.
--- a/browser/chrome/overrides/netError.dtd
+++ b/browser/chrome/overrides/netError.dtd
@@ -74,25 +74,25 @@
 <!ENTITY netOffline.longDesc2 "
 <ul> 
   <li>Press &quot;Try Again&quot; to switch to online mode and reload the page.</li> 
 </ul>
 ">
 
 <!ENTITY contentEncodingError.title "Content Encoding Error">
 <!ENTITY contentEncodingError.longDesc "
-<ul> 
-  <li>Please contact the web site owners to inform them of this problem.</li> 
+<ul>
+  <li>Please contact the website owners to inform them of this problem.</li>
 </ul>
 ">
 
 <!ENTITY unsafeContentType.title "Unsafe File Type">
 <!ENTITY unsafeContentType.longDesc "
-<ul> 
-<li>Please contact the web site owners to inform them of this problem.</li> 
+<ul>
+  <li>Please contact the website owners to inform them of this problem.</li>
 </ul>
 ">
 
 <!ENTITY netReset.title "The connection was reset">
 <!ENTITY netReset.longDesc "&sharedLongDesc;">
 
 <!ENTITY netTimeout.title "The connection has timed out">
 <!ENTITY netTimeout.longDesc "&sharedLongDesc;">
@@ -138,27 +138,27 @@ working.</li>
     installed.</li> 
   <li>This might be due to a non-standard configuration on the server.</li> 
 </ul>
 ">
 
 <!ENTITY nssFailure2.title "Secure Connection Failed">
 <!ENTITY nssFailure2.longDesc2 "
 <ul>
-  <li>The page you are trying to view cannot be shown because the authenticity of the received data could not be verified.</li> 
-  <li>Please contact the web site owners to inform them of this problem.</li> 
+  <li>The page you are trying to view cannot be shown because the authenticity of the received data could not be verified.</li>
+  <li>Please contact the website owners to inform them of this problem.</li>
 </ul>
 ">
 
 <!ENTITY certerror.longpagetitle1 "Your connection is not secure">
 <!ENTITY certerror.longpagetitle2 "Warning: Potential Security Risk Ahead">
 <!-- Localization note (certerror.introPara, certerror.introPara1) - The text content of the span tag
 will be replaced at runtime with the name of the server to which the user
 was trying to connect. -->
-<!ENTITY certerror.introPara "The owner of <span class='hostname'/> has configured their web site improperly.  To protect your information from being stolen, &brandShortName; has not connected to this web site.">
+<!ENTITY certerror.introPara "The owner of <span class='hostname'/> has configured their website improperly.  To protect your information from being stolen, &brandShortName; has not connected to this website.">
 
 <!ENTITY certerror.introPara1 "&brandShortName; detected a potential security threat and did not continue to <span class='hostname'/>. If you visit this site, attackers could try to steal information like your passwords, emails, or credit cards.">
 
 <!ENTITY certerror.expiredCert.secondPara "This issue is most likely because your computer clock is set to the wrong time, which would prevent &brandShortName; from connecting securely.">
 
 <!ENTITY certerror.whatCanYouDoAboutItTitle "What can you do about it?">
 
 <!ENTITY certerror.unknownIssuer.whatCanYouDoAboutIt "
@@ -185,26 +185,26 @@ was trying to connect. -->
     that &brandShortName; is permitted to access the Web.</li> 
 </ul>
 ">
 
 <!ENTITY cspBlocked.title "Blocked by Content Security Policy">
 <!ENTITY cspBlocked.longDesc "<p>&brandShortName; prevented this page from loading in this way because the page has a content security policy that disallows it.</p>">
 
 <!ENTITY corruptedContentErrorv2.title "Corrupted Content Error">
-<!ENTITY corruptedContentErrorv2.longDesc "<p>The page you are trying to view cannot be shown because an error in the data transmission was detected.</p><ul><li>Please contact the web site owners to inform them of this problem.</li></ul>">
+<!ENTITY corruptedContentErrorv2.longDesc "<p>The page you are trying to view cannot be shown because an error in the data transmission was detected.</p><ul><li>Please contact the website owners to inform them of this problem.</li></ul>">
 
 
 <!ENTITY securityOverride.exceptionButtonLabel "Add Exception…">
 
 <!ENTITY errorReporting.automatic2 "Report errors like this to help Mozilla identify and block malicious sites">
 <!ENTITY errorReporting.learnMore "Learn more…">
 
 <!ENTITY remoteXUL.title "Remote XUL">
-<!ENTITY remoteXUL.longDesc "<p><ul><li>Please contact the web site owners to inform them of this problem.</li></ul></p>">
+<!ENTITY remoteXUL.longDesc "<p><ul><li>Please contact the website owners to inform them of this problem.</li></ul></p>">
 
 <!ENTITY sslv3Used.title "Unable to Connect Securely">
 <!-- LOCALIZATION NOTE (sslv3Used.longDesc2) - Do not translate
      "SSL_ERROR_UNSUPPORTED_VERSION". -->
 <!ENTITY sslv3Used.longDesc2 "Advanced info: SSL_ERROR_UNSUPPORTED_VERSION">
 
 <!-- LOCALIZATION NOTE (certerror.wrongSystemTime2,
                         certerror.wrongSystemTimeWithoutReference) - The <span id='..' />
@@ -219,14 +219,14 @@ Strict Transport Security (HSTS) to spec
 to it securely. As a result, it is not possible to add an exception for this
 certificate.">
 <!ENTITY certerror.whatShouldIDo.badStsCertExplanation1 "<span class='hostname'></span> has a security policy called HTTP Strict Transport Security (HSTS), which means that &brandShortName; can only connect to it securely. You can’t add an exception to visit this site.">
 <!ENTITY certerror.copyToClipboard.label "Copy text to clipboard">
 
 <!ENTITY inadequateSecurityError.title "Your connection is not secure">
 <!-- LOCALIZATION NOTE (inadequateSecurityError.longDesc) - Do not translate
      "NS_ERROR_NET_INADEQUATE_SECURITY". -->
-<!ENTITY inadequateSecurityError.longDesc "<p><span class='hostname'></span> uses security technology that is outdated and vulnerable to attack. An attacker could easily reveal information which you thought to be safe. The web site administrator will need to fix the server first before you can visit the site.</p><p>Error code: NS_ERROR_NET_INADEQUATE_SECURITY</p>">
+<!ENTITY inadequateSecurityError.longDesc "<p><span class='hostname'></span> uses security technology that is outdated and vulnerable to attack. An attacker could easily reveal information which you thought to be safe. The website administrator will need to fix the server first before you can visit the site.</p><p>Error code: NS_ERROR_NET_INADEQUATE_SECURITY</p>">
 
 <!ENTITY blockedByPolicy.title "Blocked Page">
 
 <!ENTITY prefReset.longDesc "It looks like your network security settings might be causing this. Do you want the default settings to be restored?">
 <!ENTITY prefReset.label "Restore default settings">
--- a/browser/extensions/onboarding/onboarding.properties
+++ b/browser/extensions/onboarding/onboarding.properties
@@ -115,12 +115,12 @@ onboarding.notification.onboarding-tour-performance.title=Browse with the best of ‘em.
 onboarding.notification.onboarding-tour-performance.message=Prepare yourself for the fastest, smoothest, most reliable %S yet.
 
 # LOCALIZATION NOTE (onboarding.tour-screenshots): "Screenshots" is the name of the Firefox Screenshots feature and should not be localized.
 onboarding.tour-screenshots=Screenshots
 onboarding.tour-screenshots.title=Take better screenshots.
 # LOCALIZATION NOTE(onboarding.tour-screenshots.description): %S is brandShortName.
 onboarding.tour-screenshots.description=Take, save and share screenshots — without leaving %S. Capture a region or an entire page as you browse. Then save to the web for easy access and sharing.
 # LOCALIZATION NOTE (onboarding.tour-screenshots.button): "Screenshots" is the name of the Firefox Screenshots feature and should not be localized.
-onboarding.tour-screenshots.button=Open Screenshots Web Site
+onboarding.tour-screenshots.button=Open Screenshots Website
 onboarding.notification.onboarding-tour-screenshots.title=Take better screenshots.
 # LOCALIZATION NOTE(onboarding.notification.onboarding-tour-screenshots.message): %S is brandShortName.
 onboarding.notification.onboarding-tour-screenshots.message=Take, save and share screenshots — without leaving %S.
--- a/browser/installer/custom.properties
+++ b/browser/installer/custom.properties
@@ -42,17 +42,17 @@ LAUNCH_TEXT=&Launch $BrandShortName now
 CREATE_ICONS_DESC=Create icons for $BrandShortName:
 ICONS_DESKTOP=On my &Desktop
 ICONS_STARTMENU=In my &Start Menu Programs folder
 ICONS_QUICKLAUNCH=In my &Quick Launch bar
 WARN_MANUALLY_CLOSE_APP_INSTALL=$BrandShortName must be closed to proceed with the installation.\n\nPlease close $BrandShortName to continue.
 WARN_MANUALLY_CLOSE_APP_UNINSTALL=$BrandShortName must be closed to proceed with the uninstall.\n\nPlease close $BrandShortName to continue.
 WARN_MANUALLY_CLOSE_APP_LAUNCH=$BrandShortName is already running.\n\nPlease close $BrandShortName prior to launching the version you have just installed.
 WARN_WRITE_ACCESS=You don’t have access to write to the installation directory.\n\nClick OK to select a different directory.
-WARN_DISK_SPACE=You don’t have sufficient disc space to install to this location.\n\nClick OK to select a different location.
+WARN_DISK_SPACE=You don’t have sufficient disk space to install to this location.\n\nClick OK to select a different location.
 WARN_MIN_SUPPORTED_OSVER_MSG=Sorry, $BrandShortName can’t be installed. This version of $BrandShortName requires ${MinSupportedVer} or newer. Please click the OK button for additional information.
 WARN_MIN_SUPPORTED_CPU_MSG=Sorry, $BrandShortName can’t be installed. This version of $BrandShortName requires a processor with ${MinSupportedCPU} support. Please click the OK button for additional information.
 WARN_MIN_SUPPORTED_OSVER_CPU_MSG=Sorry, $BrandShortName can’t be installed. This version of $BrandShortName requires ${MinSupportedVer} or newer and a processor with ${MinSupportedCPU} support. Please click the OK button for additional information.
 WARN_RESTART_REQUIRED_UNINSTALL=Your computer must be restarted to complete a previous uninstall of $BrandShortName. Do you want to reboot now?
 WARN_RESTART_REQUIRED_UPGRADE=Your computer must be restarted to complete a previous upgrade of $BrandShortName. Do you want to reboot now?
 ERROR_CREATE_DIRECTORY_PREFIX=Error creating directory:
 ERROR_CREATE_DIRECTORY_SUFFIX=Click Cancel to stop the installation or\nRetry to try again.
 
--- a/browser/installer/nsisstrings.properties
+++ b/browser/installer/nsisstrings.properties
@@ -33,17 +33,17 @@ STUB_BLURB_FIRST1=The fastest, most resp
 STUB_BLURB_SECOND1=Faster page loading and tab switching
 STUB_BLURB_THIRD1=Powerful private browsing
 STUB_BLURB_FOOTER2=Built for people, not for profit
 
 WARN_MIN_SUPPORTED_OSVER_MSG=Sorry, $BrandShortName can’t be installed. This version of $BrandShortName requires ${MinSupportedVer} or newer. Please click the OK button for additional information.
 WARN_MIN_SUPPORTED_CPU_MSG=Sorry, $BrandShortName can’t be installed. This version of $BrandShortName requires a processor with ${MinSupportedCPU} support. Please click the OK button for additional information.
 WARN_MIN_SUPPORTED_OSVER_CPU_MSG=Sorry, $BrandShortName can’t be installed. This version of $BrandShortName requires ${MinSupportedVer} or newer and a processor with ${MinSupportedCPU} support. Please click the OK button for additional information.
 WARN_WRITE_ACCESS_QUIT=You don’t have access to write to the installation directory
-WARN_DISK_SPACE_QUIT=You don’t have sufficient disc space to install.
+WARN_DISK_SPACE_QUIT=You don’t have sufficient disk space to install.
 WARN_MANUALLY_CLOSE_APP_LAUNCH=$BrandShortName is already running.\n\nPlease close $BrandShortName prior to launching the version you have just installed.
 
 ERROR_DOWNLOAD_CONT=Hmm. For some reason, we could not install $BrandShortName.\nChoose OK to start again.
 
 STUB_CANCEL_PROMPT_HEADING=Do you want to install $BrandShortName?
 STUB_CANCEL_PROMPT_MESSAGE=If you cancel, $BrandShortName will not be installed.
 STUB_CANCEL_PROMPT_BUTTON_CONTINUE=Install $BrandShortName
 STUB_CANCEL_PROMPT_BUTTON_EXIT=Cancel
--- a/devtools/client/appcacheutils.properties
+++ b/devtools/client/appcacheutils.properties
@@ -58,17 +58,17 @@ notAvailable=%1$S points to a resource t
 # the appcache.
 invalidURI=The URI passed to AppCacheUtils is invalid.
 
 # LOCALIZATION NOTE (noResults): it's used when a search returns no results.
 noResults=Your search returned no results.
 
 # LOCALIZATION NOTE (cacheDisabled): it's used when the cache is disabled and
 # an attempt is made to view offline data.
-cacheDisabled=Your disc cache is disabled. Please set browser.cache.disk.enable to true in about:config and try again.
+cacheDisabled=Your disk cache is disabled. Please set browser.cache.disk.enable to true in about:config and try again.
 
 # LOCALIZATION NOTE (firstLineMustBeCacheManifest): the associated cache
 # manifest has a first line that is not "CACHE MANIFEST". Parameters: %S is
 # the line number.
 firstLineMustBeCacheManifest=The first line of the manifest must be "CACHE MANIFEST" at line %S.
 
 # LOCALIZATION NOTE (cacheManifestOnlyFirstLine2): the associated cache
 # manifest has "CACHE MANIFEST" on a line other than the first line.
--- a/devtools/shared/gclicommands.properties
+++ b/devtools/shared/gclicommands.properties
@@ -567,17 +567,17 @@ resizeModeToDesc=Alter page size
 # LOCALIZATION NOTE (resizeModeDesc) A very short string to describe the
 # 'resize' command. This string is designed to be shown in a menu
 # alongside the command name, which is why it should be as short as possible.
 resizeModeDesc=Control Responsive Design Mode
 
 # LOCALIZATION NOTE (resizeModeManual2) A fuller description of the 'resize'
 # command, displayed when the user asks for help on what it does.
 # The argument (%1$S) is the browser name.
-resizeModeManual2=Responsive web sites respond to their environment, so they look good on a mobile display, a cinema display and everything in-between. Responsive Design Mode allows you to easily test a variety of page sizes in %1$S without needing to resize your whole browser.
+resizeModeManual2=Responsive websites respond to their environment, so they look good on a mobile display, a cinema display and everything in-between. Responsive Design Mode allows you to easily test a variety of page sizes in %1$S without needing to resize your whole browser.
 
 # LOCALIZATION NOTE (cmdDesc) A very short description of the 'cmd'
 # command. This string is designed to be shown in a menu alongside the command
 # name, which is why it should be as short as possible.
 cmdDesc=Manipulate the commands
 
 # LOCALIZATION NOTE (cmdRefreshDesc) A very short description of the 'cmd refresh'
 # command. This string is designed to be shown in a menu alongside the command
--- a/devtools/startup/aboutdevtools.dtd
+++ b/devtools/startup/aboutdevtools.dtd
@@ -33,39 +33,32 @@
 <!ENTITY  aboutDevtools.enable.aboutDebuggingMessage
           "Develop and debug WebExtensions, web workers, service workers and more with Firefox Developer Tools.">
 
 <!-- LOCALIZATION NOTE (aboutDevtools.enable.keyShortcutMessage): Message displayed when
   -  users pressed a DevTools key shortcut. -->
 <!ENTITY  aboutDevtools.enable.keyShortcutMessage
           "You activated a Developer Tools shortcut. If that was a mistake, you can close this Tab.">
 
-<!-- LOCALIZATION NOTE (aboutDevtools.enable.menuMessage): Message displayed when users
-  -  clicked on a "Enable Developer Tools" menu item. -->
-<!ENTITY  aboutDevtools.enable.menuMessage
-          "Examine, edit and debug HTML, CSS, and JavaScript with tools like Inspector and Debugger.">
-
 <!-- LOCALIZATION NOTE (aboutDevtools.enable.menuMessage2): Message displayed when users
   -  clicked on a "Enable Developer Tools" menu item. -->
 <!ENTITY  aboutDevtools.enable.menuMessage2
-          "Perfect your web site’s HTML, CSS, and JavaScript with tools like Inspector and Debugger.">
+          "Perfect your website’s HTML, CSS, and JavaScript with tools like Inspector and Debugger.">
 
 <!-- LOCALIZATION NOTE (aboutDevtools.enable.commonMessage): Generic message displayed for
   -  all possible entry points (keyshortcut, menu item etc…). -->
 <!ENTITY  aboutDevtools.enable.commonMessage
           "Firefox Developer Tools are disabled by default to give you more control over your browser.">
 
 <!-- LOCALIZATION NOTE (aboutDevtools.enable.learnMoreLink): Text for the link to
   -  https://developer.mozilla.org/docs/Tools displayed in the top section when DevTools
   -  are disabled. -->
 <!ENTITY  aboutDevtools.enable.learnMoreLink "Learn more about Developer Tools">
 
 <!ENTITY  aboutDevtools.enable.enableButton "Enable Developer Tools">
-<!ENTITY  aboutDevtools.enable.closeButton "Close this page">
-
 <!ENTITY  aboutDevtools.enable.closeButton2 "Close this Tab">
 
 <!ENTITY  aboutDevtools.welcome.title "Welcome to Firefox Developer Tools!">
 
 <!ENTITY  aboutDevtools.newsletter.title "Mozilla Developer Newsletter">
 <!-- LOCALIZATION NOTE (aboutDevtools.newsletter.message): Subscribe form message.
   -  The newsletter is only available in english at the moment.
   -  See Bug 1415273 for support of additional languages.-->
--- a/dom/chrome/appstrings.properties
+++ b/dom/chrome/appstrings.properties
@@ -17,25 +17,25 @@ unknownSocketType=This document cannot b
 netReset=The document contains no data.
 notCached=This document is no longer available.
 netOffline=This document cannot be displayed while offline. To go online, uncheck Work Offline from the File menu.
 isprinting=The document cannot change while Printing or in Print Preview.
 deniedPortAccess=Access to the port number given has been disabled for security reasons.
 proxyResolveFailure=The proxy server you have configured could not be found. Please check your proxy settings and try again.
 proxyConnectFailure=The connection was refused when attempting to contact the proxy server you have configured. Please check your proxy settings and try again.
 contentEncodingError=The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression.
-unsafeContentType=The page you are trying to view cannot be shown because it is contained in a file type that may not be safe to open. Please contact the web site owners to inform them of this problem.
+unsafeContentType=The page you are trying to view cannot be shown because it is contained in a file type that may not be safe to open. Please contact the website owners to inform them of this problem.
 externalProtocolTitle=External Protocol Request
 externalProtocolPrompt=An external application must be launched to handle %1$S: links.\n\n\nRequested link:\n\n%2$S\n\nApplication: %3$S\n\n\nIf you were not expecting this request it may be an attempt to exploit a weakness in that other program. Cancel this request unless you are sure it is not malicious.\n
 #LOCALIZATION NOTE (externalProtocolUnknown): The following string is shown if the application name can't be determined
 externalProtocolUnknown=<Unknown>
 externalProtocolChkMsg=Remember my choice for all links of this type.
 externalProtocolLaunchBtn=Launch application
 malwareBlocked=The site at %S has been reported as an attack site and has been blocked based on your security preferences.
 unwantedBlocked=The site at %S has been reported as serving unwanted software and has been blocked based on your security preferences.
 deceptiveBlocked=This web page at %S has been reported as a deceptive site and has been blocked based on your security preferences.
 cspBlocked=This page has a content security policy that prevents it from being loaded in this way.
 corruptedContentErrorv2=The site at %S has experienced a network protocol violation that cannot be repaired.
 remoteXUL=This page uses an unsupported technology that is no longer available by default.
 sslv3Used=The safety of your data on %S could not be guaranteed because it uses SSLv3, a broken security protocol.
-weakCryptoUsed=The owner of %S has configured their web site improperly. To protect your information from being stolen, the connection to this web site has not been established.
-inadequateSecurityError=The web site tried to negotiate an inadequate level of security.
+weakCryptoUsed=The owner of %S has configured their website improperly. To protect your information from being stolen, the connection to this website has not been established.
+inadequateSecurityError=The website tried to negotiate an inadequate level of security.
 blockedByPolicy=Your organization has blocked access to this page or website.
--- a/dom/chrome/netError.dtd
+++ b/dom/chrome/netError.dtd
@@ -33,22 +33,22 @@
 
 <!ENTITY notCached.title "Document Expired">
 <!ENTITY notCached.longDesc "<p>The requested document is not available in the browser’s cache.</p><ul><li>As a security precaution, the browser does not automatically re-request sensitive documents.</li><li>Click Try Again to re-request the document from the website.</li></ul>">
 
 <!ENTITY netOffline.title "Offline Mode">
 <!ENTITY netOffline.longDesc2 "<p>The browser is operating in its offline mode and cannot connect to the requested item.</p><ul><li>Is the computer connected to an active network?</li><li>Press &quot;Try Again&quot; to switch to online mode and reload the page.</li></ul>">
 
 <!ENTITY contentEncodingError.title "Content Encoding Error">
-<!ENTITY contentEncodingError.longDesc "<p>The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression.</p><ul><li>Please contact the web site owners to inform them of this problem.</li></ul>">
+<!ENTITY contentEncodingError.longDesc "<p>The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression.</p><ul><li>Please contact the website owners to inform them of this problem.</li></ul>">
 
 <!ENTITY unsafeContentType.title "Unsafe File Type">
 <!ENTITY unsafeContentType.longDesc "
-<ul> 
-  <li>Please contact the web site owners to inform them of this problem.</li> 
+<ul>
+  <li>Please contact the website owners to inform them of this problem.</li>
 </ul>
 ">
 
 <!ENTITY netReset.title "Connection Interrupted">
 <!ENTITY netReset.longDesc "<p>The network link was interrupted while negotiating a connection. Please try again.</p>">
 
 <!ENTITY netTimeout.title "Network Timeout">
 <!ENTITY netTimeout.longDesc "<p>The requested site did not respond to a connection request and the browser has stopped waiting for a reply.</p><ul><li>Could the server be experiencing high demand or a temporary failure?  Try again later.</li><li>Are you unable to browse other sites? Check the computer’s network connection.</li><li>Is your computer or network protected by a firewall or proxy?  Incorrect settings can interfere with Web browsing.</li><li>Still having trouble? Consult your network administrator or Internet provider for assistance.</li></ul>">
@@ -64,17 +64,17 @@
 
 <!ENTITY redirectLoop.title "Redirect Loop">
 <!ENTITY redirectLoop.longDesc "<p>The browser has stopped trying to retrieve the requested item. The site is redirecting the request in a way that will never complete.</p><ul><li>Have you disabled or blocked cookies required by this site?</li><li><em>NOTE</em>: If accepting the site’s cookies does not resolve the problem, it is probably a server configuration issue and not your computer.</li></ul>">
 
 <!ENTITY unknownSocketType.title "Incorrect Response">
 <!ENTITY unknownSocketType.longDesc "<p>The site responded to the network request in an unexpected way and the browser cannot continue.</p>">
 
 <!ENTITY nssFailure2.title "Secure Connection Failed">
-<!ENTITY nssFailure2.longDesc2 "<p>The page you are trying to view cannot be shown because the authenticity of the received data could not be verified.</p><ul><li>Please contact the web site owners to inform them of this problem.</li></ul>">
+<!ENTITY nssFailure2.longDesc2 "<p>The page you are trying to view cannot be shown because the authenticity of the received data could not be verified.</p><ul><li>Please contact the website owners to inform them of this problem.</li></ul>">
 
 <!ENTITY nssBadCert.title "Secure Connection Failed">
 <!ENTITY nssBadCert.longDesc2 "<ul> 
 <li>This could be a problem with the server’s configuration, or it could be someone trying to impersonate the server.</li> 
 <li>If you have connected to this server successfully in the past, the error may be temporary, and you can try again later.</li> 
 </ul>">
 
 <!ENTITY securityOverride.linkText "Or you can add an exception…">
@@ -82,19 +82,19 @@
 <p>You should not add an exception if you are using an internet connection that you do not trust completely or if you are not used to seeing a warning for this server.</p>
 <p>If you still wish to add an exception for this site, you can do so in your advanced encryption settings.</p>
 ">
 
 <!ENTITY cspBlocked.title "Blocked by Content Security Policy">
 <!ENTITY cspBlocked.longDesc "<p>The browser prevented this page from loading in this way because the page has a content security policy that disallows it.</p>">
 
 <!ENTITY corruptedContentErrorv2.title "Corrupted Content Error">
-<!ENTITY corruptedContentErrorv2.longDesc "<p>The page you are trying to view cannot be shown because an error in the data transmission was detected.</p><ul><li>Please contact the web site owners to inform them of this problem.</li></ul>">
+<!ENTITY corruptedContentErrorv2.longDesc "<p>The page you are trying to view cannot be shown because an error in the data transmission was detected.</p><ul><li>Please contact the website owners to inform them of this problem.</li></ul>">
 
 <!ENTITY remoteXUL.title "Remote XUL">
-<!ENTITY remoteXUL.longDesc "<p><ul><li>Please contact the web site owners to inform them of this problem.</li></ul></p>">
+<!ENTITY remoteXUL.longDesc "<p><ul><li>Please contact the website owners to inform them of this problem.</li></ul></p>">
 
 <!ENTITY inadequateSecurityError.title "Your connection is not secure">
 <!-- LOCALIZATION NOTE (inadequateSecurityError.longDesc) - Do not translate
      "NS_ERROR_NET_INADEQUATE_SECURITY". -->
-<!ENTITY inadequateSecurityError.longDesc "<p><span class='hostname'></span> uses security technology that is outdated and vulnerable to attack. An attacker could easily reveal information which you thought to be safe. The web site administrator will need to fix the server first before you can visit the site.</p><p>Error code: NS_ERROR_NET_INADEQUATE_SECURITY</p>">
+<!ENTITY inadequateSecurityError.longDesc "<p><span class='hostname'></span> uses security technology that is outdated and vulnerable to attack. An attacker could easily reveal information which you thought to be safe. The website administrator will need to fix the server first before you can visit the site.</p><p>Error code: NS_ERROR_NET_INADEQUATE_SECURITY</p>">
 
 <!ENTITY blockedByPolicy.title "Blocked Page">
--- a/dom/chrome/nsWebBrowserPersist.properties
+++ b/dom/chrome/nsWebBrowserPersist.properties
@@ -1,17 +1,17 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 readError=%S could not be saved, because the source file could not be read.\n\nTry again later, or contact the server administrator.
 writeError=%S could not be saved, because an unknown error occurred.\n\nTry saving to a different location.
-launchError=%S could not be opened, because an unknown error occurred.\n\nTry saving to disc first and then opening the file.
-diskFull=There is not enough room on the disc to save %S.\n\nRemove unnecessary files from the disc and try again, or try saving in a different location.
-readOnly=%S could not be saved, because the disc, folder, or file is write-protected.\n\nWrite-enable the disc and try again, or try saving in a different location.
+launchError=%S could not be opened, because an unknown error occurred.\n\nTry saving to disk first and then opening the file.
+diskFull=There is not enough room on the disk to save %S.\n\nRemove unnecessary files from the disk and try again, or try saving in a different location.
+readOnly=%S could not be saved, because the disk, folder, or file is write-protected.\n\nWrite-enable the disk and try again, or try saving in a different location.
 accessError=%S could not be saved, because you cannot change the contents of that folder.\n\nChange the folder properties and try again, or try saving in a different location.
 SDAccessErrorCardReadOnly=Cannot download file because the SD card is in use.
 SDAccessErrorCardMissing=Cannot download file because the SD card is missing.
 helperAppNotFound=%S could not be opened, because the associated helper application does not exist. Change the association in your preferences.
 noMemory=There is not sufficient memory to complete the action you requested.\n\nQuit some applications and try again.
 title=Downloading %S
 fileAlreadyExistsError=%S could not be saved, because a file already exists with the same name as the “_files” directory.\n\nTry saving to a different location.
 fileNameTooLongError=%S could not be saved, because the file name was too long.\n\nTry saving with a shorter file name.
--- a/netwerk/necko.properties
+++ b/netwerk/necko.properties
@@ -32,17 +32,17 @@ DirGoUp=Up to higher level directory
 ShowHidden=Show hidden objects
 DirColName=Name
 DirColSize=Size
 DirColMTime=Last Modified
 DirFileLabel=File:\u0020
 
 PhishingAuth=You are about to visit “%1$S”. This site may be attempting to trick you into thinking you are visiting a different site. Use extreme caution.
 PhishingAuthAccept=I understand and will be very careful
-SuperfluousAuth=You are about to log in to the site “%1$S” with the user name “%2$S”, but the web site does not require authentication. This may be an attempt to trick you.\n\nIs “%1$S” the site you want to visit?
+SuperfluousAuth=You are about to log in to the site “%1$S” with the username “%2$S”, but the website does not require authentication. This may be an attempt to trick you.\n\nIs “%1$S” the site you want to visit?
 AutomaticAuth=You are about to log in to the site “%1$S” with the user name “%2$S”.
 
 TrackingUriBlocked=The resource at “%1$S” was blocked because tracking protection is enabled.
 UnsafeUriBlocked=The resource at “%1$S” was blocked by Safe Browsing.
 
 # LOCALIZATION NOTE (APIDeprecationWarning):
 # %1$S is the deprecated API; %2$S is the API function that should be used.
 APIDeprecationWarning=Warning: “%1$S” deprecated, please use “%2$S”
--- a/security/manager/chrome/pippki/certManager.dtd
+++ b/security/manager/chrome/pippki/certManager.dtd
@@ -29,17 +29,17 @@
 <!ENTITY certmgr.certdetail.o                 "Organization (O)">
 <!ENTITY certmgr.certdetail.ou                "Organizational Unit (OU)">
 <!ENTITY certmgr.certdetail.serialnumber      "Serial Number">
 <!ENTITY certmgr.certdetail.sha256fingerprint "SHA-256 Fingerprint">
 <!ENTITY certmgr.certdetail.sha1fingerprint   "SHA1 Fingerprint">
 
 <!ENTITY certmgr.editcacert.title             "Edit CA certificate trust settings">
 <!ENTITY certmgr.editcert.edittrust           "Edit trust settings:">
-<!ENTITY certmgr.editcert.trustssl            "This certificate can identify web sites.">
+<!ENTITY certmgr.editcert.trustssl            "This certificate can identify websites.">
 <!ENTITY certmgr.editcert.trustemail          "This certificate can identify mail users.">
 
 <!ENTITY certmgr.deletecert.title             "Delete Certificate">
 
 <!ENTITY certmgr.certname                     "Certificate Name">
 <!ENTITY certmgr.certserver                   "Server">
 <!ENTITY certmgr.override_lifetime            "Lifetime">
 <!ENTITY certmgr.tokenname                    "Security Device">
--- a/security/manager/chrome/pippki/pippki.dtd
+++ b/security/manager/chrome/pippki/pippki.dtd
@@ -13,19 +13,18 @@
 <!-- Values for resetpassword.xul -->
 <!ENTITY resetPasswordButtonLabel "Reset">
 <!ENTITY resetPassword.title  "Reset Master Password">
 <!ENTITY resetPassword.text  "If you reset your master password, all your stored web and email passwords, form data, personal certificates, and private keys will be forgotten. Are you sure you want to reset your master password?">
 
 <!-- Downloading a cert -->
 <!ENTITY downloadCert.title "Downloading Certificate">
 <!ENTITY downloadCert.message1 "You have been asked to trust a new Certificate Authority (CA).">
-<!ENTITY downloadCert.trustSSL "Trust this CA to identify web sites.">
+<!ENTITY downloadCert.trustSSL "Trust this CA to identify websites.">
 <!ENTITY downloadCert.trustEmail "Trust this CA to identify email users.">
-<!ENTITY downloadCert.trustObjSign "Trust this CA to identify software developers.">
 <!ENTITY downloadCert.message3 "Before trusting this CA for any purpose, you should examine its certificate and its policy and procedures (if available).">
 <!ENTITY downloadCert.viewCert.label "View">
 <!ENTITY downloadCert.viewCert.text "Examine CA certificate">
 
 <!-- Strings for the SSL client auth ask dialog -->
 <!ENTITY clientAuthAsk.title "User Identification Request">
 <!ENTITY clientAuthAsk.message1 "This site has requested that you identify yourself with a certificate:">
 <!ENTITY clientAuthAsk.message2 "Choose a certificate to present as identification:">
--- a/security/manager/chrome/pippki/pippki.properties
+++ b/security/manager/chrome/pippki/pippki.properties
@@ -87,31 +87,31 @@ clientAuthEmailAddresses=Email addresses
 # cert which issued the selected cert.
 clientAuthIssuedBy=Issued by: %1$S
 # LOCALIZATION NOTE(clientAuthStoredOn): %1$S is the name of the PKCS #11 token
 # the selected cert is stored on.
 clientAuthStoredOn=Stored on: %1$S
 
 # Page Info
 pageInfo_NoEncryption=Connection Not Encrypted
-pageInfo_Privacy_None1=The web site %S does not support encryption for the page you are viewing.
+pageInfo_Privacy_None1=The website %S does not support encryption for the page you are viewing.
 pageInfo_Privacy_None2=Information sent over the Internet without encryption can be seen by other people while it is in transit.
 pageInfo_Privacy_None4=The page you are viewing was not encrypted before being transmitted over the Internet.
 # LOCALIZATION NOTE (pageInfo_EncryptionWithBitsAndProtocol and pageInfo_BrokenEncryption):
 # %1$S is the name of the encryption standard,
 # %2$S is the key size of the cipher.
 # %3$S is protocol version like "SSL 3" or "TLS 1.2"
 pageInfo_EncryptionWithBitsAndProtocol=Connection Encrypted (%1$S, %2$S bit keys, %3$S)
 pageInfo_BrokenEncryption=Broken Encryption (%1$S, %2$S bit keys, %3$S)
 pageInfo_Privacy_Encrypted1=The page you are viewing was encrypted before being transmitted over the Internet.
 pageInfo_Privacy_Encrypted2=Encryption makes it difficult for unauthorized people to view information travelling between computers. It is therefore unlikely that anyone read this page as it travelled across the network.
 pageInfo_MixedContent=Connection Partially Encrypted
 pageInfo_MixedContent2=Parts of the page you are viewing were not encrypted before being transmitted over the Internet.
-pageInfo_WeakCipher=Your connection to this web site uses weak encryption and is not private. Other people can view your information or modify the site’s behaviour.
-pageInfo_CertificateTransparency_Compliant=This web site complies with the Certificate Transparency policy.
+pageInfo_WeakCipher=Your connection to this website uses weak encryption and is not private. Other people can view your information or modify the website’s behaviour.
+pageInfo_CertificateTransparency_Compliant=This website complies with the Certificate Transparency policy.
 
 # Cert Viewer
 # LOCALIZATION NOTE(certViewerTitle): Title used for the Certificate Viewer.
 # %1$S is a string representative of the certificate being viewed.
 certViewerTitle=Certificate Viewer: “%1$S”
 notPresent=<Not Part Of Certificate>
 
 # Token Manager
--- a/toolkit/chrome/global/aboutRights.dtd
+++ b/toolkit/chrome/global/aboutRights.dtd
@@ -18,34 +18,34 @@
 <!ENTITY rights.intro-point1b "Mozilla Public Licence">
 <!ENTITY rights.intro-point1c ". This means you may use, copy and distribute &brandShortName; to others.  You are also welcome to modify the source code of &brandShortName; as you want to meet your needs. The Mozilla Public Licence also gives you the right to distribute your modified versions.">
 
 <!ENTITY rights.intro-point2-a "You are not granted any trademark rights or licences to the trademarks of the Mozilla Foundation or any party, including without limitation the Firefox name or logo. Additional information on trademarks may be found ">
 <!ENTITY rights.intro-point2-b "here">
 <!ENTITY rights.intro-point2-c ".">
 
 <!-- point 2.5 text for official branded builds -->
-<!ENTITY rights.intro-point2.5 "Some features in &brandShortName;, such as the Crash Reporter, give you the option to provide feedback to &vendorShortName;. By choosing to submit feedback, you give &vendorShortName; permission to use the feedback to improve its products, to publish the feedback on its web sites, and to distribute the feedback.">
+<!ENTITY rights.intro-point2.5 "Some features in &brandShortName;, such as the Crash Reporter, give you the option to provide feedback to &vendorShortName;. By choosing to submit feedback, you give &vendorShortName; permission to use the feedback to improve its products, to publish the feedback on its websites, and to distribute the feedback.">
 
 <!-- point 3 text for official branded builds -->
 <!ENTITY rights2.intro-point3a "How we use your personal information and feedback submitted to &vendorShortName; through &brandShortName; is described in the ">
 <!ENTITY rights2.intro-point3b "&brandShortName; Privacy Policy">
 <!ENTITY rights.intro-point3c ".">
 
 <!-- point 3 text for unbranded builds -->
 <!ENTITY rights.intro-point3-unbranded "Any applicable privacy policies for this product should be listed here.">
 
 <!-- point 4 text for official branded builds -->
 <!ENTITY rights2.intro-point4a "Some &brandShortName; features make use of web-based information services, however, we cannot guarantee they are 100&#037; accurate or error-free. More details, including information on how to disable the features that use these services, can be found in the ">
 <!ENTITY rights.intro-point4b "service terms">
 <!ENTITY rights.intro-point4c ".">
 
 <!-- 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">
 
 <!-- point 5 -->
 <!ENTITY rights.intro-point5 "In order to play back certain types of video content, &brandShortName; downloads certain content decryption modules from third parties.">
 
 <!-- Note that this paragraph references a couple of entities from
@@ -70,17 +70,17 @@
 <!ENTITY rights.locationawarebrowsing-b "is always opt-in.  No location information is ever sent without your permission.  If you wish to disable the feature completely, follow these steps:">
 <!ENTITY rights.locationawarebrowsing-term1a "In the URL bar, type ">
 <!ENTITY rights.locationawarebrowsing-term1b "about:config">
 <!ENTITY rights.locationawarebrowsing-term2 "Type geo.enabled">
 <!ENTITY rights.locationawarebrowsing-term3 "Double click on the geo.enabled preference">
 <!ENTITY rights.locationawarebrowsing-term4 "Location-Aware Browsing is now disabled">
 
 <!-- intro paragraph for unbranded builds -->
-<!ENTITY rights.webservices-unbranded "An overview of the web site services the product incorporates, along with instructions on how to disable them, if applicable, should be included here.">
+<!ENTITY rights.webservices-unbranded "An overview of the website services the product incorporates, along with instructions on how to disable them, if applicable, should be included here.">
 
 <!-- point 1 text for unbranded builds -->
 <!ENTITY rights.webservices-term1-unbranded "Any applicable service terms for this product should be listed here.">
 
 <!-- points 1-7 text for branded builds -->
 <!ENTITY rights2.webservices-term1 "&vendorShortName; and its contributors, licensors and partners work to provide the most accurate and up-to-date Services.  However, we cannot guarantee that this information is comprehensive and error-free.  For example, the Safe Browsing Service may not identify some risky sites and may identify some safe sites in error and the Location Aware Service all locations returned by our service providers are estimates only and neither we nor our service providers guarantee the accuracy of the locations provided.">
 <!ENTITY rights.webservices-term2 "&vendorShortName; may discontinue or change the Services at its discretion.">
 <!ENTITY rights2.webservices-term3 "You are welcome to use these Services with the accompanying version of &brandShortName;, and &vendorShortName; grants you its rights to do so.  &vendorShortName; and its licensors reserve all other rights in the Services.  These terms are not intended to limit any rights granted under open source licences applicable to &brandShortName; and to corresponding source code versions of &brandShortName;.">
--- a/toolkit/chrome/global/aboutSupport.dtd
+++ b/toolkit/chrome/global/aboutSupport.dtd
@@ -1,18 +1,20 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY aboutSupport.pageTitle "Troubleshooting Information">
 
 <!-- LOCALIZATION NOTE (aboutSupport.pageSubtitle): don't change the 'supportLink' id. -->
-<!ENTITY aboutSupport.pageSubtitle "  This page contains technical information that might be useful when you’re 
-trying to solve a problem. If you are looking for answers to common questions 
-about &brandShortName;, check out our <a id='supportLink'>support web site</a>.">
+<!ENTITY aboutSupport.pageSubtitle "
+  This page contains technical information that might be useful when you’re
+  trying to solve a problem. If you are looking for answers to common questions
+  about &brandShortName;, check out our <a id='supportLink'>support website</a>.
+">
 
 <!ENTITY aboutSupport.crashes.title "Crash Reports">
 <!-- LOCALIZATION NOTE (aboutSupport.crashes.id):
 This is likely the same like id.heading in aboutcrashes.ftl. -->
 <!ENTITY aboutSupport.crashes.id "Report ID">
 <!ENTITY aboutSupport.crashes.sendDate "Submitted">
 <!ENTITY aboutSupport.crashes.allReports "All Crash Reports">
 <!ENTITY aboutSupport.crashes.noConfig "This application has not been configured to display crash reports.">
--- a/toolkit/chrome/global/commonDialogs.properties
+++ b/toolkit/chrome/global/commonDialogs.properties
@@ -23,10 +23,10 @@ ScriptDialogPreventTitle=Confirm Dialogu
 # LOCALIZATION NOTE (EnterLoginForRealm3, EnterLoginForProxy3):
 # %1 is an untrusted string provided by a remote server. It could try to
 # take advantage of sentence structure in order to mislead the user (see
 # bug 244273). %1 should be integrated into the translated sentences as
 # little as possible. %2 is the url of the site being accessed.
 EnterLoginForRealm3=%2$S is requesting your username and password. The site says: “%1$S”
 EnterLoginForProxy3=The proxy %2$S is requesting a username and password. The site says: “%1$S”
 EnterUserPasswordFor2=%1$S is requesting your username and password.
-EnterUserPasswordForCrossOrigin2=%1$S is requesting your username and password. WARNING: Your password will not be sent to the web site you are currently visiting!
+EnterUserPasswordForCrossOrigin2=%1$S is requesting your username and password. WARNING: Your password will not be sent to the website you are currently visiting!
 EnterPasswordFor=Enter password for %1$S on %2$S