Bug 1192088 - Final strings for the updated about:privatebrowsing design. r=bgrins draft
authorPaolo Amadini <paolo.mozmail@amadzone.org>
Fri, 07 Aug 2015 22:35:33 +0100
changeset 283908 4bbc2ea0dced83aafcd1332f5b7e411fe94bbe22
parent 283907 152eafb9dc89a1d37ca5e24ee19d1987a66f1201
child 508151 0888527d7c8abbc6acf816c0e51a193cf1639bc2
push id4195
push userpaolo.mozmail@amadzone.org
push dateFri, 07 Aug 2015 21:46:41 +0000
reviewersbgrins
bugs1192088
milestone42.0a1
Bug 1192088 - Final strings for the updated about:privatebrowsing design. r=bgrins
browser/components/privatebrowsing/content/aboutPrivateBrowsing.xhtml
browser/locales/en-US/chrome/browser/aboutPrivateBrowsing.dtd
--- a/browser/components/privatebrowsing/content/aboutPrivateBrowsing.xhtml
+++ b/browser/components/privatebrowsing/content/aboutPrivateBrowsing.xhtml
@@ -64,18 +64,17 @@
           <span id="tpEnabled"
                 style="width: &trackingProtection.state.width;"
                 class="showTpEnabled">&trackingProtection.state.enabled;</span>
           <span id="tpDisabled"
                 style="width: &trackingProtection.state.width;"
                 class="showTpDisabled">&trackingProtection.state.disabled;</span>
         </div>
         <p id="tpDiagram"/>
-        <p class="showTpEnabled">&trackingProtection.description.enabled;</p>
-        <p class="showTpDisabled">&trackingProtection.description.disabled;</p>
+        <p>&trackingProtection.description;</p>
         <!-- Use text links to implement plain styled buttons without an href. -->
         <label xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
                id="disableTrackingProtection"
                class="text-link showTpEnabled"
                value="&trackingProtection.disable;"/>
         <label xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
                id="enableTrackingProtection"
                class="text-link showTpDisabled"
--- a/browser/locales/en-US/chrome/browser/aboutPrivateBrowsing.dtd
+++ b/browser/locales/en-US/chrome/browser/aboutPrivateBrowsing.dtd
@@ -8,43 +8,44 @@
 
 <!ENTITY privateBrowsing.title                 "Private Browsing">
 
 <!-- LOCALIZATION NOTE (aboutPrivateBrowsing.width):
      Width of the Private Browsing section.
      -->
 <!ENTITY aboutPrivateBrowsing.width            "25em">
 <!ENTITY aboutPrivateBrowsing.title            "You're browsing privately">
-<!ENTITY aboutPrivateBrowsing.subtitle         "&brandShortName; won't remember any history for this window.">
+<!ENTITY aboutPrivateBrowsing.subtitle         "In this window, &brandShortName; will not remember any history.">
 
+<!ENTITY aboutPrivateBrowsing.forgotten        "In this window, &brandShortName; will not remember:">
 <!ENTITY aboutPrivateBrowsing.info.forgotten   "Forgotten">
 <!ENTITY aboutPrivateBrowsing.info.history     "History">
-<!ENTITY aboutPrivateBrowsing.info.search      "Search">
+<!ENTITY aboutPrivateBrowsing.info.search      "Searches">
 <!ENTITY aboutPrivateBrowsing.info.cookies     "Cookies">
 <!ENTITY aboutPrivateBrowsing.info.temporaryFiles "Temporary Files">
 
+<!ENTITY aboutPrivateBrowsing.kept             "&brandShortName; will keep:">
 <!ENTITY aboutPrivateBrowsing.info.kept        "Kept">
 <!ENTITY aboutPrivateBrowsing.info.downloads   "Downloads">
 <!ENTITY aboutPrivateBrowsing.info.bookmarks   "Bookmarks">
 
-<!ENTITY aboutPrivateBrowsing.note             "Your employer or Internet service provider can still track the pages you visit.">
+<!ENTITY aboutPrivateBrowsing.note             "Please note that your employer or Internet service provider can still track the pages you visit.">
 <!ENTITY aboutPrivateBrowsing.learnMore        "Learn More.">
 
 <!-- LOCALIZATION NOTE (trackingProtection.width):
      Width of the Tracking Protection section. This should be enough to
      accommodate the title as well as the enabled or disabled indicator.
      -->
 <!ENTITY trackingProtection.width              "22em">
 <!ENTITY trackingProtection.title              "Tracking Protection">
 
 <!-- LOCALIZATION NOTE (trackingProtection.state.width):
      Width of the element representing the enabled or disabled indicator.
      -->
 <!ENTITY trackingProtection.state.width        "6ch">
 <!ENTITY trackingProtection.state.enabled      "ON">
 <!ENTITY trackingProtection.state.disabled     "OFF">
 
-<!ENTITY trackingProtection.description.enabled "Private Windows now block content that tracks your browsing activity.">
-<!ENTITY trackingProtection.description.disabled "Private Windows will not block content that tracks your browsing activity.">
+<!ENTITY trackingProtection.description        "Private Windows now block parts of the page that may track your browsing activity.">
 
 <!ENTITY trackingProtection.disable            "Turn Tracking Protection Off">
 <!ENTITY trackingProtection.enable             "Turn Tracking Protection On">
 <!ENTITY trackingProtection.startTour          "See how this works">