From e7acbba67080d3566c531a0a32a38d4ef0be4c12 Mon Sep 17 00:00:00 2001
From: Stefan Plewako <splewako>
Date: Wed, 11 Feb 2015 14:26:00 +0000
Subject: [PATCH] Bug 494210 - dialog.width entity should not be shared between
 the two sanitize dialogs, r=gijs

---
 browser/base/content/sanitize.xul             |  2 +-
 browser/components/preferences/sanitize.xul   |  8 ++---
 .../locales/en-US/chrome/browser/sanitize.dtd | 31 ++++++++++---------
 3 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/browser/base/content/sanitize.xul b/browser/base/content/sanitize.xul
index 10b3813a813..c00c6cda766 100644
--- a/browser/base/content/sanitize.xul
+++ b/browser/base/content/sanitize.xul
@@ -26,7 +26,7 @@
             dlgbuttons="accept,cancel"
             title="&sanitizeDialog2.title;"
             noneverythingtitle="&sanitizeDialog2.title;"
-            style="width: &dialog.width2;;"
+            style="width: &sanitizeDialog2.width;;"
             ondialogaccept="return gSanitizePromptDialog.sanitize();">
 
   <prefpane id="SanitizeDialogPane" onpaneload="gSanitizePromptDialog.init();">
diff --git a/browser/components/preferences/sanitize.xul b/browser/components/preferences/sanitize.xul
index a8cdfee01ba..18e212af3ef 100644
--- a/browser/components/preferences/sanitize.xul
+++ b/browser/components/preferences/sanitize.xul
@@ -19,8 +19,8 @@
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
             dlgbuttons="accept,cancel,help"
             ondialoghelp="openPrefsHelp()"
-            dialogWidth="&dialog.width2;"
-            subdialogWidth="&inContentDialog.width;"
+            dialogWidth="&sanitizePrefs2.modal.width;"
+            subdialogWidth="&sanitizePrefs2.inContent.dialog.width;"
             title="&sanitizePrefs2.title;"
             onload="gSanitizeDialog.init();">
 
@@ -49,8 +49,8 @@
       <caption label="&historySection.label;"/>
       <grid flex="1">
         <columns>
-          <column dialogWidth="&column.width2;"
-                  subdialogWidth="&inContentColumn.width;"/>
+          <column dialogWidth="&sanitizePrefs2.column.width;"
+                  subdialogWidth="&sanitizePrefs2.inContent.column.width;"/>
           <column flex="1"/>
         </columns>
         <rows>
diff --git a/browser/locales/en-US/chrome/browser/sanitize.dtd b/browser/locales/en-US/chrome/browser/sanitize.dtd
index 3f5d74f3960..7e082fa12c6 100644
--- a/browser/locales/en-US/chrome/browser/sanitize.dtd
+++ b/browser/locales/en-US/chrome/browser/sanitize.dtd
@@ -3,7 +3,23 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!ENTITY sanitizePrefs2.title          "Settings for Clearing History">
+<!-- LOCALIZATION NOTE (sanitizePrefs2.modal.width): width of the Clear History on Shutdown dialog.
+     Should be large enough to contain the item* strings on a single line.
+     The column width should be set at half of the dialog width. -->
+<!ENTITY sanitizePrefs2.modal.width    "34em">
+<!ENTITY sanitizePrefs2.column.width   "17em">
+<!-- LOCALIZATION NOTE (sanitizePrefs2.inContent.dialog.width): width of the
+     Clear History on Shutdown subdialog in the in-content preferences.
+     Should be large enough to contain the item* strings on a single line.
+     The column width adjusts the width of the first column in the dialog.
+     You can set the column width to a value that makes the dialog look visually balanced,
+     or at half of the dialog width if unsure. -->
+<!ENTITY sanitizePrefs2.inContent.dialog.width "34em">
+<!ENTITY sanitizePrefs2.inContent.column.width "24em">
+
 <!ENTITY sanitizeDialog2.title         "Clear Recent History">
+<!-- LOCALIZATION NOTE (sanitizeDialog2.width): width of the Clear Recent History dialog -->
+<!ENTITY sanitizeDialog2.width         "34em">
 
 <!ENTITY clearDataSettings2.label     "When I quit &brandShortName;, it should automatically clear all:">
 
@@ -53,18 +69,3 @@ that require it.  -->
      that appears when "Time range to clear" is set to "Everything".  See UI
      mockup at bug 480169 -->
 <!ENTITY sanitizeEverythingUndoWarning     "This action cannot be undone.">
-
-<!-- LOCALIZATION NOTE (dialog.width2): width of the Clear Recent History and
-     Clear History on Shutdown dialogs.  Should be large enough to contain
-     the item* strings above on a single line.  The column width should be set
-     at half of the dialog width. -->
-<!ENTITY dialog.width2                 "34em">
-<!ENTITY column.width2                 "17em">
-<!-- LOCALIZATION NOTE (inContentDialog.width): width of the Clear Recent History and
-     Clear History on Shutdown subdialogs in the in-content preferences. Should be
-     large enough to contain the item* strings above on a single line.  The column
-     width adjusts the width of the first column in the dialog. You can set the
-     column width to a value that makes the dialog look visually balanced, or at half
-     of the dialog width if unsure. -->
-<!ENTITY inContentDialog.width         "34em">
-<!ENTITY inContentColumn.width         "24em">