summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/app/resources/locale_settings_chromiumos.grd (renamed from chrome/app/resources/locale_settings_cros.grd)10
-rw-r--r--chrome/app/resources/locale_settings_google_chromeos.grd336
-rw-r--r--chrome/chrome.gyp11
-rw-r--r--chrome/chrome_resources.gyp11
-rwxr-xr-xchrome/tools/check_grd_for_unused_strings.py3
-rw-r--r--tools/gritsettings/resource_ids7
6 files changed, 366 insertions, 12 deletions
diff --git a/chrome/app/resources/locale_settings_cros.grd b/chrome/app/resources/locale_settings_chromiumos.grd
index b024ccbe..87202bf 100644
--- a/chrome/app/resources/locale_settings_cros.grd
+++ b/chrome/app/resources/locale_settings_chromiumos.grd
@@ -154,7 +154,7 @@
<messages fallback_to_english="true">
<!-- The font used in Web UI (e.g. History). -->
<message name="IDS_WEB_FONT_FAMILY" use_name_for_id="true">
- 'Noto Sans UI', 'Droid Sans Fallback', sans-serif
+ 'Noto Sans UI', sans-serif
</message>
<!-- The relative font size in % used in Web UI (e.g. History). -->
@@ -272,13 +272,13 @@
<!-- The default value for |WebPreference::fixed_font_family_map| for
Simplified Chinese script. -->
<message name="IDS_FIXED_FONT_FAMILY_SIMPLIFIED_HAN" use_name_for_id="true">
- N Song ASC
+ Droid Sans Fallback
</message>
<!-- The default value for |WebPreference::serif_font_family_map| for
Simplified Chinese script. -->
<message name="IDS_SERIF_FONT_FAMILY_SIMPLIFIED_HAN" use_name_for_id="true">
- Song ASC
+ Droid Sans Fallback
</message>
<!-- The default value for |WebPreference::sans_serif_font_family_map| for
@@ -296,13 +296,13 @@
<!-- The default value for |WebPreference::fixed_font_family_map| for
Traditional Chinese script. -->
<message name="IDS_FIXED_FONT_FAMILY_TRADITIONAL_HAN" use_name_for_id="true">
- MingLiU
+ Droid Sans Fallback
</message>
<!-- The default value for |WebPreference::serif_font_family_map| for
Traditional Chinese script. -->
<message name="IDS_SERIF_FONT_FAMILY_TRADITIONAL_HAN" use_name_for_id="true">
- PMingLiU
+ Droid Sans Fallback
</message>
<!-- The default value for |WebPreference::sans_serif_font_family_map| for
diff --git a/chrome/app/resources/locale_settings_google_chromeos.grd b/chrome/app/resources/locale_settings_google_chromeos.grd
new file mode 100644
index 0000000..07b9193
--- /dev/null
+++ b/chrome/app/resources/locale_settings_google_chromeos.grd
@@ -0,0 +1,336 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grit latest_public_release="0" current_release="1">
+ <outputs>
+ <output filename="grit/platform_locale_settings.h" type="rc_header">
+ <emit emit_type='prepend'></emit>
+ </output>
+ <output filename="platform_locale_settings_am.pak" type="data_package" lang="am" />
+ <output filename="platform_locale_settings_ar.pak" type="data_package" lang="ar" />
+ <if expr="pp_ifdef('use_third_party_translations')">
+ <output filename="platform_locale_settings_ast.pak" type="data_package" lang="ast" />
+ </if>
+ <output filename="platform_locale_settings_bg.pak" type="data_package" lang="bg" />
+ <output filename="platform_locale_settings_bn.pak" type="data_package" lang="bn" />
+ <if expr="pp_ifdef('use_third_party_translations')">
+ <output filename="platform_locale_settings_bs.pak" type="data_package" lang="bs" />
+ </if>
+ <output filename="platform_locale_settings_ca.pak" type="data_package" lang="ca" />
+ <if expr="pp_ifdef('use_third_party_translations')">
+ <output filename="platform_locale_settings_ca@valencia.pak" type="data_package" lang="ca@valencia" />
+ </if>
+ <output filename="platform_locale_settings_cs.pak" type="data_package" lang="cs" />
+ <output filename="platform_locale_settings_da.pak" type="data_package" lang="da" />
+ <output filename="platform_locale_settings_de.pak" type="data_package" lang="de" />
+ <output filename="platform_locale_settings_el.pak" type="data_package" lang="el" />
+ <if expr="pp_ifdef('use_third_party_translations')">
+ <output filename="platform_locale_settings_en-AU.pak" type="data_package" lang="en-AU" />
+ </if>
+ <output filename="platform_locale_settings_en-GB.pak" type="data_package" lang="en-GB" />
+ <output filename="platform_locale_settings_en-US.pak" type="data_package" lang="en" />
+ <if expr="pp_ifdef('use_third_party_translations')">
+ <output filename="platform_locale_settings_eo.pak" type="data_package" lang="eo" />
+ </if>
+ <output filename="platform_locale_settings_es.pak" type="data_package" lang="es" />
+ <output filename="platform_locale_settings_es-419.pak" type="data_package" lang="es-419" />
+ <output filename="platform_locale_settings_et.pak" type="data_package" lang="et" />
+ <if expr="pp_ifdef('use_third_party_translations')">
+ <output filename="platform_locale_settings_eu.pak" type="data_package" lang="eu" />
+ </if>
+ <output filename="platform_locale_settings_fa.pak" type="data_package" lang="fa" />
+ <output filename="platform_locale_settings_fake-bidi.pak" type="data_package" lang="fake-bidi" />
+ <output filename="platform_locale_settings_fi.pak" type="data_package" lang="fi" />
+ <output filename="platform_locale_settings_fil.pak" type="data_package" lang="fil" />
+ <output filename="platform_locale_settings_fr.pak" type="data_package" lang="fr" />
+ <if expr="pp_ifdef('use_third_party_translations')">
+ <output filename="platform_locale_settings_gl.pak" type="data_package" lang="gl" />
+ </if>
+ <output filename="platform_locale_settings_gu.pak" type="data_package" lang="gu" />
+ <output filename="platform_locale_settings_he.pak" type="data_package" lang="he" />
+ <output filename="platform_locale_settings_hi.pak" type="data_package" lang="hi" />
+ <output filename="platform_locale_settings_hr.pak" type="data_package" lang="hr" />
+ <output filename="platform_locale_settings_hu.pak" type="data_package" lang="hu" />
+ <if expr="pp_ifdef('use_third_party_translations')">
+ <output filename="platform_locale_settings_hy.pak" type="data_package" lang="hy" />
+ <output filename="platform_locale_settings_ia.pak" type="data_package" lang="ia" />
+ </if>
+ <output filename="platform_locale_settings_id.pak" type="data_package" lang="id" />
+ <output filename="platform_locale_settings_it.pak" type="data_package" lang="it" />
+ <output filename="platform_locale_settings_ja.pak" type="data_package" lang="ja" />
+ <if expr="pp_ifdef('use_third_party_translations')">
+ <output filename="platform_locale_settings_ka.pak" type="data_package" lang="ka" />
+ </if>
+ <output filename="platform_locale_settings_kn.pak" type="data_package" lang="kn" />
+ <output filename="platform_locale_settings_ko.pak" type="data_package" lang="ko" />
+ <if expr="pp_ifdef('use_third_party_translations')">
+ <output filename="platform_locale_settings_ku.pak" type="data_package" lang="ku" />
+ <output filename="platform_locale_settings_kw.pak" type="data_package" lang="kw" />
+ </if>
+ <output filename="platform_locale_settings_lt.pak" type="data_package" lang="lt" />
+ <output filename="platform_locale_settings_lv.pak" type="data_package" lang="lv" />
+ <output filename="platform_locale_settings_ml.pak" type="data_package" lang="ml" />
+ <output filename="platform_locale_settings_mr.pak" type="data_package" lang="mr" />
+ <output filename="platform_locale_settings_ms.pak" type="data_package" lang="ms" />
+ <output filename="platform_locale_settings_nl.pak" type="data_package" lang="nl" />
+ <!-- The translation console uses 'no' for Norwegian Bokmål. It should
+ be 'nb'. -->
+ <output filename="platform_locale_settings_nb.pak" type="data_package" lang="no" />
+ <output filename="platform_locale_settings_pl.pak" type="data_package" lang="pl" />
+ <output filename="platform_locale_settings_pt-BR.pak" type="data_package" lang="pt-BR" />
+ <output filename="platform_locale_settings_pt-PT.pak" type="data_package" lang="pt-PT" />
+ <output filename="platform_locale_settings_ro.pak" type="data_package" lang="ro" />
+ <output filename="platform_locale_settings_ru.pak" type="data_package" lang="ru" />
+ <output filename="platform_locale_settings_sk.pak" type="data_package" lang="sk" />
+ <output filename="platform_locale_settings_sl.pak" type="data_package" lang="sl" />
+ <output filename="platform_locale_settings_sr.pak" type="data_package" lang="sr" />
+ <output filename="platform_locale_settings_sv.pak" type="data_package" lang="sv" />
+ <output filename="platform_locale_settings_sw.pak" type="data_package" lang="sw" />
+ <output filename="platform_locale_settings_ta.pak" type="data_package" lang="ta" />
+ <output filename="platform_locale_settings_te.pak" type="data_package" lang="te" />
+ <output filename="platform_locale_settings_th.pak" type="data_package" lang="th" />
+ <output filename="platform_locale_settings_tr.pak" type="data_package" lang="tr" />
+ <if expr="pp_ifdef('use_third_party_translations')">
+ <output filename="platform_locale_settings_ug.pak" type="data_package" lang="ug" />
+ </if>
+ <output filename="platform_locale_settings_uk.pak" type="data_package" lang="uk" />
+ <output filename="platform_locale_settings_vi.pak" type="data_package" lang="vi" />
+ <output filename="platform_locale_settings_zh-CN.pak" type="data_package" lang="zh-CN" />
+ <output filename="platform_locale_settings_zh-TW.pak" type="data_package" lang="zh-TW" />
+ </outputs>
+ <translations>
+ <file path="platform_locale_settings/locale_settings_cros_am.xtb" lang="am" />
+ <file path="platform_locale_settings/locale_settings_cros_ar.xtb" lang="ar" />
+ <file path="platform_locale_settings/locale_settings_cros_bg.xtb" lang="bg" />
+ <file path="platform_locale_settings/locale_settings_cros_bn.xtb" lang="bn" />
+ <file path="platform_locale_settings/locale_settings_cros_ca.xtb" lang="ca" />
+ <file path="platform_locale_settings/locale_settings_cros_cs.xtb" lang="cs" />
+ <file path="platform_locale_settings/locale_settings_cros_da.xtb" lang="da" />
+ <file path="platform_locale_settings/locale_settings_cros_de.xtb" lang="de" />
+ <file path="platform_locale_settings/locale_settings_cros_el.xtb" lang="el" />
+ <file path="platform_locale_settings/locale_settings_cros_en-GB.xtb" lang="en-GB" />
+ <file path="platform_locale_settings/locale_settings_cros_es.xtb" lang="es" />
+ <file path="platform_locale_settings/locale_settings_cros_es-419.xtb" lang="es-419" />
+ <file path="platform_locale_settings/locale_settings_cros_et.xtb" lang="et" />
+ <file path="platform_locale_settings/locale_settings_cros_fa.xtb" lang="fa" />
+ <file path="platform_locale_settings/locale_settings_cros_fi.xtb" lang="fi" />
+ <file path="platform_locale_settings/locale_settings_cros_fil.xtb" lang="fil" />
+ <file path="platform_locale_settings/locale_settings_cros_fr.xtb" lang="fr" />
+ <file path="platform_locale_settings/locale_settings_cros_gu.xtb" lang="gu" />
+ <file path="platform_locale_settings/locale_settings_cros_he.xtb" lang="he" />
+ <file path="platform_locale_settings/locale_settings_cros_hi.xtb" lang="hi" />
+ <file path="platform_locale_settings/locale_settings_cros_hr.xtb" lang="hr" />
+ <file path="platform_locale_settings/locale_settings_cros_hu.xtb" lang="hu" />
+ <file path="platform_locale_settings/locale_settings_cros_id.xtb" lang="id" />
+ <file path="platform_locale_settings/locale_settings_cros_it.xtb" lang="it" />
+ <file path="platform_locale_settings/locale_settings_cros_ja.xtb" lang="ja" />
+ <file path="platform_locale_settings/locale_settings_cros_kn.xtb" lang="kn" />
+ <file path="platform_locale_settings/locale_settings_cros_ko.xtb" lang="ko" />
+ <file path="platform_locale_settings/locale_settings_cros_lt.xtb" lang="lt" />
+ <file path="platform_locale_settings/locale_settings_cros_lv.xtb" lang="lv" />
+ <file path="platform_locale_settings/locale_settings_cros_ml.xtb" lang="ml" />
+ <file path="platform_locale_settings/locale_settings_cros_mr.xtb" lang="mr" />
+ <file path="platform_locale_settings/locale_settings_cros_ms.xtb" lang="ms" />
+ <file path="platform_locale_settings/locale_settings_cros_nl.xtb" lang="nl" />
+ <file path="platform_locale_settings/locale_settings_cros_nb.xtb" lang="no" />
+ <file path="platform_locale_settings/locale_settings_cros_pl.xtb" lang="pl" />
+ <file path="platform_locale_settings/locale_settings_cros_pt-BR.xtb" lang="pt-BR" />
+ <file path="platform_locale_settings/locale_settings_cros_pt-PT.xtb" lang="pt-PT" />
+ <file path="platform_locale_settings/locale_settings_cros_ro.xtb" lang="ro" />
+ <file path="platform_locale_settings/locale_settings_cros_ru.xtb" lang="ru" />
+ <file path="platform_locale_settings/locale_settings_cros_sk.xtb" lang="sk" />
+ <file path="platform_locale_settings/locale_settings_cros_sl.xtb" lang="sl" />
+ <file path="platform_locale_settings/locale_settings_cros_sr.xtb" lang="sr" />
+ <file path="platform_locale_settings/locale_settings_cros_sv.xtb" lang="sv" />
+ <file path="platform_locale_settings/locale_settings_cros_sw.xtb" lang="sw" />
+ <file path="platform_locale_settings/locale_settings_cros_ta.xtb" lang="ta" />
+ <file path="platform_locale_settings/locale_settings_cros_te.xtb" lang="te" />
+ <file path="platform_locale_settings/locale_settings_cros_th.xtb" lang="th" />
+ <file path="platform_locale_settings/locale_settings_cros_tr.xtb" lang="tr" />
+ <file path="platform_locale_settings/locale_settings_cros_uk.xtb" lang="uk" />
+ <file path="platform_locale_settings/locale_settings_cros_vi.xtb" lang="vi" />
+ <file path="platform_locale_settings/locale_settings_cros_zh-CN.xtb" lang="zh-CN" />
+ <file path="platform_locale_settings/locale_settings_cros_zh-TW.xtb" lang="zh-TW" />
+ </translations>
+ <release seq="1" allow_pseudo="false">
+ <messages fallback_to_english="true">
+ <!-- The font used in Web UI (e.g. History). -->
+ <message name="IDS_WEB_FONT_FAMILY" use_name_for_id="true">
+ 'Noto Sans UI', sans-serif
+ </message>
+
+ <!-- The relative font size in % used in Web UI (e.g. History). -->
+ <message name="IDS_WEB_FONT_SIZE" use_name_for_id="true">
+ 75%
+ </message>
+
+ <!-- The default value for |WebPreference::standard_font_family| -->
+ <message name="IDS_STANDARD_FONT_FAMILY" use_name_for_id="true">
+ Tinos
+ </message>
+
+ <!-- The default value for |WebPreference::fixed_font_family| -->
+ <message name="IDS_FIXED_FONT_FAMILY" use_name_for_id="true">
+ Cousine
+ </message>
+
+ <!-- The default value for |WebPreference::serif_font_family| -->
+ <message name="IDS_SERIF_FONT_FAMILY" use_name_for_id="true">
+ Tinos
+ </message>
+
+ <!-- The default value for |WebPreference::sans_serif_font_family| -->
+ <message name="IDS_SANS_SERIF_FONT_FAMILY" use_name_for_id="true">
+ Arimo
+ </message>
+
+ <!-- The default value for |WebPreference::cursive_font_family| -->
+ <message name="IDS_CURSIVE_FONT_FAMILY" use_name_for_id="true">
+ Comic Sans MS
+ </message>
+
+ <!-- The default value for |WebPreference::fantasy_font_family| -->
+ <message name="IDS_FANTASY_FONT_FAMILY" use_name_for_id="true">
+ Impact
+ </message>
+
+ <!-- The default value for |WebPreference::pictograph_font_family| -->
+ <message name="IDS_PICTOGRAPH_FONT_FAMILY" use_name_for_id="true">
+ Droid Emoji
+ </message>
+
+ <!-- The default value for |WebPreference::standard_font_family_map| for
+ Arabic script. -->
+ <message name="IDS_STANDARD_FONT_FAMILY_ARABIC" use_name_for_id="true">
+ Droid Arabic Naskh
+ </message>
+
+ <!-- The default value for |WebPreference::serif_font_family_map| for
+ Arabic script. -->
+ <message name="IDS_SERIF_FONT_FAMILY_ARABIC" use_name_for_id="true">
+ Droid Arabic Kufi
+ </message>
+
+ <!-- The default value for |WebPreference::sans_serif_font_family_map| for
+ Arabic script. -->
+ <message name="IDS_SANS_SERIF_FONT_FAMILY_ARABIC" use_name_for_id="true">
+ Droid Arabic Naskh
+ </message>
+
+ <!-- The default value for |WebPreference::standard_font_family_map| for
+ Japanese script. -->
+ <message name="IDS_STANDARD_FONT_FAMILY_JAPANESE" use_name_for_id="true">
+ MotoyaG04Gothic
+ </message>
+
+ <!-- The default value for |WebPreference::fixed_font_family_map| for
+ Japanese script. -->
+ <message name="IDS_FIXED_FONT_FAMILY_JAPANESE" use_name_for_id="true">
+ MotoyaG04GothicMono
+ </message>
+
+ <!-- The default value for |WebPreference::serif_font_family_map| for
+ Japanese script. -->
+ <message name="IDS_SERIF_FONT_FAMILY_JAPANESE" use_name_for_id="true">
+ MotoyaG04Mincho
+ </message>
+
+ <!-- The default value for |WebPreference::sans_serif_font_family_map| for
+ Japanese script. -->
+ <message name="IDS_SANS_SERIF_FONT_FAMILY_JAPANESE" use_name_for_id="true">
+ MotoyaG04Gothic
+ </message>
+
+ <!-- The default value for |WebPreference::standard_font_family_map| for
+ Korean script. -->
+ <message name="IDS_STANDARD_FONT_FAMILY_KOREAN" use_name_for_id="true">
+ NanumGothic
+ </message>
+
+ <!-- The default value for |WebPreference::fixed_font_family_map| for
+ Korean script. -->
+ <message name="IDS_FIXED_FONT_FAMILY_KOREAN" use_name_for_id="true">
+ Monospace
+ </message>
+
+ <!-- The default value for |WebPreference::serif_font_family_map| for
+ Korean script. -->
+ <message name="IDS_SERIF_FONT_FAMILY_KOREAN" use_name_for_id="true">
+ NanumMyeongjo
+ </message>
+
+ <!-- The default value for |WebPreference::sans_serif_font_family_map| for
+ Korean script. -->
+ <message name="IDS_SANS_SERIF_FONT_FAMILY_KOREAN" use_name_for_id="true">
+ NanumGothic
+ </message>
+
+ <!-- The default value for |WebPreference::standard_font_family_map| for
+ Simplified Chinese script. -->
+ <message name="IDS_STANDARD_FONT_FAMILY_SIMPLIFIED_HAN" use_name_for_id="true">
+ MYingHeiGB18030
+ </message>
+
+ <!-- The default value for |WebPreference::fixed_font_family_map| for
+ Simplified Chinese script. -->
+ <message name="IDS_FIXED_FONT_FAMILY_SIMPLIFIED_HAN" use_name_for_id="true">
+ MYingHeiGB18030
+ </message>
+
+ <!-- The default value for |WebPreference::serif_font_family_map| for
+ Simplified Chinese script. -->
+ <message name="IDS_SERIF_FONT_FAMILY_SIMPLIFIED_HAN" use_name_for_id="true">
+ Song ASC
+ </message>
+
+ <!-- The default value for |WebPreference::sans_serif_font_family_map| for
+ Simplified Chinese script. -->
+ <message name="IDS_SANS_SERIF_FONT_FAMILY_SIMPLIFIED_HAN" use_name_for_id="true">
+ MYingHeiGB18030
+ </message>
+
+ <!-- The default value for |WebPreference::standard_font_family_map| for
+ Traditional Chinese script. -->
+ <message name="IDS_STANDARD_FONT_FAMILY_TRADITIONAL_HAN" use_name_for_id="true">
+ MYingHeiB5HK
+ </message>
+
+ <!-- The default value for |WebPreference::fixed_font_family_map| for
+ Traditional Chinese script. -->
+ <message name="IDS_FIXED_FONT_FAMILY_TRADITIONAL_HAN" use_name_for_id="true">
+ MYingHeiB5HK
+ </message>
+
+ <!-- The default value for |WebPreference::serif_font_family_map| for
+ Traditional Chinese script. -->
+ <message name="IDS_SERIF_FONT_FAMILY_TRADITIONAL_HAN" use_name_for_id="true">
+ PMingLiU
+ </message>
+
+ <!-- The default value for |WebPreference::sans_serif_font_family_map| for
+ Traditional Chinese script. -->
+ <message name="IDS_SANS_SERIF_FONT_FAMILY_TRADITIONAL_HAN" use_name_for_id="true">
+ MYingHeiB5HK
+ </message>
+
+ <!-- The default value for |WebPreference::default_font_size| -->
+ <message name="IDS_DEFAULT_FONT_SIZE" use_name_for_id="true">
+ 16
+ </message>
+
+ <!-- The default value for |WebPreference::default_fixed_font_size| -->
+ <message name="IDS_DEFAULT_FIXED_FONT_SIZE" use_name_for_id="true">
+ 13
+ </message>
+
+ <!-- The default value for |WebPreference::minimum_font_size| -->
+ <message name="IDS_MINIMUM_FONT_SIZE" use_name_for_id="true">
+ 0
+ </message>
+
+ <!-- The default value for |WebPreference::minimum_logical_font_size|. -->
+ <message name="IDS_MINIMUM_LOGICAL_FONT_SIZE" use_name_for_id="true">
+ 6
+ </message>
+
+ </messages>
+ </release>
+</grit>
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 5db18dd..6108c55 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -59,8 +59,15 @@
],
'conditions': [
['chromeos==1', {
- 'platform_locale_settings_grd':
- 'app/resources/locale_settings_cros.grd',
+ 'conditions': [
+ ['branding=="Chrome"', {
+ 'platform_locale_settings_grd':
+ 'app/resources/locale_settings_google_chromeos.grd',
+ }, { # branding!=Chrome
+ 'platform_locale_settings_grd':
+ 'app/resources/locale_settings_chromiumos.grd',
+ }],
+ ]
}, { # chromeos==0
'platform_locale_settings_grd':
'app/resources/locale_settings_linux.grd',
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
index 46ef752..4b27191 100644
--- a/chrome/chrome_resources.gyp
+++ b/chrome/chrome_resources.gyp
@@ -182,8 +182,15 @@
['OS=="linux"', {
'conditions': [
['chromeos==1', {
- 'platform_locale_settings_grd':
- 'app/resources/locale_settings_cros.grd',
+ 'conditions': [
+ ['branding=="Chrome"', {
+ 'platform_locale_settings_grd':
+ 'app/resources/locale_settings_google_chromeos.grd',
+ }, { # branding!=Chrome
+ 'platform_locale_settings_grd':
+ 'app/resources/locale_settings_chromiumos.grd',
+ }],
+ ]
}, { # chromeos==0
'platform_locale_settings_grd':
'app/resources/locale_settings_linux.grd',
diff --git a/chrome/tools/check_grd_for_unused_strings.py b/chrome/tools/check_grd_for_unused_strings.py
index eb7ed1f..6f0cdfb 100755
--- a/chrome/tools/check_grd_for_unused_strings.py
+++ b/chrome/tools/check_grd_for_unused_strings.py
@@ -140,7 +140,8 @@ def main():
os.path.join(chrome_app_dir, 'generated_resources.grd'),
os.path.join(chrome_app_dir, 'google_chrome_strings.grd'),
os.path.join(chrome_app_res_dir, 'locale_settings.grd'),
- os.path.join(chrome_app_res_dir, 'locale_settings_cros.grd'),
+ os.path.join(chrome_app_res_dir, 'locale_settings_chromiumos.grd'),
+ os.path.join(chrome_app_res_dir, 'locale_settings_google_chromeos.grd'),
os.path.join(chrome_app_res_dir, 'locale_settings_linux.grd'),
os.path.join(chrome_app_res_dir, 'locale_settings_mac.grd'),
os.path.join(chrome_app_res_dir, 'locale_settings_win.grd'),
diff --git a/tools/gritsettings/resource_ids b/tools/gritsettings/resource_ids
index 1a80baa..656eacd 100644
--- a/tools/gritsettings/resource_ids
+++ b/tools/gritsettings/resource_ids
@@ -83,8 +83,11 @@
"messages": [10000],
},
# These each start with the same resource id because we only use one
- # file for each build (cros, linux, mac, or win).
- "chrome/app/resources/locale_settings_cros.grd": {
+ # file for each build (chromiumos, google_chromeos, linux, mac, or win).
+ "chrome/app/resources/locale_settings_chromiumos.grd": {
+ "messages": [10500],
+ },
+ "chrome/app/resources/locale_settings_google_chromeos.grd": {
"messages": [10500],
},
"chrome/app/resources/locale_settings_linux.grd": {