Bug 598518: update netError.dtd override to take into account changes from bug 593125 and bug 546857, r=mfinkle
authorGavin Sharp <gavin@gavinsharp.com>
Wed, 22 Sep 2010 20:27:00 -0400
changeset 66697 2a3347826c6afcc6524fe4fbc621a2f28dfc3169
parent 66696 221e91625a5b509b661562e00e81fa58e8653e8f
child 66698 a31a0fa3cb9e2ce68e66201001c9b5e13b5816aa
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs598518, 593125, 546857
Bug 598518: update netError.dtd override to take into account changes from bug 593125 and bug 546857, r=mfinkle
--- a/mobile/locales/en-US/chrome/overrides/netError.dtd
+++ b/mobile/locales/en-US/chrome/overrides/netError.dtd
@@ -47,28 +47,23 @@
   <li>Make sure that you're using forward slashes (i.e.
 <!ENTITY netInterrupt.title "The connection was interrupted">
 <!ENTITY netInterrupt.longDesc "&sharedLongDesc;">
-<!-- LOCALIZATION NOTE (netOffline2.longDesc) - Workaround to allow the l10n tools
-to pickup this string change. Please update netOffline.longDesc too -->
-<!ENTITY netOffline2.longDesc "
+<!ENTITY netOffline.title "Offline mode">
+<!ENTITY netOffline.overrideLongDesc "
   <li>Try again. &brandShortName; will attempt to open a connection and reload the page.</li>
-<!ENTITY netOffline.title "Offline mode">
-<!ENTITY netOffline.longDesc "&netOffline2.longDesc;">
 <!ENTITY contentEncodingError.title "Content Encoding Error">
 <!ENTITY contentEncodingError.longDesc "
   <li>Please contact the website owners to inform them of this problem.</li>
 <!ENTITY unsafeContentType.title "Unsafe File Type">
@@ -170,19 +165,19 @@ be temporary, and you can try again late
 <!ENTITY cspFrameAncestorBlocked.title "Blocked by Content Security Policy">
 <!ENTITY cspFrameAncestorBlocked.longDesc "<p>&brandShortName; prevented this page from loading in this way because the page has a content security policy that disallows it.</p>">
 <!ENTITY securityOverride.linkText "Or you can add an exception…">
 <!ENTITY securityOverride.getMeOutOfHereButton "Get me out of here!">
 <!ENTITY securityOverride.exceptionButtonLabel "Add Exception…">
-<!-- LOCALIZATION NOTE (securityOverride.warningText) - Do not translate the
+<!-- LOCALIZATION NOTE (securityOverride.warningContent) - Do not translate the
 contents of the <xul:button> tags.  The only language content is the label= field,
 which uses strings already defined above. The button is included here (instead of
 netError.xhtml) because it exposes functionality specific to firefox. -->
-<!ENTITY securityOverride.warningText "
+<!ENTITY securityOverride.warningContent "
 <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>
-<xul:button xmlns:xul='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul' id='getMeOutOfHereButton' label='&securityOverride.getMeOutOfHereButton;'/>
-<xul:button xmlns:xul='http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul' id='exceptionDialogButton' label='&securityOverride.exceptionButtonLabel;'/>
+<button id='getMeOutOfHereButton'>&securityOverride.getMeOutOfHereButton;</button>
+<button id='exceptionDialogButton'>&securityOverride.exceptionButtonLabel;</button>