Fix truncation issues for new Privacy UI. Also, make the checkbox for the "clear cookie on exit" item wrap.

http://crbug.com/35118
TEST=none

Review URL: http://codereview.chromium.org/646059

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39564 0039d316-1c4b-4281-b951-d872f2087c98

50 files changed, 61 insertions, 51 deletions

diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/locale_settings.grd
index 7245204..2db80a4 100644
--- a/chrome/app/resources/locale_settings.grd
+++ b/chrome/app/resources/locale_settings.grd
@@ -607,7 +607,7 @@
       <!-- The width and height of the Content Settings Exceptions dialog box in -->
       <!-- characters and lines (See above). -->
       <message name="IDS_CONTENT_EXCEPTION_DIALOG_WIDTH_CHARS" use_name_for_id="true">
-        86
+        90
       </message>
       <message name="IDS_CONTENT_EXCEPTION_DIALOG_HEIGHT_LINES" use_name_for_id="true">
         16
diff --git a/chrome/app/resources/locale_settings_ar.xtb b/chrome/app/resources/locale_settings_ar.xtb
index a5c9362..d3f1a68 100644
--- a/chrome/app/resources/locale_settings_ar.xtb
+++ b/chrome/app/resources/locale_settings_ar.xtb
@@ -17,7 +17,7 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">66</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
+<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">83</translation>
@@ -61,4 +61,7 @@
 <translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES">8</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation>
+<translation id="IDS_CONTENT_SETTINGS_DIALOG_WIDTH_CHARS">83</translation>
+<translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">25</translation>
+<translation id="IDS_CONTENT_EXCEPTION_DIALOG_WIDTH_CHARS">96</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_bg.xtb b/chrome/app/resources/locale_settings_bg.xtb
index f740c8e..e58cf09 100644
--- a/chrome/app/resources/locale_settings_bg.xtb
+++ b/chrome/app/resources/locale_settings_bg.xtb
@@ -17,7 +17,7 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">81</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
+<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">93</translation>
@@ -61,4 +61,7 @@
 <translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES">8</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation>
+<translation id="IDS_CONTENT_SETTINGS_DIALOG_WIDTH_CHARS">90</translation>
+<translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">26</translation>
+<translation id="IDS_CONTENT_EXCEPTION_DIALOG_WIDTH_CHARS">110</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_ca.xtb b/chrome/app/resources/locale_settings_ca.xtb
index 6f22065..1c5a570 100644
--- a/chrome/app/resources/locale_settings_ca.xtb
+++ b/chrome/app/resources/locale_settings_ca.xtb
@@ -17,7 +17,7 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">73</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
+<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">94</translation>
@@ -61,4 +61,6 @@
 <translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES">8</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation>
+<translation id="IDS_CONTENT_SETTINGS_DIALOG_WIDTH_CHARS">83</translation>
+<translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">24</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_cs.xtb b/chrome/app/resources/locale_settings_cs.xtb
index 4ae79e0..5c254e5 100644
--- a/chrome/app/resources/locale_settings_cs.xtb
+++ b/chrome/app/resources/locale_settings_cs.xtb
@@ -17,7 +17,7 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">66</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
+<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">88</translation>
@@ -62,4 +62,6 @@
 <translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES">8</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation>
+<translation id="IDS_CONTENT_SETTINGS_DIALOG_WIDTH_CHARS">83</translation>
+<translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">24</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_da.xtb b/chrome/app/resources/locale_settings_da.xtb
index d2d1876..4085608 100644
--- a/chrome/app/resources/locale_settings_da.xtb
+++ b/chrome/app/resources/locale_settings_da.xtb
@@ -17,7 +17,7 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">65</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
+<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">83</translation>
diff --git a/chrome/app/resources/locale_settings_de.xtb b/chrome/app/resources/locale_settings_de.xtb
index 6a5966b..3cae897 100644
--- a/chrome/app/resources/locale_settings_de.xtb
+++ b/chrome/app/resources/locale_settings_de.xtb
@@ -17,7 +17,7 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">18</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">71</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
+<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">98</translation>
@@ -62,4 +62,7 @@
 <translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES">8</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">94</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation>
+<translation id="IDS_CONTENT_SETTINGS_DIALOG_WIDTH_CHARS">83</translation>
+<translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">25</translation>
+<translation id="IDS_CONTENT_EXCEPTION_DIALOG_WIDTH_CHARS">94</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_el.xtb b/chrome/app/resources/locale_settings_el.xtb
index 6ae421d..1e6540a 100644
--- a/chrome/app/resources/locale_settings_el.xtb
+++ b/chrome/app/resources/locale_settings_el.xtb
@@ -17,7 +17,7 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">84</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16.5</translation>
+<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">96</translation>
@@ -61,4 +61,7 @@
 <translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES">8</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation>
+<translation id="IDS_CONTENT_SETTINGS_DIALOG_WIDTH_CHARS">83</translation>
+<translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">26</translation>
+<translation id="IDS_CONTENT_EXCEPTION_DIALOG_WIDTH_CHARS">98</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_en-GB.xtb b/chrome/app/resources/locale_settings_en-GB.xtb
index 381e46c..16afa64 100644
--- a/chrome/app/resources/locale_settings_en-GB.xtb
+++ b/chrome/app/resources/locale_settings_en-GB.xtb
@@ -17,7 +17,7 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">63</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
+<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">63</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">86</translation>
diff --git a/chrome/app/resources/locale_settings_es-419.xtb b/chrome/app/resources/locale_settings_es-419.xtb
index 1d50536..4b6722e 100644
--- a/chrome/app/resources/locale_settings_es-419.xtb
+++ b/chrome/app/resources/locale_settings_es-419.xtb
@@ -17,7 +17,7 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">65</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
+<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">90</translation>
@@ -62,4 +62,5 @@
 <translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES">8</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation>
+<translation id="IDS_CONTENT_SETTINGS_DIALOG_WIDTH_CHARS">83</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_es.xtb b/chrome/app/resources/locale_settings_es.xtb
index 9fbf1a8..b29c532 100644
--- a/chrome/app/resources/locale_settings_es.xtb
+++ b/chrome/app/resources/locale_settings_es.xtb
@@ -17,7 +17,7 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">66</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
+<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">90</translation>
diff --git a/chrome/app/resources/locale_settings_et.xtb b/chrome/app/resources/locale_settings_et.xtb
index bb283ea..77d9a91 100644
--- a/chrome/app/resources/locale_settings_et.xtb
+++ b/chrome/app/resources/locale_settings_et.xtb
@@ -17,7 +17,7 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
+<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">87</translation>
diff --git a/chrome/app/resources/locale_settings_fi.xtb b/chrome/app/resources/locale_settings_fi.xtb
index 449b1e2..85097d5 100644
--- a/chrome/app/resources/locale_settings_fi.xtb
+++ b/chrome/app/resources/locale_settings_fi.xtb
@@ -17,7 +17,7 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
+<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">83</translation>
diff --git a/chrome/app/resources/locale_settings_fil.xtb b/chrome/app/resources/locale_settings_fil.xtb
index 59219fa..d0cab9b 100644
--- a/chrome/app/resources/locale_settings_fil.xtb
+++ b/chrome/app/resources/locale_settings_fil.xtb
@@ -17,7 +17,7 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">76</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
+<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">105</translation>
@@ -61,4 +61,7 @@
 <translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES">8</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation>
+<translation id="IDS_CONTENT_SETTINGS_DIALOG_WIDTH_CHARS">83</translation>
+<translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">27</translation>
+<translation id="IDS_CONTENT_EXCEPTION_DIALOG_WIDTH_CHARS">92</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_fr.xtb b/chrome/app/resources/locale_settings_fr.xtb
index d1f531a..c94637a 100644
--- a/chrome/app/resources/locale_settings_fr.xtb
+++ b/chrome/app/resources/locale_settings_fr.xtb
@@ -17,7 +17,7 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">74</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
+<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">108</translation>
@@ -62,4 +62,6 @@
 <translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES">8</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation>
+<translation id="IDS_CONTENT_SETTINGS_DIALOG_WIDTH_CHARS">83</translation>
+<translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">26</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_he.xtb b/chrome/app/resources/locale_settings_he.xtb
index 0aeea8f..bde3c95 100644
--- a/chrome/app/resources/locale_settings_he.xtb
+++ b/chrome/app/resources/locale_settings_he.xtb
@@ -17,7 +17,7 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">65</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
+<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">83</translation>
diff --git a/chrome/app/resources/locale_settings_hi.xtb b/chrome/app/resources/locale_settings_hi.xtb
index 2f5833a..c18493d 100644
--- a/chrome/app/resources/locale_settings_hi.xtb
+++ b/chrome/app/resources/locale_settings_hi.xtb
@@ -17,7 +17,6 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">65</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">83</translation>
diff --git a/chrome/app/resources/locale_settings_hr.xtb b/chrome/app/resources/locale_settings_hr.xtb
index 470b1d0..f4cc303 100644
--- a/chrome/app/resources/locale_settings_hr.xtb
+++ b/chrome/app/resources/locale_settings_hr.xtb
@@ -17,7 +17,6 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">68</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">88</translation>
@@ -61,4 +60,5 @@
 <translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES">8</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation>
+<translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">25</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_hu.xtb b/chrome/app/resources/locale_settings_hu.xtb
index f657d53..499a285 100644
--- a/chrome/app/resources/locale_settings_hu.xtb
+++ b/chrome/app/resources/locale_settings_hu.xtb
@@ -17,7 +17,6 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">71</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">83</translation>
@@ -61,4 +60,6 @@
 <translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES">8</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation>
+<translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">25</translation>
+<translation id="IDS_CONTENT_EXCEPTION_DIALOG_WIDTH_CHARS">100</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_id.xtb b/chrome/app/resources/locale_settings_id.xtb
index e9e1073..dfcec22 100644
--- a/chrome/app/resources/locale_settings_id.xtb
+++ b/chrome/app/resources/locale_settings_id.xtb
@@ -17,7 +17,6 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">63</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">83</translation>
@@ -61,4 +60,5 @@
 <translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES">8</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation>
+<translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">25</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_it.xtb b/chrome/app/resources/locale_settings_it.xtb
index 0e3e328..52da073 100644
--- a/chrome/app/resources/locale_settings_it.xtb
+++ b/chrome/app/resources/locale_settings_it.xtb
@@ -17,7 +17,6 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">70</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">93</translation>
diff --git a/chrome/app/resources/locale_settings_ja.xtb b/chrome/app/resources/locale_settings_ja.xtb
index f617d04..6656c37 100644
--- a/chrome/app/resources/locale_settings_ja.xtb
+++ b/chrome/app/resources/locale_settings_ja.xtb
@@ -17,7 +17,6 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">68</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">104</translation>
diff --git a/chrome/app/resources/locale_settings_kn.xtb b/chrome/app/resources/locale_settings_kn.xtb
index 6355646..b9e7166 100644
--- a/chrome/app/resources/locale_settings_kn.xtb
+++ b/chrome/app/resources/locale_settings_kn.xtb
@@ -17,7 +17,6 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">72</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">83</translation>
diff --git a/chrome/app/resources/locale_settings_ko.xtb b/chrome/app/resources/locale_settings_ko.xtb
index b7589b2..5fec328 100644
--- a/chrome/app/resources/locale_settings_ko.xtb
+++ b/chrome/app/resources/locale_settings_ko.xtb
@@ -21,7 +21,6 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">74</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">83</translation>
diff --git a/chrome/app/resources/locale_settings_lt.xtb b/chrome/app/resources/locale_settings_lt.xtb
index f056106..0a4b271 100644
--- a/chrome/app/resources/locale_settings_lt.xtb
+++ b/chrome/app/resources/locale_settings_lt.xtb
@@ -17,7 +17,6 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">68</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">83</translation>
diff --git a/chrome/app/resources/locale_settings_lv.xtb b/chrome/app/resources/locale_settings_lv.xtb
index a95652f..0e71e20 100644
--- a/chrome/app/resources/locale_settings_lv.xtb
+++ b/chrome/app/resources/locale_settings_lv.xtb
@@ -17,7 +17,6 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">62</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">87</translation>
diff --git a/chrome/app/resources/locale_settings_ml.xtb b/chrome/app/resources/locale_settings_ml.xtb
index 9227d8a..a116175 100644
--- a/chrome/app/resources/locale_settings_ml.xtb
+++ b/chrome/app/resources/locale_settings_ml.xtb
@@ -17,7 +17,6 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">82</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">80</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">113</translation>
diff --git a/chrome/app/resources/locale_settings_mr.xtb b/chrome/app/resources/locale_settings_mr.xtb
index 8d87f43..4c9c8f7 100644
--- a/chrome/app/resources/locale_settings_mr.xtb
+++ b/chrome/app/resources/locale_settings_mr.xtb
@@ -17,7 +17,6 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">65</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">83</translation>
diff --git a/chrome/app/resources/locale_settings_nb.xtb b/chrome/app/resources/locale_settings_nb.xtb
index d509d98..1b48316 100644
--- a/chrome/app/resources/locale_settings_nb.xtb
+++ b/chrome/app/resources/locale_settings_nb.xtb
@@ -17,7 +17,6 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">66</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">89</translation>
@@ -61,4 +60,6 @@
 <translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES">8</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation>
+<translation id="IDS_CONTENT_SETTINGS_DIALOG_WIDTH_CHARS">84</translation>
+<translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">25</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_nl.xtb b/chrome/app/resources/locale_settings_nl.xtb
index 6d74049..0d14b37 100644
--- a/chrome/app/resources/locale_settings_nl.xtb
+++ b/chrome/app/resources/locale_settings_nl.xtb
@@ -17,7 +17,6 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">67</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">89</translation>
@@ -62,4 +61,6 @@
 <translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES">8</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation>
+<translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">25</translation>
+<translation id="IDS_CONTENT_EXCEPTION_DIALOG_WIDTH_CHARS">97</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_or.xtb b/chrome/app/resources/locale_settings_or.xtb
index c4c1fee..1ecab38 100644
--- a/chrome/app/resources/locale_settings_or.xtb
+++ b/chrome/app/resources/locale_settings_or.xtb
@@ -17,7 +17,6 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">65</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">83</translation>
diff --git a/chrome/app/resources/locale_settings_pl.xtb b/chrome/app/resources/locale_settings_pl.xtb
index 3344467..b394b9a 100644
--- a/chrome/app/resources/locale_settings_pl.xtb
+++ b/chrome/app/resources/locale_settings_pl.xtb
@@ -17,7 +17,6 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">96</translation>
@@ -62,4 +61,5 @@
 <translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES">8</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation>
+<translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">25</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_pt-BR.xtb b/chrome/app/resources/locale_settings_pt-BR.xtb
index c6e7d26..31f87da 100644
--- a/chrome/app/resources/locale_settings_pt-BR.xtb
+++ b/chrome/app/resources/locale_settings_pt-BR.xtb
@@ -17,7 +17,6 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">65</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">96</translation>
@@ -62,4 +61,5 @@
 <translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES">8</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation>
+<translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">25</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_pt-PT.xtb b/chrome/app/resources/locale_settings_pt-PT.xtb
index c2f2795..91dfc6f 100644
--- a/chrome/app/resources/locale_settings_pt-PT.xtb
+++ b/chrome/app/resources/locale_settings_pt-PT.xtb
@@ -17,7 +17,6 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">64</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">96</translation>
diff --git a/chrome/app/resources/locale_settings_ro.xtb b/chrome/app/resources/locale_settings_ro.xtb
index 6b53dfb..95eb5d4 100644
--- a/chrome/app/resources/locale_settings_ro.xtb
+++ b/chrome/app/resources/locale_settings_ro.xtb
@@ -17,7 +17,6 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">73</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">96</translation>
@@ -61,4 +60,5 @@
 <translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES">8</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation>
+<translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">26</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_ru.xtb b/chrome/app/resources/locale_settings_ru.xtb
index c5254a1..38e4712 100644
--- a/chrome/app/resources/locale_settings_ru.xtb
+++ b/chrome/app/resources/locale_settings_ru.xtb
@@ -17,7 +17,6 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">66</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">98</translation>
@@ -62,4 +61,7 @@
 <translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES">8</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation>
+<translation id="IDS_CONTENT_SETTINGS_DIALOG_WIDTH_CHARS">97</translation>
+<translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">25</translation>
+<translation id="IDS_CONTENT_EXCEPTION_DIALOG_WIDTH_CHARS">94</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_sk.xtb b/chrome/app/resources/locale_settings_sk.xtb
index 5eb9985..58ea16d 100644
--- a/chrome/app/resources/locale_settings_sk.xtb
+++ b/chrome/app/resources/locale_settings_sk.xtb
@@ -17,7 +17,6 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">66</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">100</translation>
@@ -61,4 +60,6 @@
 <translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES">8</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation>
+<translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">25</translation>
+<translation id="IDS_CONTENT_EXCEPTION_DIALOG_WIDTH_CHARS">80</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_sl.xtb b/chrome/app/resources/locale_settings_sl.xtb
index b97a703..15424fd 100644
--- a/chrome/app/resources/locale_settings_sl.xtb
+++ b/chrome/app/resources/locale_settings_sl.xtb
@@ -17,7 +17,6 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">66</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">87</translation>
diff --git a/chrome/app/resources/locale_settings_sr.xtb b/chrome/app/resources/locale_settings_sr.xtb
index 69f7136..9edde8ff 100644
--- a/chrome/app/resources/locale_settings_sr.xtb
+++ b/chrome/app/resources/locale_settings_sr.xtb
@@ -17,7 +17,6 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">72</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">104</translation>
@@ -61,4 +60,5 @@
 <translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES">8</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation>
+<translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">25</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_sv.xtb b/chrome/app/resources/locale_settings_sv.xtb
index 9f067ea..90094f1 100644
--- a/chrome/app/resources/locale_settings_sv.xtb
+++ b/chrome/app/resources/locale_settings_sv.xtb
@@ -17,7 +17,6 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">63</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">88</translation>
diff --git a/chrome/app/resources/locale_settings_sw.xtb b/chrome/app/resources/locale_settings_sw.xtb
index a13a93c..91c7018 100644
--- a/chrome/app/resources/locale_settings_sw.xtb
+++ b/chrome/app/resources/locale_settings_sw.xtb
@@ -17,7 +17,6 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">63</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">63</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">86</translation>
diff --git a/chrome/app/resources/locale_settings_ta.xtb b/chrome/app/resources/locale_settings_ta.xtb
index 5e2aa2f..6cb076f 100644
--- a/chrome/app/resources/locale_settings_ta.xtb
+++ b/chrome/app/resources/locale_settings_ta.xtb
@@ -17,7 +17,6 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">96</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">105</translation>
diff --git a/chrome/app/resources/locale_settings_te.xtb b/chrome/app/resources/locale_settings_te.xtb
index 090f65f..735d2da 100644
--- a/chrome/app/resources/locale_settings_te.xtb
+++ b/chrome/app/resources/locale_settings_te.xtb
@@ -17,7 +17,6 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">75</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">84</translation>
diff --git a/chrome/app/resources/locale_settings_th.xtb b/chrome/app/resources/locale_settings_th.xtb
index 2fbe3a3..e075d37 100644
--- a/chrome/app/resources/locale_settings_th.xtb
+++ b/chrome/app/resources/locale_settings_th.xtb
@@ -17,7 +17,6 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">83</translation>
diff --git a/chrome/app/resources/locale_settings_tr.xtb b/chrome/app/resources/locale_settings_tr.xtb
index bf37db1..b80a770 100644
--- a/chrome/app/resources/locale_settings_tr.xtb
+++ b/chrome/app/resources/locale_settings_tr.xtb
@@ -17,7 +17,6 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">65</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">83</translation>
diff --git a/chrome/app/resources/locale_settings_uk.xtb b/chrome/app/resources/locale_settings_uk.xtb
index 25ad590..592481b 100644
--- a/chrome/app/resources/locale_settings_uk.xtb
+++ b/chrome/app/resources/locale_settings_uk.xtb
@@ -17,7 +17,6 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">66</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">83</translation>
@@ -61,4 +60,6 @@
 <translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES">8</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation>
+<translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">25</translation>
+<translation id="IDS_CONTENT_EXCEPTION_DIALOG_WIDTH_CHARS">94</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_vi.xtb b/chrome/app/resources/locale_settings_vi.xtb
index 2c57c9e..246ee7b 100644
--- a/chrome/app/resources/locale_settings_vi.xtb
+++ b/chrome/app/resources/locale_settings_vi.xtb
@@ -17,7 +17,6 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">67</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">88</translation>
@@ -61,4 +60,5 @@
 <translation id="IDS_CONFIRM_STOP_SYNCING_DIALOG_HEIGHT_LINES">8</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_WIDTH_CHARS">67</translation>
 <translation id="IDS_DOWNLOAD_IN_PROGRESS_MINIMUM_HEIGHT_LINES">4</translation>
+<translation id="IDS_CONTENT_SETTINGS_DIALOG_HEIGHT_LINES">25</translation>
 </translationbundle>
diff --git a/chrome/app/resources/locale_settings_zh-CN.xtb b/chrome/app/resources/locale_settings_zh-CN.xtb
index 69309ea..01a3f0b 100644
--- a/chrome/app/resources/locale_settings_zh-CN.xtb
+++ b/chrome/app/resources/locale_settings_zh-CN.xtb
@@ -17,7 +17,6 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">60</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">16</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">83</translation>
diff --git a/chrome/app/resources/locale_settings_zh-TW.xtb b/chrome/app/resources/locale_settings_zh-TW.xtb
index 023952f..717a0a1 100644
--- a/chrome/app/resources/locale_settings_zh-TW.xtb
+++ b/chrome/app/resources/locale_settings_zh-TW.xtb
@@ -17,7 +17,6 @@
 <translation id="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">85</translation>
 <translation id="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">17</translation>
 <translation id="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">67</translation>
-<translation id="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">17.5</translation>
 <translation id="IDS_IMPORT_DIALOG_WIDTH_CHARS">60</translation>
 <translation id="IDS_IMPORT_DIALOG_HEIGHT_LINES">14</translation>
 <translation id="IDS_ABOUT_DIALOG_WIDTH_CHARS">83</translation>
diff --git a/chrome/browser/views/options/cookie_filter_page_view.cc b/chrome/browser/views/options/cookie_filter_page_view.cc
index 1d447cd..574397e 100644
--- a/chrome/browser/views/options/cookie_filter_page_view.cc
+++ b/chrome/browser/views/options/cookie_filter_page_view.cc
@@ -54,7 +54,7 @@ void CookieFilterPageView::InitControlLayout() {
   const int single_column_set_id = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(single_column_set_id);
   column_set->AddPaddingColumn(0, kRelatedControlVerticalSpacing);
-  column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
+  column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1,
                         GridLayout::USE_PREF, 0, 0);
 
   views::Label* title_label = new views::Label(
@@ -113,7 +113,7 @@ void CookieFilterPageView::InitControlLayout() {
 
   layout->StartRow(0, single_column_set_id);
   layout->AddView(exceptions_button_, 1, 1, GridLayout::LEADING,
-                  GridLayout::FILL);
+                  GridLayout::CENTER);
   layout->AddPaddingRow(0, kUnrelatedControlLargeVerticalSpacing);
 
   block_3rdparty_check_ = new views::Checkbox(
@@ -130,6 +130,7 @@ void CookieFilterPageView::InitControlLayout() {
 
   clear_on_close_check_ = new views::Checkbox(
       l10n_util::GetString(IDS_COOKIES_CLEAR_WHEN_CLOSE_CHKBOX));
+  clear_on_close_check_->SetMultiLine(true);
   clear_on_close_check_->set_listener(this);
 
   layout->StartRow(0, single_column_set_id);