diff options
| author | xji@chromium.org <xji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-19 04:09:01 +0000 |
|---|---|---|
| committer | xji@chromium.org <xji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-19 04:09:01 +0000 |
| commit | 732ef6737ef6e1346255be7230032dcaf4e9ad03 (patch) | |
| tree | c9663673eba42c9f33c413a909c16a37d7bd2ebb /ui/base/strings | |
| parent | 963c1b96abd9baa3ccddb7bc59da8a93e0c2ae93 (diff) | |
| download | chromium_src-732ef6737ef6e1346255be7230032dcaf4e9ad03.zip chromium_src-732ef6737ef6e1346255be7230032dcaf4e9ad03.tar.gz chromium_src-732ef6737ef6e1346255be7230032dcaf4e9ad03.tar.bz2 | |
specify locale-dependent font list for UI on ChromeOS, so that those fonts have higher priority over the fallback fonts Pango picks up.
BUG=103860
TEST=build aura, start chromium in 'ar' locale. type in Arabic and check the Arabic text's shapes. remove IDS_UI_FONT_FAMILY_CROS from 'ar' resource file, build aura again, start chromium in 'ar', type in Arabic and the Arabic text's shapes should be different.
Review URL: http://codereview.chromium.org/8770034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114953 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/strings')
| -rw-r--r-- | ui/base/strings/app_locale_settings.grd | 2 | ||||
| -rw-r--r-- | ui/base/strings/app_locale_settings_ar.xtb | 1 | ||||
| -rw-r--r-- | ui/base/strings/app_locale_settings_hi.xtb | 1 | ||||
| -rw-r--r-- | ui/base/strings/app_locale_settings_ja.xtb | 2 | ||||
| -rw-r--r-- | ui/base/strings/app_locale_settings_ko.xtb | 1 | ||||
| -rw-r--r-- | ui/base/strings/app_locale_settings_th.xtb | 1 | ||||
| -rw-r--r-- | ui/base/strings/app_locale_settings_zh-CN.xtb | 1 | ||||
| -rw-r--r-- | ui/base/strings/app_locale_settings_zh-TW.xtb | 1 |
8 files changed, 8 insertions, 2 deletions
diff --git a/ui/base/strings/app_locale_settings.grd b/ui/base/strings/app_locale_settings.grd index 91156c4..ca451d4 100644 --- a/ui/base/strings/app_locale_settings.grd +++ b/ui/base/strings/app_locale_settings.grd @@ -192,7 +192,7 @@ <if expr="pp_ifdef('chromeos')"> <!-- The font name like: 'Font Name, 10' --> <message name="IDS_UI_FONT_FAMILY_CROS" use_name_for_id="true"> - default + Chrome Droid Sans,Droid Sans Fallback,sans-serif, 9 </message> </if> </messages> diff --git a/ui/base/strings/app_locale_settings_ar.xtb b/ui/base/strings/app_locale_settings_ar.xtb index e1d3faf..3e447d7 100644 --- a/ui/base/strings/app_locale_settings_ar.xtb +++ b/ui/base/strings/app_locale_settings_ar.xtb @@ -2,4 +2,5 @@ <!DOCTYPE translationbundle> <translationbundle lang="ar"> <translation id="IDS_MINIMUM_UI_FONT_SIZE">10</translation> +<translation id="IDS_UI_FONT_FAMILY_CROS">Chrome Droid Sans,Droid Arabic Kufi,Droid Sans Fallback,sans-serif, 10</translation> </translationbundle> diff --git a/ui/base/strings/app_locale_settings_hi.xtb b/ui/base/strings/app_locale_settings_hi.xtb index 56983d7..e024983 100644 --- a/ui/base/strings/app_locale_settings_hi.xtb +++ b/ui/base/strings/app_locale_settings_hi.xtb @@ -4,4 +4,5 @@ <translation id="IDS_UI_FONT_SIZE_SCALER_XP">140</translation> <translation id="IDS_UI_FONT_SIZE_SCALER">125</translation> <translation id="IDS_MINIMUM_UI_FONT_SIZE">10</translation> +<translation id="IDS_UI_FONT_FAMILY_CROS">Chrome Droid Sans,Mangal,Lohit Hindi,Droid Sans Fallback,sans-serif, 10</translation> </translationbundle> diff --git a/ui/base/strings/app_locale_settings_ja.xtb b/ui/base/strings/app_locale_settings_ja.xtb index 933d47d..9010c05 100644 --- a/ui/base/strings/app_locale_settings_ja.xtb +++ b/ui/base/strings/app_locale_settings_ja.xtb @@ -2,5 +2,5 @@ <!DOCTYPE translationbundle> <translationbundle lang="ja"> <translation id="IDS_MINIMUM_UI_FONT_SIZE">10</translation> -<translation id="IDS_UI_FONT_FAMILY_CROS">IPAPGothic, 10</translation> +<translation id="IDS_UI_FONT_FAMILY_CROS">Chrome Droid Sans,IPAPGothic,Droid Sans Fallback,sans-serif, 10</translation> </translationbundle> diff --git a/ui/base/strings/app_locale_settings_ko.xtb b/ui/base/strings/app_locale_settings_ko.xtb index 7c4134c..2110024 100644 --- a/ui/base/strings/app_locale_settings_ko.xtb +++ b/ui/base/strings/app_locale_settings_ko.xtb @@ -2,4 +2,5 @@ <!DOCTYPE translationbundle> <translationbundle lang="ko"> <translation id="IDS_MINIMUM_UI_FONT_SIZE">10</translation> +<translation id="IDS_UI_FONT_FAMILY_CROS">Chrome Droid Sans,NanumGothic,Droid Sans Fallback,sans-serif, 10</translation> </translationbundle> diff --git a/ui/base/strings/app_locale_settings_th.xtb b/ui/base/strings/app_locale_settings_th.xtb index 070c16e..550b08e 100644 --- a/ui/base/strings/app_locale_settings_th.xtb +++ b/ui/base/strings/app_locale_settings_th.xtb @@ -2,4 +2,5 @@ <!DOCTYPE translationbundle> <translationbundle lang="th"> <translation id="IDS_MINIMUM_UI_FONT_SIZE">10</translation> +<translation id="IDS_UI_FONT_FAMILY_CROS">Chrome Droid Sans,Droid Sans Thai,Droid Sans Fallback,sans-serif, 10</translation> </translationbundle> diff --git a/ui/base/strings/app_locale_settings_zh-CN.xtb b/ui/base/strings/app_locale_settings_zh-CN.xtb index 1034e66..f1d2a57 100644 --- a/ui/base/strings/app_locale_settings_zh-CN.xtb +++ b/ui/base/strings/app_locale_settings_zh-CN.xtb @@ -2,4 +2,5 @@ <!DOCTYPE translationbundle> <translationbundle lang="zh-CN"> <translation id="IDS_MINIMUM_UI_FONT_SIZE">10</translation> +<translation id="IDS_UI_FONT_FAMILY_CROS">Chrome Droid Sans,Song ASC,Droid Sans Fallback,sans-serif, 10</translation> </translationbundle> diff --git a/ui/base/strings/app_locale_settings_zh-TW.xtb b/ui/base/strings/app_locale_settings_zh-TW.xtb index 8829d71..c7a01c1 100644 --- a/ui/base/strings/app_locale_settings_zh-TW.xtb +++ b/ui/base/strings/app_locale_settings_zh-TW.xtb @@ -2,4 +2,5 @@ <!DOCTYPE translationbundle> <translationbundle lang="zh-TW"> <translation id="IDS_MINIMUM_UI_FONT_SIZE">10</translation> +<translation id="IDS_UI_FONT_FAMILY_CROS">Chrome Droid Sans,Song ASC,Droid Sans Fallback,sans-serif, 10</translation> </translationbundle> |