2nd part of the reorganize options under 'UnderTheHood' (bug 3655):

The link 'learn more' now points to a yet-to-be-created article in the help center. I moved it also, so that it appears to the right of the label (instead of below the label).

And finally, I added missing definitions for the Bookmark Manager, which I noticed while I was changing this.

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

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

44 files changed, 161 insertions, 82 deletions

diff --git a/chrome/app/locales/locale_settings.h b/chrome/app/locales/locale_settings.h
index d5198ab..66478df 100644
--- a/chrome/app/locales/locale_settings.h
+++ b/chrome/app/locales/locale_settings.h
@@ -156,9 +156,8 @@
 // The URL for the the Learn More page shown on incognito new tab.
 #define IDS_LEARN_MORE_INCOGNITO_URL 1058
 
-// The URL for the "Learn more" page for the Report user metrics and crash data
-// checkbox in Options.
-#define IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL 1059
+// The URL for the "Learn more" page for the Privacy section under Options.
+#define IDS_LEARN_MORE_PRIVACY_URL 1059
 
 // The URL for more info on how we are affected by 3rd party licenses.
 #define IDS_ABOUT_VERSION_LICENSE_URL 1060
diff --git a/chrome/app/resources/locale_settings_ar.rc b/chrome/app/resources/locale_settings_ar.rc
index b97ccec..6bbad24 100644
--- a/chrome/app/resources/locale_settings_ar.rc
+++ b/chrome/app/resources/locale_settings_ar.rc
@@ -1,3 +1,4 @@
+
 #include "chrome/app/locales/locale_settings.h"
 
 STRINGTABLE
@@ -59,7 +60,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "windows-1256,ISO-8859-6"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/ar/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=ar"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=ar"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=ar"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_bg.rc b/chrome/app/resources/locale_settings_bg.rc
index 549745b..f76d8dd 100644
--- a/chrome/app/resources/locale_settings_bg.rc
+++ b/chrome/app/resources/locale_settings_bg.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "windows-1251,KOI8-R,ISO-8859-5"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/bg/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=bg"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=bg"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=bg"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_ca.rc b/chrome/app/resources/locale_settings_ca.rc
index f827094..3e76ab1 100644
--- a/chrome/app/resources/locale_settings_ca.rc
+++ b/chrome/app/resources/locale_settings_ca.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/ca/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=ca"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=ca"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=ca"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_cs.rc b/chrome/app/resources/locale_settings_cs.rc
index 4f65df6..12bb5ce 100644
--- a/chrome/app/resources/locale_settings_cs.rc
+++ b/chrome/app/resources/locale_settings_cs.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "ISO-8859-2,windows-1250"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/cs/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=cs"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=cs"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=cs"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_da.rc b/chrome/app/resources/locale_settings_da.rc
index d7f7e80..5580239 100644
--- a/chrome/app/resources/locale_settings_da.rc
+++ b/chrome/app/resources/locale_settings_da.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/da/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=da"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=da"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=da"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_de.rc b/chrome/app/resources/locale_settings_de.rc
index d3d1bdd..8458ee8 100644
--- a/chrome/app/resources/locale_settings_de.rc
+++ b/chrome/app/resources/locale_settings_de.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/de/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=de"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=de"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=de"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_el.rc b/chrome/app/resources/locale_settings_el.rc
index 2ca75f4..73510a4 100644
--- a/chrome/app/resources/locale_settings_el.rc
+++ b/chrome/app/resources/locale_settings_el.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "ISO-8859-7,windows-1253"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/el/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=el"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=el"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=el"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_en-GB.rc b/chrome/app/resources/locale_settings_en-GB.rc
index 44ac938..aeef168 100644
--- a/chrome/app/resources/locale_settings_en-GB.rc
+++ b/chrome/app/resources/locale_settings_en-GB.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/en-GB/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=en-GB"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=en-GB"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=en-GB"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_en-US.rc b/chrome/app/resources/locale_settings_en-US.rc
index 100e686..765ad25 100644
--- a/chrome/app/resources/locale_settings_en-US.rc
+++ b/chrome/app/resources/locale_settings_en-US.rc
@@ -59,7 +59,7 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/en-US/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=en-US"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=en-US"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=en-US"
   IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
   IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
diff --git a/chrome/app/resources/locale_settings_es-419.rc b/chrome/app/resources/locale_settings_es-419.rc
index a2b2543..210b5dd 100644
--- a/chrome/app/resources/locale_settings_es-419.rc
+++ b/chrome/app/resources/locale_settings_es-419.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/es-419/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=es-419"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=es-419"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=es-419"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_es.rc b/chrome/app/resources/locale_settings_es.rc
index 95795ae..f6fd956 100644
--- a/chrome/app/resources/locale_settings_es.rc
+++ b/chrome/app/resources/locale_settings_es.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/es/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=es"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=es"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=es"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_et.rc b/chrome/app/resources/locale_settings_et.rc
index 6c1c860..a9aacbc 100644
--- a/chrome/app/resources/locale_settings_et.rc
+++ b/chrome/app/resources/locale_settings_et.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "windows-1257,ISO-8859-4,ISO-8859-13"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/et/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=et"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=et"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=et"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_fi.rc b/chrome/app/resources/locale_settings_fi.rc
index 7ab410e..7c0d2c7 100644
--- a/chrome/app/resources/locale_settings_fi.rc
+++ b/chrome/app/resources/locale_settings_fi.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252,ISO-8859-15"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/fi/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=fi"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=fi"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=fi"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_fil.rc b/chrome/app/resources/locale_settings_fil.rc
index 3145939..343e403 100644
--- a/chrome/app/resources/locale_settings_fil.rc
+++ b/chrome/app/resources/locale_settings_fil.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/fil/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=fil"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=fil"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=fil"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_fr.rc b/chrome/app/resources/locale_settings_fr.rc
index 7b0aee4..ccc1e58 100644
--- a/chrome/app/resources/locale_settings_fr.rc
+++ b/chrome/app/resources/locale_settings_fr.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252,ISO-8859-15"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/fr/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=fr"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=fr"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=fr"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_he.rc b/chrome/app/resources/locale_settings_he.rc
index 666577c..9d1f390 100644
--- a/chrome/app/resources/locale_settings_he.rc
+++ b/chrome/app/resources/locale_settings_he.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "ISO-8859-8,windows-1255,ISO-8859-1"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/he/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=he"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=he"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=he"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_hi.rc b/chrome/app/resources/locale_settings_hi.rc
index 106f211..26b6113 100644
--- a/chrome/app/resources/locale_settings_hi.rc
+++ b/chrome/app/resources/locale_settings_hi.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/hi/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=hi"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=hi"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=hi"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_hr.rc b/chrome/app/resources/locale_settings_hr.rc
index af2671b..e154d08 100644
--- a/chrome/app/resources/locale_settings_hr.rc
+++ b/chrome/app/resources/locale_settings_hr.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "ISO-8859-2,windows-1250"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/hr/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=hr"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=hr"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=hr"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_hu.rc b/chrome/app/resources/locale_settings_hu.rc
index 1a628c2..4c84a3e 100644
--- a/chrome/app/resources/locale_settings_hu.rc
+++ b/chrome/app/resources/locale_settings_hu.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "ISO-8859-2,windows-1250"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/hu/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=hu"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=hu"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=hu"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_id.rc b/chrome/app/resources/locale_settings_id.rc
index bcf5a0b..1253c26 100644
--- a/chrome/app/resources/locale_settings_id.rc
+++ b/chrome/app/resources/locale_settings_id.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/id/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=id"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=id"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=id"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_it.rc b/chrome/app/resources/locale_settings_it.rc
index 390754b..3f1af0b 100644
--- a/chrome/app/resources/locale_settings_it.rc
+++ b/chrome/app/resources/locale_settings_it.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/it/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=it"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=it"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=it"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_ja.rc b/chrome/app/resources/locale_settings_ja.rc
index fcf7a54..d39aea2 100644
--- a/chrome/app/resources/locale_settings_ja.rc
+++ b/chrome/app/resources/locale_settings_ja.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "Shift_JIS,EUC-JP,ISO-2022-JP"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/ja/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=ja"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=ja"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=ja"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_ko.rc b/chrome/app/resources/locale_settings_ko.rc
index 3cf474a..a1cdbf6 100644
--- a/chrome/app/resources/locale_settings_ko.rc
+++ b/chrome/app/resources/locale_settings_ko.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "EUC-KR"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/ko/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=ko"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=ko"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=ko"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_lt.rc b/chrome/app/resources/locale_settings_lt.rc
index 8d94f98..f3c4aa1 100644
--- a/chrome/app/resources/locale_settings_lt.rc
+++ b/chrome/app/resources/locale_settings_lt.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "windows-1257,ISO-8859-4,ISO-8859-13"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/lt/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=lt"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=lt"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=lt"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_lv.rc b/chrome/app/resources/locale_settings_lv.rc
index 497f7a2..c712df4 100644
--- a/chrome/app/resources/locale_settings_lv.rc
+++ b/chrome/app/resources/locale_settings_lv.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "windows-1257,ISO-8859-4,ISO-8859-13"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/lv/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=lv"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=lv"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=lv"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_nb.rc b/chrome/app/resources/locale_settings_nb.rc
index 8cfc610..7e4f0d1 100644
--- a/chrome/app/resources/locale_settings_nb.rc
+++ b/chrome/app/resources/locale_settings_nb.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/no/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=nb"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=nb"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=nb"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_nl.rc b/chrome/app/resources/locale_settings_nl.rc
index 2c896c9..50fafeb 100644
--- a/chrome/app/resources/locale_settings_nl.rc
+++ b/chrome/app/resources/locale_settings_nl.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/nl/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=nl"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=nl"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=nl"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_pl.rc b/chrome/app/resources/locale_settings_pl.rc
index 5e6e622..87f14f5 100644
--- a/chrome/app/resources/locale_settings_pl.rc
+++ b/chrome/app/resources/locale_settings_pl.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "ISO-8859-2,windows-1250"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/pl/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=pl"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=pl"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=pl"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_pt-BR.rc b/chrome/app/resources/locale_settings_pt-BR.rc
index f6b8b11..83849f8 100644
--- a/chrome/app/resources/locale_settings_pt-BR.rc
+++ b/chrome/app/resources/locale_settings_pt-BR.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/pt-BR/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=pt-BR"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=pt-BR"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=pt-BR"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_pt-PT.rc b/chrome/app/resources/locale_settings_pt-PT.rc
index a72aa3f..2edbfc6 100644
--- a/chrome/app/resources/locale_settings_pt-PT.rc
+++ b/chrome/app/resources/locale_settings_pt-PT.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/pt-PT/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=pt-PT"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=pt-PT"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=pt-PT"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_ro.rc b/chrome/app/resources/locale_settings_ro.rc
index 508cf3e..4fc94c0 100644
--- a/chrome/app/resources/locale_settings_ro.rc
+++ b/chrome/app/resources/locale_settings_ro.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "ISO-8859-2,windows-1250"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/ro/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=ro"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=ro"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=ro"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_ru.rc b/chrome/app/resources/locale_settings_ru.rc
index feddaec..0e265f2 100644
--- a/chrome/app/resources/locale_settings_ru.rc
+++ b/chrome/app/resources/locale_settings_ru.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "windows-1251,,KOI8-R,KOI8-U,ISO-8859-5"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/ru/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=ru"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=ru"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=ru"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_sk.rc b/chrome/app/resources/locale_settings_sk.rc
index 6fee828..26bec13 100644
--- a/chrome/app/resources/locale_settings_sk.rc
+++ b/chrome/app/resources/locale_settings_sk.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "windows-1250,ISO-8859-2"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/sk/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=sk"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=sk"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=sk"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_sl.rc b/chrome/app/resources/locale_settings_sl.rc
index 59ecf95..b05cc89 100644
--- a/chrome/app/resources/locale_settings_sl.rc
+++ b/chrome/app/resources/locale_settings_sl.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "ISO-8859-2,windows-1250"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/sl/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=sl"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=sl"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=sl"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_sr.rc b/chrome/app/resources/locale_settings_sr.rc
index 7ab8b44..c5f45ad 100644
--- a/chrome/app/resources/locale_settings_sr.rc
+++ b/chrome/app/resources/locale_settings_sr.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "windows-1251,KOI8-R,ISO-8859-5"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/sr/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=sr"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=sr"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=sr"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_sv.rc b/chrome/app/resources/locale_settings_sv.rc
index ca6aa4b..0d122b9 100644
--- a/chrome/app/resources/locale_settings_sv.rc
+++ b/chrome/app/resources/locale_settings_sv.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "ISO-8859-1,windows-1252"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/sv/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=sv"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=sv"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=sv"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_th.rc b/chrome/app/resources/locale_settings_th.rc
index 55583aa..8ccfc96 100644
--- a/chrome/app/resources/locale_settings_th.rc
+++ b/chrome/app/resources/locale_settings_th.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "TIS-620"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/th/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=th"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=th"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=th"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_tr.rc b/chrome/app/resources/locale_settings_tr.rc
index 9d359f1..32e6537 100644
--- a/chrome/app/resources/locale_settings_tr.rc
+++ b/chrome/app/resources/locale_settings_tr.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "ISO-8859-9,windows-1254"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/tr/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=tr"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=tr"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=tr"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_uk.rc b/chrome/app/resources/locale_settings_uk.rc
index 381b676..faa16da 100644
--- a/chrome/app/resources/locale_settings_uk.rc
+++ b/chrome/app/resources/locale_settings_uk.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "windows-1251,KOI8-U,KOI8-R,ISO-8859-5"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/uk/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=uk"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=uk"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=uk"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_vi.rc b/chrome/app/resources/locale_settings_vi.rc
index bc67985..7ca6b52 100644
--- a/chrome/app/resources/locale_settings_vi.rc
+++ b/chrome/app/resources/locale_settings_vi.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "windows-1258"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/vi/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=vi"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=vi"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=vi"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_zh-CN.rc b/chrome/app/resources/locale_settings_zh-CN.rc
index 67c0995..bcddad3 100644
--- a/chrome/app/resources/locale_settings_zh-CN.rc
+++ b/chrome/app/resources/locale_settings_zh-CN.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "GB2312,gb18030"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/zh-CN/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=zh-CN"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=zh-CN"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=zh-CN"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/app/resources/locale_settings_zh-TW.rc b/chrome/app/resources/locale_settings_zh-TW.rc
index cff1d68..0e5b65c 100644
--- a/chrome/app/resources/locale_settings_zh-TW.rc
+++ b/chrome/app/resources/locale_settings_zh-TW.rc
@@ -59,7 +59,9 @@ BEGIN
   IDS_STATIC_ENCODING_LIST "Big5,Big5-HKSCS"
   IDS_WELCOME_PAGE_URL "http://tools.google.com/chrome/intl/zh-TW/welcome.html"
   IDS_LEARN_MORE_INCOGNITO_URL "http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=zh-TW"
-  IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL "http://www.google.com/support/chrome/bin/answer.py?answer=96817&hl=zh-TW"
+  IDS_LEARN_MORE_PRIVACY_URL "http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=zh-TW"
+  IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS "150"
+  IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES "40"
 END
 
 #if defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc
index 050d73d..f41c433 100644
--- a/chrome/browser/views/options/advanced_contents_view.cc
+++ b/chrome/browser/views/options/advanced_contents_view.cc
@@ -45,6 +45,9 @@
 #include "chromium_strings.h"
 #include "generated_resources.h"
 
+using views::GridLayout;
+using views::ColumnSet;
+
 namespace {
 
 // A background object that paints the scrollable list background,
@@ -67,7 +70,7 @@ class ListBackground : public views::Background {
   }
 
  private:
-  DISALLOW_EVIL_CONSTRUCTORS(ListBackground);
+  DISALLOW_COPY_AND_ASSIGN(ListBackground);
 };
 
 }  // namespace
@@ -90,6 +93,10 @@ class AdvancedSection : public OptionsPageView {
   void AddWrappingColumnSet(views::GridLayout* layout, int id);
   void AddDependentTwoColumnSet(views::GridLayout* layout, int id);
   void AddTwoColumnSet(views::GridLayout* layout, int id);
+  // Similar to AddTwoColumnSet, except the first column is resizable and
+  // the second one has the text on the bottom (to add a trailing link after
+  // text, for example).
+  void AddTwoColumnSetLabelAndLink(views::GridLayout* layout, int id);
   void AddIndentedColumnSet(views::GridLayout* layout, int id);
 
   // Convenience helpers for adding controls to specific layouts in an
@@ -129,7 +136,7 @@ class AdvancedSection : public OptionsPageView {
   // The section title.
   views::Label* title_label_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(AdvancedSection);
+  DISALLOW_COPY_AND_ASSIGN(AdvancedSection);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -161,8 +168,6 @@ void AdvancedSection::DidChangeBounds(const gfx::Rect& previous,
 // AdvancedSection, protected:
 
 void AdvancedSection::AddWrappingColumnSet(views::GridLayout* layout, int id) {
-  using views::GridLayout;
-  using views::ColumnSet;
   ColumnSet* column_set = layout->AddColumnSet(id);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1,
                         GridLayout::USE_PREF, 0, 0);
@@ -170,8 +175,6 @@ void AdvancedSection::AddWrappingColumnSet(views::GridLayout* layout, int id) {
 
 void AdvancedSection::AddDependentTwoColumnSet(views::GridLayout* layout,
                                                int id) {
-  using views::GridLayout;
-  using views::ColumnSet;
   ColumnSet* column_set = layout->AddColumnSet(id);
   column_set->AddPaddingColumn(0, views::CheckBox::GetTextIndent());
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 0,
@@ -183,8 +186,6 @@ void AdvancedSection::AddDependentTwoColumnSet(views::GridLayout* layout,
 }
 
 void AdvancedSection::AddTwoColumnSet(views::GridLayout* layout, int id) {
-  using views::GridLayout;
-  using views::ColumnSet;
   ColumnSet* column_set = layout->AddColumnSet(id);
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
@@ -193,9 +194,17 @@ void AdvancedSection::AddTwoColumnSet(views::GridLayout* layout, int id) {
                         GridLayout::USE_PREF, 0, 0);
 }
 
+void AdvancedSection::AddTwoColumnSetLabelAndLink(views::GridLayout* layout,
+                                                  int id) {
+  ColumnSet* column_set = layout->AddColumnSet(id);
+  column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1,
+                        GridLayout::USE_PREF, 0, 0);
+  column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing);
+  column_set->AddColumn(GridLayout::FILL, GridLayout::TRAILING, 0,
+                        GridLayout::USE_PREF, 0, 0);
+}
+
 void AdvancedSection::AddIndentedColumnSet(views::GridLayout* layout, int id) {
-  using views::GridLayout;
-  using views::ColumnSet;
   ColumnSet* column_set = layout->AddColumnSet(id);
   column_set->AddPaddingColumn(0, views::CheckBox::GetTextIndent());
   column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1,
@@ -245,7 +254,6 @@ void AdvancedSection::AddLeadingControl(views::GridLayout* layout,
                                         views::View* control,
                                         int id,
                                         bool related_follows) {
-  using views::GridLayout;
   layout->StartRow(0, id);
   layout->AddView(control, 1, 1, GridLayout::LEADING, GridLayout::CENTER);
   AddSpacing(layout, related_follows);
@@ -263,9 +271,6 @@ void AdvancedSection::AddSpacing(views::GridLayout* layout,
 void AdvancedSection::InitControlLayout() {
   contents_ = new views::View;
 
-  using views::GridLayout;
-  using views::ColumnSet;
-
   GridLayout* layout = new GridLayout(this);
   SetLayoutManager(layout);
 
@@ -324,7 +329,7 @@ class CookieBehaviorComboModel : public views::ComboBox::Model {
   }
 
  private:
-  DISALLOW_EVIL_CONSTRUCTORS(CookieBehaviorComboModel);
+  DISALLOW_COPY_AND_ASSIGN(CookieBehaviorComboModel);
 };
 
 class PrivacySection : public AdvancedSection,
@@ -380,7 +385,7 @@ class PrivacySection : public AdvancedSection,
 
   void ResolveMetricsReportingEnabled();
 
-  DISALLOW_EVIL_CONSTRUCTORS(PrivacySection);
+  DISALLOW_COPY_AND_ASSIGN(PrivacySection);
 };
 
 PrivacySection::PrivacySection(Profile* profile)
@@ -456,7 +461,7 @@ void PrivacySection::LinkActivated(views::Link* source, int event_flags) {
                                    BrowserType::TABBED_BROWSER,
                                    std::wstring());
     browser->OpenURL(
-        GURL(l10n_util::GetString(IDS_LEARN_MORE_HELPMAKECHROMEBETTER_URL)),
+        GURL(l10n_util::GetString(IDS_LEARN_MORE_PRIVACY_URL)),
         GURL(),
         NEW_WINDOW,
         PageTransition::LINK);
@@ -527,8 +532,6 @@ void PrivacySection::InitControlLayout() {
       l10n_util::GetString(IDS_OPTIONS_COOKIES_SHOWCOOKIES));
   show_cookies_button_->SetListener(this);
 
-  using views::GridLayout;
-  using views::ColumnSet;
   GridLayout* layout = new GridLayout(contents_);
   contents_->SetLayoutManager(layout);
 
@@ -540,11 +543,14 @@ void PrivacySection::InitControlLayout() {
   AddIndentedColumnSet(layout, indented_view_set_id);
   const int indented_column_set_id = 3;
   AddIndentedColumnSet(layout, indented_column_set_id);
+  const int two_column_label_and_link_id = 4;
+  AddTwoColumnSetLabelAndLink(layout, two_column_label_and_link_id);
 
   // The description label at the top and label.
-  AddWrappingLabelRow(layout, section_description_label_,
-                      single_column_view_set_id, true);
-  AddLeadingControl(layout, learn_more_link_, indented_view_set_id, false);
+  section_description_label_->SetMultiLine(true);
+  AddTwoColumnRow(layout, section_description_label_, learn_more_link_, false,
+                  two_column_label_and_link_id, false);
+
   // Link doctor.
   AddWrappingCheckboxRow(layout, enable_link_doctor_checkbox_,
                          single_column_view_set_id, false);
@@ -662,7 +668,7 @@ class WebContentSection : public AdvancedSection,
 
   BooleanPrefMember disable_popup_blocked_notification_pref_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(WebContentSection);
+  DISALLOW_COPY_AND_ASSIGN(WebContentSection);
 };
 
 WebContentSection::WebContentSection(Profile* profile)
@@ -704,8 +710,6 @@ void WebContentSection::InitControlLayout() {
       l10n_util::GetString(IDS_OPTIONS_GEARSSETTINGS_CONFIGUREGEARS_BUTTON));
   gears_settings_button_->SetListener(this);
 
-  using views::GridLayout;
-  using views::ColumnSet;
   GridLayout* layout = new GridLayout(contents_);
   contents_->SetLayoutManager(layout);
 
@@ -769,7 +773,7 @@ class MixedContentComboModel : public views::ComboBox::Model {
   }
 
  private:
-  DISALLOW_EVIL_CONSTRUCTORS(MixedContentComboModel);
+  DISALLOW_COPY_AND_ASSIGN(MixedContentComboModel);
 };
 
 class SecuritySection : public AdvancedSection,
@@ -810,7 +814,7 @@ class SecuritySection : public AdvancedSection,
   StringPrefMember auto_open_files_;
   IntegerPrefMember filter_mixed_content_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(SecuritySection);
+  DISALLOW_COPY_AND_ASSIGN(SecuritySection);
 };
 
 SecuritySection::SecuritySection(Profile* profile)
@@ -904,8 +908,6 @@ void SecuritySection::InitControlLayout() {
       l10n_util::GetString(IDS_OPTIONS_CERTIFICATES_MANAGE_BUTTON));
   manage_certificates_button_->SetListener(this);
 
-  using views::GridLayout;
-  using views::ColumnSet;
   GridLayout* layout = new GridLayout(contents_);
   contents_->SetLayoutManager(layout);
 
@@ -1014,7 +1016,7 @@ class OpenConnectionDialogTask : public Task {
   }
 
  private:
-  DISALLOW_EVIL_CONSTRUCTORS(OpenConnectionDialogTask);
+  DISALLOW_COPY_AND_ASSIGN(OpenConnectionDialogTask);
 };
 
 }  // namespace
@@ -1038,7 +1040,7 @@ class NetworkSection : public AdvancedSection,
   views::Label* change_proxies_label_;
   views::NativeButton* change_proxies_button_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(NetworkSection);
+  DISALLOW_COPY_AND_ASSIGN(NetworkSection);
 };
 
 NetworkSection::NetworkSection(Profile* profile)
@@ -1066,8 +1068,6 @@ void NetworkSection::InitControlLayout() {
       l10n_util::GetString(IDS_OPTIONS_PROXIES_CONFIGURE_BUTTON));
   change_proxies_button_->SetListener(this);
 
-  using views::GridLayout;
-  using views::ColumnSet;
   GridLayout* layout = new GridLayout(contents_);
   contents_->SetLayoutManager(layout);
 
@@ -1114,7 +1114,7 @@ class AdvancedContentsView : public OptionsPageView {
 
   static int line_height_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(AdvancedContentsView);
+  DISALLOW_COPY_AND_ASSIGN(AdvancedContentsView);
 };
 
 // static
@@ -1167,9 +1167,6 @@ void AdvancedContentsView::DidChangeBounds(const gfx::Rect& previous,
 // AdvancedContentsView, OptionsPageView implementation:
 
 void AdvancedContentsView::InitControlLayout() {
-  using views::GridLayout;
-  using views::ColumnSet;
-
   GridLayout* layout = CreatePanelGridLayout(this);
   SetLayoutManager(layout);