Bug 593126 - Reword text in the private browsing mode content area page based on the menu structure; r=dao a=blocking-beta6+

--HG--
extra : rebase_source : 1a29f86176931868ef844e7595d0645300d6a308

browser/base/content/browser.xul

@@ -441,7 +441,11 @@
   <hbox id="appmenu-button-container" align="start">
   <button id="appmenu-button"
           type="menu"
+#ifdef XP_WIN
           label="&brandShortName;"
+#else
+          label="&appMenuButton.label;"
+#endif
           style="-moz-user-focus: ignore;">
     <menupopup id="appmenu-popup"
                onpopupshowing="updateEditUIVisibility();">

browser/components/privatebrowsing/content/aboutPrivateBrowsing.xhtml

@@ -45,6 +45,13 @@
   %globalDTD;
   <!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd">
   %browserDTD;
+#ifdef XP_WIN
+  <!ENTITY basePBMenu.label   "<span class='appMenuButton'>&brandShortName;</span><span class='toolsMenu'>&toolsMenu.label;</span>">
+#elifdef XP_MACOSX
+  <!ENTITY basePBMenu.label   "&toolsMenu.label;">
+#else
+  <!ENTITY basePBMenu.label   "<span class='appMenuButton'>&appMenuButton.label;</span><span class='toolsMenu'>&toolsMenu.label;</span>">
+#endif
   <!ENTITY % privatebrowsingpageDTD SYSTEM "chrome://browser/locale/aboutPrivateBrowsing.dtd">
   %privatebrowsingpageDTD;
 ]>
@@ -58,6 +65,12 @@
       body.private .showNormal {
         display: none;
       }
+      body.appMenuButtonVisible .toolsMenu {
+        display: none;
+      }
+      body.appMenuButtonInvisible .appMenuButton {
+        display: none;
+      }
     ]]></style>
     <script type="application/javascript;version=1.7"><![CDATA[
       const Cc = Components.classes;
@@ -113,6 +126,13 @@
         let moreInfoLink = document.getElementById("moreInfoLink");
         if (moreInfoLink)
           moreInfoLink.setAttribute("href", moreInfoURL + "private-browsing");
+
+        // Show the correct menu structure based on whether the App Menu button is
+        // shown or not.
+        var menuBar = mainWindow.document.getElementById("toolbar-menubar");
+        var appMenuButtonIsVisible = menuBar.getAttribute("autohide") == "true";
+        document.body.classList.add(appMenuButtonIsVisible ? "appMenuButtonVisible" :
+                                                             "appMenuButtonInvisible");
       }, false);
       
       function togglePrivateBrowsing() {
@@ -157,8 +177,8 @@
 
         <!-- Footer -->
         <div id="footerDesc">
-          <p id="footerText" class="showPrivate">&privatebrowsingpage.howToStop;</p>
-          <p id="footerTextNormal" class="showNormal">&privatebrowsingpage.howToStart;</p>
+          <p id="footerText" class="showPrivate">&privatebrowsingpage.howToStop2;</p>
+          <p id="footerTextNormal" class="showNormal">&privatebrowsingpage.howToStart2;</p>
         </div>
 
         <!-- More Info -->

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

@@ -15,8 +15,10 @@
 <!ENTITY privatebrowsingpage.startPrivateBrowsing.label "Start Private Browsing">
 <!ENTITY privatebrowsingpage.startPrivateBrowsing.accesskey "P">
 
-<!ENTITY privatebrowsingpage.howToStop                 "To stop Private Browsing, select &toolsMenu.label; &gt; &privateBrowsingCmd.stop.label;, or close &brandShortName;.">
-<!ENTITY privatebrowsingpage.howToStart                "To start Private Browsing, you can also select &toolsMenu.label; &gt; &privateBrowsingCmd.start.label;.">
+<!-- LOCALIZATION NOTE (privatebrowsingpage.howToStop2): please leave &basePBMenu.label; intact in the translation -->
+<!-- LOCALIZATION NOTE (privatebrowsingpage.howToStart2): please leave &basePBMenu.label; intact in the translation -->
+<!ENTITY privatebrowsingpage.howToStop2                "To stop Private Browsing, select &basePBMenu.label; &gt; &privateBrowsingCmd.stop.label;, or close &brandShortName;.">
+<!ENTITY privatebrowsingpage.howToStart2               "To start Private Browsing, you can also select &basePBMenu.label; &gt; &privateBrowsingCmd.start.label;.">
 
 <!ENTITY privatebrowsingpage.moreInfo                  "While this computer won't have a record of your browsing history, your internet service provider or employer can still track the pages you visit.">
 <!ENTITY privatebrowsingpage.learnMore                 "Learn More">

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

@@ -133,6 +133,7 @@ can reach it easily. -->
 <!ENTITY bookmarksItem.title          "Bookmarks">
 
 <!-- Toolbar items --> 
+<!ENTITY appMenuButton.label          "Menu">
 <!ENTITY  homeButton.label            "Home">
 <!ENTITY tabViewButton2.label         "Tab Groups">
 <!ENTITY tabViewButton2.tooltip       "Group Your Tabs">