Merge mozilla-central to inbound r=merge a=merge
authorCoroiu Cristina <ccoroiu@mozilla.com>
Wed, 20 Dec 2017 15:59:31 +0200
changeset 448762 a800a6dd1a3901ae6c12c02908f65020591be8d5
parent 448761 f150d4c7c812afac0aafbb9156340ce63b7a9b9d (current diff)
parent 448733 2ff08db67b917fba1558986f3f2f796260f970f8 (diff)
child 448763 e9cfe039a796e2963a6d3e7d2a161b02cdbadcac
push id8527
push userCallek@gmail.com
push dateThu, 11 Jan 2018 21:05:50 +0000
treeherdermozilla-beta@95342d212a7a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge, merge
milestone59.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge mozilla-central to inbound r=merge a=merge
--- a/browser/locales/en-US/chrome/browser/sanitize.dtd
+++ b/browser/locales/en-US/chrome/browser/sanitize.dtd
@@ -10,17 +10,17 @@
 <!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 "17em">
+<!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 clearDataSettings3.label     "When I quit &brandShortName;, it should automatically clear all">
 
 <!-- XXX rearrange entities to match physical layout when l10n isn't an issue -->