From 370403025b441484508b109e97b2648b80a57e93 Mon Sep 17 00:00:00 2001
From: Gavin Sharp <gavin@gavinsharp.com>
Date: Wed, 22 Sep 2010 20:10:30 -0400
Subject: [PATCH] Bug 593125 followup: tweak netOffline error text to specify
 that "Work Offline" is a menu item, r=Pike, a=me

--HG--
extra : rebase_source : 8cb4ba782c081ff422f9a7270caba7bb11dcf0d4
---
 browser/locales/en-US/chrome/overrides/netError.dtd | 9 +++++++--
 docshell/resources/content/netError.xhtml           | 6 +++---
 dom/locales/en-US/chrome/netError.dtd               | 2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/browser/locales/en-US/chrome/overrides/netError.dtd b/browser/locales/en-US/chrome/overrides/netError.dtd
index 2fe541ee8c9e..8221319706e2 100644
--- a/browser/locales/en-US/chrome/overrides/netError.dtd
+++ b/browser/locales/en-US/chrome/overrides/netError.dtd
@@ -53,9 +53,14 @@
 <!ENTITY netInterrupt.longDesc "&sharedLongDesc;">
 
 <!ENTITY netOffline.title "Offline mode">
-<!ENTITY netOffline.longDesc2 "
+<!-- LOCALIZATION NOTE (netOffline.overrideLongDesc) - This string should
+     indicate that "Work Offline" is a menu item without being too specific,
+     since it could be in either the normal menu (Mac/Linux) or the Firefox button
+     menu (Windows).
+-->
+<!ENTITY netOffline.overrideLongDesc "
 <ul>
-  <li>Uncheck &quot;Work Offline&quot;, then try again.</li>
+  <li>Uncheck the &quot;Work Offline&quot; menu item, then try again.</li>
 </ul>
 ">
 
diff --git a/docshell/resources/content/netError.xhtml b/docshell/resources/content/netError.xhtml
index 2be441f9d853..4846134726d4 100644
--- a/docshell/resources/content/netError.xhtml
+++ b/docshell/resources/content/netError.xhtml
@@ -8,8 +8,8 @@
   <!ENTITY % netErrorDTD
     SYSTEM "chrome://global/locale/netError.dtd">
   %netErrorDTD;
-  <!-- Fallback in case netOffline.longDesc2 is not defined -->
-  <!ENTITY netOffline.longDesc2 "&netOffline.longDesc;">
+  <!-- Fallback in case netOffline.overrideLongDesc is not defined -->
+  <!ENTITY netOffline.overrideLongDesc "&netOffline.longDesc;">
   <!ENTITY % globalDTD
     SYSTEM "chrome://global/locale/global.dtd">
   %globalDTD;
@@ -334,7 +334,7 @@
         <div id="ed_redirectLoop">&redirectLoop.longDesc;</div>
         <div id="ed_unknownSocketType">&unknownSocketType.longDesc;</div>
         <div id="ed_netReset">&netReset.longDesc;</div>
-        <div id="ed_netOffline">&netOffline.longDesc2;</div>
+        <div id="ed_netOffline">&netOffline.overrideLongDesc;</div>
         <div id="ed_netInterrupt">&netInterrupt.longDesc;</div>
         <div id="ed_deniedPortAccess">&deniedPortAccess.longDesc;</div>
         <div id="ed_proxyResolveFailure">&proxyResolveFailure.longDesc;</div>
diff --git a/dom/locales/en-US/chrome/netError.dtd b/dom/locales/en-US/chrome/netError.dtd
index 9af919bb0bea..bd666a060777 100644
--- a/dom/locales/en-US/chrome/netError.dtd
+++ b/dom/locales/en-US/chrome/netError.dtd
@@ -26,7 +26,7 @@
 
 <!ENTITY netOffline.title "Offline Mode">
 <!ENTITY netOffline.longDesc "<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>Place the browser in online mode and try again.</li></ul>">
-<!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>Place the browser in online mode and try again.</li></ul>">
+<!ENTITY netOffline.overrideLongDesc "<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>Place the browser in online mode and try again.</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 website owners to inform them of this problem.</li></ul>">