diff options
| author | kochi@chromium.org <kochi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-08 02:49:31 +0000 |
|---|---|---|
| committer | kochi@chromium.org <kochi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-08 02:49:31 +0000 |
| commit | 9e3952f7990b55fa4d322faec0a1fda8fcffe5e2 (patch) | |
| tree | 860d1231177c8937944abc2c68957bdd84ad2007 /chrome/app | |
| parent | abad5017a225dbe21f8d8068c71231a84cc740d4 (diff) | |
| download | chromium_src-9e3952f7990b55fa4d322faec0a1fda8fcffe5e2.zip chromium_src-9e3952f7990b55fa4d322faec0a1fda8fcffe5e2.tar.gz chromium_src-9e3952f7990b55fa4d322faec0a1fda8fcffe5e2.tar.bz2 | |
Intoroducing Motoya font for ChromeOS
We will introduce Motoya fonts (MotoyaG04Gothic, MotoyaG04Mincho)
as the default Japanese font for ChromeOS. This CL is for preparing
resource to define default font and Skia to check the font family
is compatible with their counterparts of MS Windows fonts.
Note that GTK font specification in the resource does not
handle multiple fonts (e.g. "MotoyaG04Gothic 10, IPAPGothic 10")
and I left it as is (see crosbug.com/17382 for details).
Fontconfig should cover the compatibility check
(IPAPGothic => MotoyaG04Gothic) and display the proper font.
BUG=chromium-os:16690
TEST=build, run and see Japanese fonts are properly displayed in both web contents and Chrome UI.
Review URL: http://codereview.chromium.org/9309048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120926 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/resources/platform_locale_settings/locale_settings_cros_ja.xtb | 36 |
1 files changed, 27 insertions, 9 deletions
diff --git a/chrome/app/resources/platform_locale_settings/locale_settings_cros_ja.xtb b/chrome/app/resources/platform_locale_settings/locale_settings_cros_ja.xtb index d80b64c..a9d219d 100644 --- a/chrome/app/resources/platform_locale_settings/locale_settings_cros_ja.xtb +++ b/chrome/app/resources/platform_locale_settings/locale_settings_cros_ja.xtb @@ -1,18 +1,36 @@ <?xml version="1.0" ?> <!DOCTYPE translationbundle> <translationbundle lang="ja"> -<translation id="IDS_STANDARD_FONT_FAMILY">IPAPGothic</translation> -<translation id="IDS_WEB_FONT_FAMILY">Chrome Droid Sans, Droid Sans Japanese, sans-serif</translation> -<translation id="IDS_FIXED_FONT_FAMILY">IPAGothic</translation> -<translation id="IDS_SERIF_FONT_FAMILY">IPAPMincho</translation> -<translation id="IDS_SANS_SERIF_FONT_FAMILY">IPAPGothic</translation> -<translation id="IDS_MINIMUM_FONT_SIZE">10</translation> -<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">10</translation> -<translation id="IDS_LOCALE_GTKRC"> # gtkrc.ja + <if expr="pp_ifdef('_google_chrome')"> + <translation id="IDS_STANDARD_FONT_FAMILY">MotoyaG04Gothic</translation> + <translation id="IDS_WEB_FONT_FAMILY">MotoyaG04Gothic, Chrome Droid Sans, sans-serif</translation> + <translation id="IDS_FIXED_FONT_FAMILY">MotoyaG04GothicMono</translation> + <translation id="IDS_SERIF_FONT_FAMILY">MotoyaG04Mincho</translation> + <translation id="IDS_SANS_SERIF_FONT_FAMILY">MotoyaG04Gothic</translation> + <translation id="IDS_MINIMUM_FONT_SIZE">10</translation> + <translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">10</translation> + <translation id="IDS_LOCALE_GTKRC"> # gtkrc.ja +gtk-font-name="MotoyaG04Gothic 10" +style "OverrideTooltipFontStyle" = "TooltipStyle" { + font_name = "MotoyaG04Gothic 10" +} +widget "gtk-tooltip*" style "OverrideTooltipFontStyle" + </translation> + </if> + <if expr="not pp_ifdef('_google_chrome')"> + <translation id="IDS_STANDARD_FONT_FAMILY">IPAPGothic</translation> + <translation id="IDS_WEB_FONT_FAMILY">Chrome Droid Sans, Droid Sans Japanese, sans-serif</translation> + <translation id="IDS_FIXED_FONT_FAMILY">IPAGothic</translation> + <translation id="IDS_SERIF_FONT_FAMILY">IPAPMincho</translation> + <translation id="IDS_SANS_SERIF_FONT_FAMILY">IPAPGothic</translation> + <translation id="IDS_LOCALE_GTKRC"> # gtkrc.ja gtk-font-name="IPAPGothic 10" style "OverrideTooltipFontStyle" = "TooltipStyle" { font_name = "IPAPGothic 10" } widget "gtk-tooltip*" style "OverrideTooltipFontStyle" -</translation> + </translation> + </if> +<translation id="IDS_MINIMUM_FONT_SIZE">10</translation> +<translation id="IDS_MINIMUM_LOGICAL_FONT_SIZE">10</translation> </translationbundle> |