Add locale_settings.grd to the build. This generates

a locale_settings.h file that we use on all platforms.  However,
the rc generation isn't correct yet, so for now, use the existing
locale_settings_*.rc files.

Also go ahead and generate the en-US locale pak on linux.

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

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

57 files changed, 192 insertions, 231 deletions

diff --git a/chrome/app/chrome_strings.scons b/chrome/app/chrome_strings.scons
index 580565f..2b5934e 100644
--- a/chrome/app/chrome_strings.scons
+++ b/chrome/app/chrome_strings.scons
@@ -12,6 +12,7 @@ grd_files = [
     '$CHROME_SRC_DIR/chrome/app/generated_resources.grd',
     '$CHROME_SRC_DIR/chrome/app/chromium_strings.grd',
     '$CHROME_SRC_DIR/chrome/app/google_chrome_strings.grd',
+    '$CHROME_SRC_DIR/chrome/app/resources/locale_settings.grd',
 ]
 
 for grd_file in grd_files:
@@ -20,3 +21,15 @@ for grd_file in grd_files:
   generated = env.GRIT(
       '$TARGET_ROOT/grit_derived_sources/fake_' + os.path.basename(grd_file),
       grd_file)
+
+if env.Bit('linux'):
+  # TODO(tc): Generate all the locales and handle official build vs chromium
+  # build.
+  lang_pak = env.Repack('$TARGET_ROOT/locales/en-US.pak',
+      ['$TARGET_ROOT/grit_derived_sources/generated_resources_en-US.pak',
+       '$TARGET_ROOT/grit_derived_sources/chromium_strings_en-US.pak',
+       '$TARGET_ROOT/grit_derived_sources/locale_settings_en-US.pak',
+      ]
+  )
+  i = env.Install('$DESTINATION_ROOT/locales', lang_pak)
+  env.Requires('$DESTINATION_ROOT/chrome', i)
diff --git a/chrome/app/chrome_strings.vcproj b/chrome/app/chrome_strings.vcproj
index 165e2ea..a4d063b 100644
--- a/chrome/app/chrome_strings.vcproj
+++ b/chrome/app/chrome_strings.vcproj
@@ -64,5 +64,13 @@
 			RelativePath="$(IntDir)\google_chrome_strings.h"
 			>
 		</File>
+		<File
+			RelativePath=".\resources\locale_settings.grd"
+			>
+		</File>
+		<File
+			RelativePath="$(IntDir)\locale_settings.h"
+			>
+		</File>
 	</Files>
 </VisualStudioProject>
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
index 981517e..aad04c6 100644
--- a/chrome/app/chromium_strings.grd
+++ b/chrome/app/chromium_strings.grd
@@ -60,6 +60,8 @@ be available for now. -->
     <output filename="chromium_strings_vi.rc" type="rc_all" lang="vi" />
     <output filename="chromium_strings_zh-CN.rc" type="rc_all" lang="zh-CN" />
     <output filename="chromium_strings_zh-TW.rc" type="rc_all" lang="zh-TW" />
+
+    <output filename="chromium_strings_en-US.pak" type="data_package" lang="en" />
   </outputs>
   <translations>
     <!-- No translations available. -->
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 6a8669d..601fdc6 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -61,6 +61,8 @@ each locale. -->
     <output filename="generated_resources_vi.rc" type="rc_all" lang="vi" />
     <output filename="generated_resources_zh-CN.rc" type="rc_all" lang="zh-CN" />
     <output filename="generated_resources_zh-TW.rc" type="rc_all" lang="zh-TW" />
+
+    <output filename="generated_resources_en-US.pak" type="data_package" lang="en" />
   </outputs>
   <translations>
     <file path="resources/generated_resources_ar.xtb" lang="ar" />
diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd
index a8e7235..6d71ed7 100644
--- a/chrome/app/google_chrome_strings.grd
+++ b/chrome/app/google_chrome_strings.grd
@@ -60,6 +60,8 @@ Chrome supports. -->
     <output filename="google_chrome_strings_vi.rc" type="rc_all" lang="vi" />
     <output filename="google_chrome_strings_zh-CN.rc" type="rc_all" lang="zh-CN" />
     <output filename="google_chrome_strings_zh-TW.rc" type="rc_all" lang="zh-TW" />
+
+    <output filename="google_chrome_strings_en-US.pak" type="data_package" lang="en" />
   </outputs>
   <translations>
     <file path="resources/google_chrome_strings_ar.xtb" lang="ar" />
diff --git a/chrome/app/locales/locale_settings.h b/chrome/app/locales/locale_settings.h
deleted file mode 100644
index 9b2034b..0000000
--- a/chrome/app/locales/locale_settings.h
+++ /dev/null
@@ -1,181 +0,0 @@
-// These are the identifiers for locale specific settings.
-
-// UNUSED                             1000
-
-// The font used in web-style native pages (e.g. History).
-#define IDS_WEB_FONT_FAMILY           1001
-
-// The default value for HTTP Accept-Language header.
-#define IDS_ACCEPT_LANGUAGES          1002
-
-// Default values for the WebPreference object.
-// The default value for |WebPreference::default_encoding|.
-#define IDS_DEFAULT_ENCODING          1003
-// The default value to determine whether |WebPreference::standard_font_family|
-// serif or sans-serif
-#define IDS_STANDARD_FONT_IS_SERIF    1004
-// The default value for |WebPreference::fixed_font_family|
-#define IDS_FIXED_FONT_FAMILY         1005
-// The default value for |WebPreference::serif_font_family|
-#define IDS_SERIF_FONT_FAMILY         1006
-// The default value for |WebPreference::sans_serif_font_family|
-#define IDS_SANS_SERIF_FONT_FAMILY    1007
-// The default value for |WebPreference::cursive_font_family|
-#define IDS_CURSIVE_FONT_FAMILY       1008
-// The default value for |WebPreference::fantasy_font_family|
-#define IDS_FANTASY_FONT_FAMILY       1009
-// The default value for |WebPreference::default_font_size|
-#define IDS_DEFAULT_FONT_SIZE         1010
-// The default value for |WebPreference::default_fixed_font_size|
-#define IDS_DEFAULT_FIXED_FONT_SIZE   1011
-// The default value for |WebPreference::minimum_font_size|
-#define IDS_MINIMUM_FONT_SIZE         1012
-// The default value for |WebPreference::minimum_logical_font_size|.
-#define IDS_MINIMUM_LOGICAL_FONT_SIZE 1013
-// The default value for |WebPreference::uses_universal_detector|.
-#define IDS_USES_UNIVERSAL_DETECTOR   1014
-
-
-// The file name of the spellchecking dictionary without the extension (case-sensitive).
-#define IDS_SPELLCHECK_DICTIONARY     1015
-
-// URL for the "Learn more" link on the malware blocking page.
-#define IDS_LEARN_MORE_MALWARE_URL    1016
-
-// URL for the "Learn more" link on the phishing blocking page.
-#define IDS_LEARN_MORE_PHISHING_URL   1017
-
-// Removed: #define IDS_REPORT_ERROR_PHISHING_URL 1018
-
-// Removed: #define IDS_PAGE_MENU_REPORT_PHISHING_WEBSITE_URL 1019
-
-// The width of the Options dialog box, in characters (character width =
-// average character width for default dialog box font)
-#define IDS_OPTIONS_DIALOG_WIDTH_CHARS 1020
-
-// The height of the Options dialog box, in lines (line height = character
-// height for default dialog box font)
-#define IDS_OPTIONS_DIALOG_HEIGHT_LINES 1021
-
-// The width of the title column of the Options dialog box, in characters (see
-// above for defn of character width)
-#define IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS 1022
-
-// The URL to be loaded to display Help
-#define IDS_HELP_CONTENT_URL          1023
-
-// URL to post bug reports to
-#define IDS_BUGREPORT_POST_URL        1024
-
-// The width and height of the Bug Reporting dialog box in characters and lines
-// (See above).
-#define IDS_BUGREPORT_DIALOG_WIDTH_CHARS 1025
-#define IDS_BUGREPORT_DIALOG_HEIGHT_LINES 1026
-
-// The width and height of the Clear Browsing Data dialog box in characters and
-// lines (See above).
-#define IDS_CLEARDATA_DIALOG_WIDTH_CHARS 1027
-#define IDS_CLEARDATA_DIALOG_HEIGHT_LINES 1028
-
-// The width and height of the Import dialog box in characters and lines (See
-// above).
-#define IDS_IMPORT_DIALOG_WIDTH_CHARS 1029
-#define IDS_IMPORT_DIALOG_HEIGHT_LINES 1030
-
-// The width and height of the About dialog box in characters and lines (See
-// above).
-#define IDS_ABOUT_DIALOG_WIDTH_CHARS 1031
-#define IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES 1032
-
-// The width and height of the Fonts and Languages dialog box in characters and
-// lines (See above).
-#define IDS_FONTSLANG_DIALOG_WIDTH_CHARS 1033
-#define IDS_FONTSLANG_DIALOG_HEIGHT_LINES 1034
-
-// Locale-dependent static encodings string
-#define IDS_STATIC_ENCODING_LIST 1035
-
-// The width and height of the Page Info dialog box in characters and lines
-// (See above).
-#define IDS_PAGEINFO_DIALOG_WIDTH_CHARS 1036
-#define IDS_PAGEINFO_DIALOG_HEIGHT_LINES 1037
-
-// The width and height of the Search Engines dialog box in characters and
-// lines (See above).
-#define IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS 1038
-#define IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES 1039
-
-// The width and height of the Shelf Item dialog box in characters and
-// lines (See above).
-#define IDS_SHELFITEM_DIALOG_WIDTH_CHARS 1040
-#define IDS_SHELFITEM_DIALOG_HEIGHT_LINES 1041
-
-// The width and height of the Edit Bookmark dialog box in characters and lines
-// (See above).
-#define IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS 1042
-#define IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES 1043
-
-// The width and height of the First Run dialog box in characters and lines
-// (See above).
-#define IDS_FIRSTRUN_DIALOG_WIDTH_CHARS 1044
-#define IDS_FIRSTRUN_DIALOG_HEIGHT_LINES 1045
-
-// The width and height of the First Run Customize dialog box in characters and
-// lines (See above).
-#define IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS 1046
-#define IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES 1047
-
-// The width and height of the Cookies dialog box in characters and lines
-// (See above).
-#define IDS_COOKIES_DIALOG_WIDTH_CHARS 1048
-#define IDS_COOKIES_DIALOG_HEIGHT_LINES 1049
-
-// The width and height of the Import Progress dialog box in characters and
-// lines (See above).
-#define IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS 1050
-#define IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES 1051
-
-// The width and height of the "Mozilla Firefox is locked" dialog box in
-// characters and lines (See above).
-#define IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS 1052
-#define IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES 1053
-
-// The width and height of the First Run Search Information bubble in
-// characters and lines (See above).
-#define IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS 1054
-#define IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES 1055
-
-// The width of the font style column in the Fonts and Languages dialog box,
-// in character widths.
-#define IDS_FONTSLANG_LABEL_WIDTH 1056
-
-// The URL for the the Welcome to Chrome page shown on first run.
-#define IDS_WELCOME_PAGE_URL 1057
-
-// 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 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
-
-// The HTML for the about:terms page
-#define IDR_TERMS_HTML 1061
-
-// The width and height of the bookmark manager in characters and lines
-// (See above).
-#define IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS 1062
-#define IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES 1063
-
-// The language dependent download view size.
-#define IDS_DOWNLOAD_BIG_PROGRESS_SIZE 1064
-
-// The width and height of the Select Profile dialog in characters and lines
-// (See above).
-#define IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS 1065
-#define IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES 1066
-
-// The width of the New Profile dialog in characters (See above).
-#define IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS 1067
diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/locale_settings.grd
index 2838285..15735db 100755
--- a/chrome/app/resources/locale_settings.grd
+++ b/chrome/app/resources/locale_settings.grd
@@ -61,6 +61,7 @@
   </outputs>
   <release seq="1" allow_pseudo="false">
     <includes>
+      <!-- The HTML for the about:terms page -->
       <if expr="pp_ifdef('_google_chrome')">
         <!-- TODO(tc): This won't work yet since we don't substitute
         GRITLANGCODE in random attributes. -->
@@ -71,192 +72,306 @@
       </if>
     </includes>
     <messages fallback_to_english="true">
+
+      <!-- The font used in web-style native pages (e.g. History). -->
       <message name="IDS_WEB_FONT_FAMILY">
         Arial
       </message>
+
+      <!-- The default value for HTTP Accept-Language header. -->
       <message name="IDS_ACCEPT_LANGUAGES">
         en-US,en
       </message>
+
+      <!-- The default value for |WebPreference::default_encoding|. -->
       <message name="IDS_DEFAULT_ENCODING">
         ISO-8859-1
       </message>
+
+      <!-- The default value to determine whether
+           |WebPreference::standard_font_family| serif or sans-serif -->
       <message name="IDS_STANDARD_FONT_IS_SERIF">
         true
       </message>
+
+      <!-- The default value for |WebPreference::fixed_font_family| -->
       <message name="IDS_FIXED_FONT_FAMILY">
         Courier New
       </message>
+
+      <!-- The default value for |WebPreference::serif_font_family| -->
       <message name="IDS_SERIF_FONT_FAMILY">
         Times New Roman
       </message>
+
+      <!-- The default value for |WebPreference::sans_serif_font_family| -->
       <message name="IDS_SANS_SERIF_FONT_FAMILY">
         Arial
       </message>
+
+      <!-- The default value for |WebPreference::cursive_font_family| -->
       <message name="IDS_CURSIVE_FONT_FAMILY">
         Comic Sans MS
       </message>
+
+      <!-- The default value for |WebPreference::fantasy_font_family| -->
       <message name="IDS_FANTASY_FONT_FAMILY">
         Impact
       </message>
+
+      <!-- The default value for |WebPreference::default_font_size| -->
       <message name="IDS_DEFAULT_FONT_SIZE">
         16
       </message>
+
+      <!-- The default value for |WebPreference::default_fixed_font_size| -->
       <message name="IDS_DEFAULT_FIXED_FONT_SIZE">
         13
       </message>
+
+      <!-- The default value for |WebPreference::minimum_font_size| -->
       <message name="IDS_MINIMUM_FONT_SIZE">
         1
       </message>
+
+      <!-- The default value for |WebPreference::minimum_logical_font_size|. -->
       <message name="IDS_MINIMUM_LOGICAL_FONT_SIZE">
         6
       </message>
+
+      <!-- The default value for |WebPreference::uses_universal_detector|. -->
       <message name="IDS_USES_UNIVERSAL_DETECTOR">
         false
       </message>
+
+      <!-- The file name of the spellchecking dictionary without the extension (case-sensitive). -->
       <message name="IDS_SPELLCHECK_DICTIONARY">
         en-US
       </message>
+
+      <!-- URL for the "Learn more" link on the malware blocking page. -->
       <message name="IDS_LEARN_MORE_MALWARE_URL">
         http://www.google.com/support/bin/answer.py?answer=45449&amp;topic=360&amp;hl=en&amp;sa=X&amp;oi=malwarewarninglink&amp;resnum=1&amp;ct=help
       </message>
+
+      <!-- URL for the "Learn more" link on the phishing blocking page. -->
       <message name="IDS_LEARN_MORE_PHISHING_URL">
         http://www.google.com/support/bin/answer.py?answer=106318&amp;hl=[GRITLANGCODE]
       </message>
+
+      <!-- The width of the Options dialog box, in characters (character width = -->
+      <!-- average character width for default dialog box font) -->
       <message name="IDS_OPTIONS_DIALOG_WIDTH_CHARS">
         98
       </message>
+
+      <!-- The height of the Options dialog box, in lines (line height = character -->
+      <!-- height for default dialog box font) -->
       <message name="IDS_OPTIONS_DIALOG_HEIGHT_LINES">
         36
       </message>
+
+      <!-- The width of the title column of the Options dialog box, in characters (see -->
+      <!-- above for defn of character width) -->
       <message name="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS">
         23
       </message>
+
+      <!-- The width and height of the Bug Reporting dialog box in characters and lines -->
+      <!-- (See above). -->
       <message name="IDS_BUGREPORT_DIALOG_WIDTH_CHARS">
         85
       </message>
       <message name="IDS_BUGREPORT_DIALOG_HEIGHT_LINES">
         17
       </message>
+
+      <!-- The width and height of the Clear Browsing Data dialog box in characters and -->
+      <!-- lines (See above). -->
       <message name="IDS_CLEARDATA_DIALOG_WIDTH_CHARS">
         63
       </message>
       <message name="IDS_CLEARDATA_DIALOG_HEIGHT_LINES">
         15.5
       </message>
+
+      <!-- The width and height of the Import dialog box in characters and lines (See -->
+      <!-- above). -->
       <message name="IDS_IMPORT_DIALOG_WIDTH_CHARS">
         60
       </message>
       <message name="IDS_IMPORT_DIALOG_HEIGHT_LINES">
         14
       </message>
+
+      <!-- The width and height of the About dialog box in characters and lines (See -->
+      <!-- above). -->
       <message name="IDS_ABOUT_DIALOG_WIDTH_CHARS">
         70
       </message>
       <message name="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES">
         4
       </message>
+
+      <!-- The width and height of the Fonts and Languages dialog box in characters and -->
+      <!-- lines (See above). -->
       <message name="IDS_FONTSLANG_DIALOG_WIDTH_CHARS">
         96
       </message>
       <message name="IDS_FONTSLANG_DIALOG_HEIGHT_LINES">
         26
       </message>
+
+      <!-- The width of the font style column in the Fonts and Languages dialog box, -->
+      <!-- in character widths. -->
       <message name="IDS_FONTSLANG_LABEL_WIDTH">
         18
       </message>
+
+      <!-- The width and height of the Page Info dialog box in characters and lines -->
+      <!-- (See above). -->
       <message name="IDS_PAGEINFO_DIALOG_WIDTH_CHARS">
         70
       </message>
       <message name="IDS_PAGEINFO_DIALOG_HEIGHT_LINES">
         25
       </message>
+
+      <!-- The width and height of the Search Engines dialog box in characters and -->
+      <!-- lines (See above). -->
       <message name="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS">
         95
       </message>
       <message name="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES">
         25
       </message>
+
+      <!-- The width and height of the Shelf Item dialog box in characters and -->
+      <!-- lines (See above). -->
       <message name="IDS_SHELFITEM_DIALOG_WIDTH_CHARS">
         80
       </message>
       <message name="IDS_SHELFITEM_DIALOG_HEIGHT_LINES">
         30
       </message>
+
+      <!-- The width and height of the Edit Bookmark dialog box in characters and lines -->
+      <!-- (See above). -->
       <message name="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS">
         70
       </message>
       <message name="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES">
         25
       </message>
+
+      <!-- The width and height of the First Run dialog box in characters and lines -->
+      <!-- (See above). -->
       <message name="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS">
         90
       </message>
       <message name="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES">
         16
       </message>
+
+      <!-- The width and height of the First Run Customize dialog box in characters and -->
+      <!-- lines (See above). -->
       <message name="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS">
         90
       </message>
       <message name="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES">
         17
       </message>
+
+      <!-- The width and height of the Cookies dialog box in characters and lines -->
+      <!-- (See above). -->
       <message name="IDS_COOKIES_DIALOG_WIDTH_CHARS">
         80
       </message>
       <message name="IDS_COOKIES_DIALOG_HEIGHT_LINES">
         29
       </message>
+
+      <!-- The width and height of the Import Progress dialog box in characters and -->
+      <!-- lines (See above). -->
       <message name="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS">
         75
       </message>
       <message name="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES">
         16
       </message>
+
+      <!-- The width and height of the "Mozilla Firefox is locked" dialog box in -->
+      <!-- characters and lines (See above). -->
       <message name="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS">
         50
       </message>
       <message name="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES">
         8
       </message>
+
+      <!-- The width and height of the First Run Search Information bubble in -->
+      <!-- characters and lines (See above). -->
       <message name="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS">
         93
       </message>
       <message name="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES">
         12
       </message>
+
+      <!-- The URL to be loaded to display Help -->
       <message name="IDS_HELP_CONTENT_URL">
         http://www.google.com/support/chrome/?hl=[GRITLANGCODE]
       </message>
+
+      <!-- URL to post bug reports to -->
       <message name="IDS_BUGREPORT_POST_URL">
         http://web-bug.appspot.com/bugreport
       </message>
+
+      <!-- Locale-dependent static encodings string -->
       <message name="IDS_STATIC_ENCODING_LIST">
         ISO-8859-1,windows-1252
       </message>
+
+      <!-- The URL for the the Welcome to Chrome page shown on first run. -->
       <message name="IDS_WELCOME_PAGE_URL">
         http://tools.google.com/chrome/intl/[GRITLANGCODE]/welcome.html
       </message>
+
+      <!-- The URL for the the Learn More page shown on incognito new tab. -->
       <message name="IDS_LEARN_MORE_INCOGNITO_URL">
         http://www.google.com/support/chrome/bin/answer.py?answer=95464&amp;hl=[GRITLANGCODE]
       </message>
+
+      <!-- The URL for the "Learn more" page for the Privacy section under Options. -->
       <message name="IDS_LEARN_MORE_PRIVACY_URL">
         http://www.google.com/support/chrome/bin/answer.py?answer=114836&amp;hl=[GRITLANGCODE]
       </message>
+
+      <!-- The width and height of the bookmark manager in characters and lines -->
+      <!-- (See above). -->
       <message name="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS">
         150
       </message>
       <message name="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES">
         40
       </message>
+
+      <!-- The language dependent download view size. -->
       <message name="IDS_DOWNLOAD_BIG_PROGRESS_SIZE">
         52
       </message>
+
+      <!-- The width and height of the Select Profile dialog in characters and lines -->
+      <!-- (See above). -->
       <message name="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS">
         60
       </message>
       <message name="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES">
         5
       </message>
+
+      <!-- The width of the New Profile dialog in characters (See above). -->
       <message name="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS">
         60
       </message>
diff --git a/chrome/app/resources/locale_settings_ar.rc b/chrome/app/resources/locale_settings_ar.rc
index dc61434..2238180 100644
--- a/chrome/app/resources/locale_settings_ar.rc
+++ b/chrome/app/resources/locale_settings_ar.rc
@@ -1,5 +1,5 @@
 
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_bg.rc b/chrome/app/resources/locale_settings_bg.rc
index c093093..e41e4a1 100644
--- a/chrome/app/resources/locale_settings_bg.rc
+++ b/chrome/app/resources/locale_settings_bg.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_bn.rc b/chrome/app/resources/locale_settings_bn.rc
index 1bc4e40..fe82944 100644
--- a/chrome/app/resources/locale_settings_bn.rc
+++ b/chrome/app/resources/locale_settings_bn.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_ca.rc b/chrome/app/resources/locale_settings_ca.rc
index 6fb2326..8472a2d 100644
--- a/chrome/app/resources/locale_settings_ca.rc
+++ b/chrome/app/resources/locale_settings_ca.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_cs.rc b/chrome/app/resources/locale_settings_cs.rc
index d1b9171..996c3ed 100644
--- a/chrome/app/resources/locale_settings_cs.rc
+++ b/chrome/app/resources/locale_settings_cs.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_da.rc b/chrome/app/resources/locale_settings_da.rc
index b0aeaf7..3437e76 100644
--- a/chrome/app/resources/locale_settings_da.rc
+++ b/chrome/app/resources/locale_settings_da.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_de.rc b/chrome/app/resources/locale_settings_de.rc
index 8af5098..2c1b4fb 100644
--- a/chrome/app/resources/locale_settings_de.rc
+++ b/chrome/app/resources/locale_settings_de.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_el.rc b/chrome/app/resources/locale_settings_el.rc
index ac6e19c..118ec26 100644
--- a/chrome/app/resources/locale_settings_el.rc
+++ b/chrome/app/resources/locale_settings_el.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_en-GB.rc b/chrome/app/resources/locale_settings_en-GB.rc
index d51190c..10d7d32 100644
--- a/chrome/app/resources/locale_settings_en-GB.rc
+++ b/chrome/app/resources/locale_settings_en-GB.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_en-US.rc b/chrome/app/resources/locale_settings_en-US.rc
index 1f1dd9a..fe659df 100644
--- a/chrome/app/resources/locale_settings_en-US.rc
+++ b/chrome/app/resources/locale_settings_en-US.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_es-419.rc b/chrome/app/resources/locale_settings_es-419.rc
index 0459357..7533fcf 100644
--- a/chrome/app/resources/locale_settings_es-419.rc
+++ b/chrome/app/resources/locale_settings_es-419.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_es.rc b/chrome/app/resources/locale_settings_es.rc
index e68846c..bfc1fbf 100644
--- a/chrome/app/resources/locale_settings_es.rc
+++ b/chrome/app/resources/locale_settings_es.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_et.rc b/chrome/app/resources/locale_settings_et.rc
index d126072..e088eb4 100644
--- a/chrome/app/resources/locale_settings_et.rc
+++ b/chrome/app/resources/locale_settings_et.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_fi.rc b/chrome/app/resources/locale_settings_fi.rc
index abbce0a..6e9c6e2 100644
--- a/chrome/app/resources/locale_settings_fi.rc
+++ b/chrome/app/resources/locale_settings_fi.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_fil.rc b/chrome/app/resources/locale_settings_fil.rc
index ab2b98b..91d8dd1 100644
--- a/chrome/app/resources/locale_settings_fil.rc
+++ b/chrome/app/resources/locale_settings_fil.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_fr.rc b/chrome/app/resources/locale_settings_fr.rc
index bdced46..dc44fac 100644
--- a/chrome/app/resources/locale_settings_fr.rc
+++ b/chrome/app/resources/locale_settings_fr.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_gu.rc b/chrome/app/resources/locale_settings_gu.rc
index 48e5185..73b09bc 100644
--- a/chrome/app/resources/locale_settings_gu.rc
+++ b/chrome/app/resources/locale_settings_gu.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_he.rc b/chrome/app/resources/locale_settings_he.rc
index aad2452..a629cdb 100644
--- a/chrome/app/resources/locale_settings_he.rc
+++ b/chrome/app/resources/locale_settings_he.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_hi.rc b/chrome/app/resources/locale_settings_hi.rc
index 0be80fe..b931769 100644
--- a/chrome/app/resources/locale_settings_hi.rc
+++ b/chrome/app/resources/locale_settings_hi.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_hr.rc b/chrome/app/resources/locale_settings_hr.rc
index a8cdca3..853a784 100644
--- a/chrome/app/resources/locale_settings_hr.rc
+++ b/chrome/app/resources/locale_settings_hr.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_hu.rc b/chrome/app/resources/locale_settings_hu.rc
index a1dde48..0e704b3 100644
--- a/chrome/app/resources/locale_settings_hu.rc
+++ b/chrome/app/resources/locale_settings_hu.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_id.rc b/chrome/app/resources/locale_settings_id.rc
index 0ce8b81..c3bde9a 100644
--- a/chrome/app/resources/locale_settings_id.rc
+++ b/chrome/app/resources/locale_settings_id.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_it.rc b/chrome/app/resources/locale_settings_it.rc
index 523a23b..4a4ea4f 100644
--- a/chrome/app/resources/locale_settings_it.rc
+++ b/chrome/app/resources/locale_settings_it.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_ja.rc b/chrome/app/resources/locale_settings_ja.rc
index 73ad374..ee47f55 100644
--- a/chrome/app/resources/locale_settings_ja.rc
+++ b/chrome/app/resources/locale_settings_ja.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_kn.rc b/chrome/app/resources/locale_settings_kn.rc
index e093bf6..25fdb6d 100644
--- a/chrome/app/resources/locale_settings_kn.rc
+++ b/chrome/app/resources/locale_settings_kn.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_ko.rc b/chrome/app/resources/locale_settings_ko.rc
index a94dafe..0acf661 100644
--- a/chrome/app/resources/locale_settings_ko.rc
+++ b/chrome/app/resources/locale_settings_ko.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_lt.rc b/chrome/app/resources/locale_settings_lt.rc
index dc791de..13a2519 100644
--- a/chrome/app/resources/locale_settings_lt.rc
+++ b/chrome/app/resources/locale_settings_lt.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_lv.rc b/chrome/app/resources/locale_settings_lv.rc
index 3e5fb28..541934e 100644
--- a/chrome/app/resources/locale_settings_lv.rc
+++ b/chrome/app/resources/locale_settings_lv.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_ml.rc b/chrome/app/resources/locale_settings_ml.rc
index 113ae36..33ef651 100644
--- a/chrome/app/resources/locale_settings_ml.rc
+++ b/chrome/app/resources/locale_settings_ml.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_mr.rc b/chrome/app/resources/locale_settings_mr.rc
index d52c2a11..c8c3028 100644
--- a/chrome/app/resources/locale_settings_mr.rc
+++ b/chrome/app/resources/locale_settings_mr.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_nb.rc b/chrome/app/resources/locale_settings_nb.rc
index 52fa17d..8028058 100644
--- a/chrome/app/resources/locale_settings_nb.rc
+++ b/chrome/app/resources/locale_settings_nb.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_nl.rc b/chrome/app/resources/locale_settings_nl.rc
index af5445c..066056c 100644
--- a/chrome/app/resources/locale_settings_nl.rc
+++ b/chrome/app/resources/locale_settings_nl.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_or.rc b/chrome/app/resources/locale_settings_or.rc
index 64cac00..9bcc065 100644
--- a/chrome/app/resources/locale_settings_or.rc
+++ b/chrome/app/resources/locale_settings_or.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_pl.rc b/chrome/app/resources/locale_settings_pl.rc
index 62ec6fa..7a1e94d 100644
--- a/chrome/app/resources/locale_settings_pl.rc
+++ b/chrome/app/resources/locale_settings_pl.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_pt-BR.rc b/chrome/app/resources/locale_settings_pt-BR.rc
index 2996d8a..7a9f773 100644
--- a/chrome/app/resources/locale_settings_pt-BR.rc
+++ b/chrome/app/resources/locale_settings_pt-BR.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_pt-PT.rc b/chrome/app/resources/locale_settings_pt-PT.rc
index 7092ce2..b761d35 100644
--- a/chrome/app/resources/locale_settings_pt-PT.rc
+++ b/chrome/app/resources/locale_settings_pt-PT.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_ro.rc b/chrome/app/resources/locale_settings_ro.rc
index 0885cf1..c8853c3 100644
--- a/chrome/app/resources/locale_settings_ro.rc
+++ b/chrome/app/resources/locale_settings_ro.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_ru.rc b/chrome/app/resources/locale_settings_ru.rc
index bef3202..d606d69 100644
--- a/chrome/app/resources/locale_settings_ru.rc
+++ b/chrome/app/resources/locale_settings_ru.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_sk.rc b/chrome/app/resources/locale_settings_sk.rc
index 8ab1f76..1acbfdf 100644
--- a/chrome/app/resources/locale_settings_sk.rc
+++ b/chrome/app/resources/locale_settings_sk.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_sl.rc b/chrome/app/resources/locale_settings_sl.rc
index d842bf6..1a0351f 100644
--- a/chrome/app/resources/locale_settings_sl.rc
+++ b/chrome/app/resources/locale_settings_sl.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_sr.rc b/chrome/app/resources/locale_settings_sr.rc
index 45c6e57..e78a8e0 100644
--- a/chrome/app/resources/locale_settings_sr.rc
+++ b/chrome/app/resources/locale_settings_sr.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_sv.rc b/chrome/app/resources/locale_settings_sv.rc
index f894dc4..256c925 100644
--- a/chrome/app/resources/locale_settings_sv.rc
+++ b/chrome/app/resources/locale_settings_sv.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_ta.rc b/chrome/app/resources/locale_settings_ta.rc
index 0bf319a..dc256e8 100644
--- a/chrome/app/resources/locale_settings_ta.rc
+++ b/chrome/app/resources/locale_settings_ta.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_te.rc b/chrome/app/resources/locale_settings_te.rc
index 6cbe87f..674b833 100644
--- a/chrome/app/resources/locale_settings_te.rc
+++ b/chrome/app/resources/locale_settings_te.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_th.rc b/chrome/app/resources/locale_settings_th.rc
index 1b3ce4e..cc2d0d6 100644
--- a/chrome/app/resources/locale_settings_th.rc
+++ b/chrome/app/resources/locale_settings_th.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_tr.rc b/chrome/app/resources/locale_settings_tr.rc
index dfb799a..b2de723 100644
--- a/chrome/app/resources/locale_settings_tr.rc
+++ b/chrome/app/resources/locale_settings_tr.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_uk.rc b/chrome/app/resources/locale_settings_uk.rc
index 7373322..ee7df04 100644
--- a/chrome/app/resources/locale_settings_uk.rc
+++ b/chrome/app/resources/locale_settings_uk.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_vi.rc b/chrome/app/resources/locale_settings_vi.rc
index b1c18ff..c8b4b41 100644
--- a/chrome/app/resources/locale_settings_vi.rc
+++ b/chrome/app/resources/locale_settings_vi.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_zh-CN.rc b/chrome/app/resources/locale_settings_zh-CN.rc
index 213521b..ff158c2 100644
--- a/chrome/app/resources/locale_settings_zh-CN.rc
+++ b/chrome/app/resources/locale_settings_zh-CN.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN
diff --git a/chrome/app/resources/locale_settings_zh-TW.rc b/chrome/app/resources/locale_settings_zh-TW.rc
index 3e0fa84..12aa07c 100644
--- a/chrome/app/resources/locale_settings_zh-TW.rc
+++ b/chrome/app/resources/locale_settings_zh-TW.rc
@@ -1,4 +1,4 @@
-#include "chrome/app/locales/locale_settings.h"
+#include "grit/locale_settings.h"
 
 STRINGTABLE
 BEGIN