summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorjshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-20 21:21:14 +0000
committerjshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-20 21:21:14 +0000
commit36b40632635f5c8686d13a4ddde7e76f38f59013 (patch)
tree71b209679af9cc939a1d6128376b0764aad9f798 /chrome
parent238761bc128ba85fc0f7266f73f0f369187400fc (diff)
downloadchromium_src-36b40632635f5c8686d13a4ddde7e76f38f59013.zip
chromium_src-36b40632635f5c8686d13a4ddde7e76f38f59013.tar.gz
chromium_src-36b40632635f5c8686d13a4ddde7e76f38f59013.tar.bz2
Change the default CSS fonts for Simplified Chinese, Korean and Thai on Linux to poplular Linux fonts.
This CL does not change the fonts for traditional Chinese because they're the same as for English Chrome (per popular request in Mozilla bugzilla years past) and it's not clear what to do about mscorettf (Arial, Times New Roman) we specify for most language versions of Chrome. BUG=20171 TEST=NONE Review URL: http://codereview.chromium.org/259060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32671 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/app/resources/locale_settings_ja.xtb18
-rw-r--r--chrome/app/resources/locale_settings_ko.xtb18
-rw-r--r--chrome/app/resources/locale_settings_th.xtb18
-rw-r--r--chrome/app/resources/locale_settings_zh-CN.xtb20
4 files changed, 45 insertions, 29 deletions
diff --git a/chrome/app/resources/locale_settings_ja.xtb b/chrome/app/resources/locale_settings_ja.xtb
index a3b9822..d6d4305 100644
--- a/chrome/app/resources/locale_settings_ja.xtb
+++ b/chrome/app/resources/locale_settings_ja.xtb
@@ -1,17 +1,12 @@
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="ja">
-<if expr="os != 'darwin'">
- <translation id="IDS_WEB_FONT_FAMILY">MS PGothic</translation>
-</if>
-<if expr="os == 'darwin'">
- <translation id="IDS_WEB_FONT_FAMILY">Helvetica, Hiragino Kaku Gothic Pro</translation>
-</if>
<translation id="IDS_WEB_FONT_SIZE">84%</translation>
<translation id="IDS_ACCEPT_LANGUAGES">ja,en-US,en</translation>
<translation id="IDS_DEFAULT_ENCODING">Shift_JIS</translation>
<translation id="IDS_STANDARD_FONT_IS_SERIF">false</translation>
-<if expr="os != 'darwin'">
+<if expr="os == 'win32'">
+ <translation id="IDS_WEB_FONT_FAMILY">MS PGothic</translation>
<translation id="IDS_FIXED_FONT_FAMILY">MS Gothic</translation>
<translation id="IDS_SERIF_FONT_FAMILY">MS PMincho</translation>
<translation id="IDS_SANS_SERIF_FONT_FAMILY">MS PGothic</translation>
@@ -19,12 +14,21 @@
<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
</if>
<if expr="os == 'darwin'">
+ <translation id="IDS_WEB_FONT_FAMILY">Helvetica, Hiragino Kaku Gothic Pro</translation>
<translation id="IDS_FIXED_FONT_FAMILY">Osaka-Mono</translation>
<translation id="IDS_SERIF_FONT_FAMILY">Hiragino Mincho Pro</translation>
<translation id="IDS_SANS_SERIF_FONT_FAMILY">Hiragino Kaku Gothic Pro</translation>
<translation id="IDS_CURSIVE_FONT_FAMILY">Apple Chancery</translation>
<translation id="IDS_FANTASY_FONT_FAMILY">Papyrus</translation>
</if>
+<if expr="os == 'linux2'">
+ <translation id="IDS_WEB_FONT_FAMILY">Sazanami Gothic, Kochi Gothic, sans-serif</translation>
+ <translation id="IDS_FIXED_FONT_FAMILY">Sazanami Gothic</translation>
+ <translation id="IDS_SERIF_FONT_FAMILY">Sazanami Mincho</translation>
+ <translation id="IDS_SANS_SERIF_FONT_FAMILY">Sazanami Gothic</translation>
+ <translation id="IDS_CURSIVE_FONT_FAMILY">Sazanami Mincho</translation>
+ <translation id="IDS_FANTASY_FONT_FAMILY">Sazanami Mincho</translation>
+</if>
<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
<translation id="IDS_MINIMUM_FONT_SIZE">10</translation>
diff --git a/chrome/app/resources/locale_settings_ko.xtb b/chrome/app/resources/locale_settings_ko.xtb
index e3e04f5..eef281f 100644
--- a/chrome/app/resources/locale_settings_ko.xtb
+++ b/chrome/app/resources/locale_settings_ko.xtb
@@ -1,17 +1,12 @@
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="ko">
-<if expr="os != 'darwin'">
- <translation id="IDS_WEB_FONT_FAMILY">Gulim</translation>
-</if>
-<if expr="os == 'darwin'">
- <translation id="IDS_WEB_FONT_FAMILY">Helvetica, AppleGothic</translation>
-</if>
<translation id="IDS_WEB_FONT_SIZE">84%</translation>
<translation id="IDS_ACCEPT_LANGUAGES">ko-KR,ko,en-US,en</translation>
<translation id="IDS_DEFAULT_ENCODING">windows-949</translation>
<translation id="IDS_STANDARD_FONT_IS_SERIF">false</translation>
-<if expr="os != 'darwin'">
+<if expr="os == 'win32'">
+ <translation id="IDS_WEB_FONT_FAMILY">Gulim</translation>
<translation id="IDS_FIXED_FONT_FAMILY">Gulimche</translation>
<translation id="IDS_SERIF_FONT_FAMILY">Batang</translation>
<translation id="IDS_SANS_SERIF_FONT_FAMILY">Gulim</translation>
@@ -19,12 +14,21 @@
<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
</if>
<if expr="os == 'darwin'">
+ <translation id="IDS_WEB_FONT_FAMILY">Helvetica, AppleGothic</translation>
<translation id="IDS_FIXED_FONT_FAMILY">Courier</translation>
<translation id="IDS_SERIF_FONT_FAMILY">AppleMyungjo</translation>
<translation id="IDS_SANS_SERIF_FONT_FAMILY">AppleGothic</translation>
<translation id="IDS_CURSIVE_FONT_FAMILY">Apple Chancery</translation>
<translation id="IDS_FANTASY_FONT_FAMILY">Papyrus</translation>
</if>
+<if expr="os == 'linux2'">
+ <translation id="IDS_WEB_FONT_FAMILY">UnDotum, Baekmuk Gulim, sans-serif</translation>
+ <translation id="IDS_FIXED_FONT_FAMILY">UnDotum</translation>
+ <translation id="IDS_SERIF_FONT_FAMILY">UnBatang</translation>
+ <translation id="IDS_SANS_SERIF_FONT_FAMILY">UnDotum</translation>
+ <translation id="IDS_CURSIVE_FONT_FAMILY">UnGungsuh</translation>
+ <translation id="IDS_FANTASY_FONT_FAMILY">UnYetGul</translation>
+</if>
<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
<translation id="IDS_MINIMUM_FONT_SIZE">10</translation>
diff --git a/chrome/app/resources/locale_settings_th.xtb b/chrome/app/resources/locale_settings_th.xtb
index a8b429f..1a2cfaf 100644
--- a/chrome/app/resources/locale_settings_th.xtb
+++ b/chrome/app/resources/locale_settings_th.xtb
@@ -1,17 +1,12 @@
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="th">
-<if expr="os != 'darwin'">
- <translation id="IDS_WEB_FONT_FAMILY">Tahoma</translation>
-</if>
-<if expr="os == 'darwin'">
- <translation id="IDS_WEB_FONT_FAMILY">Helvetica</translation>
-</if>
<translation id="IDS_WEB_FONT_SIZE">84%</translation>
<translation id="IDS_ACCEPT_LANGUAGES">th-TH,th</translation>
<translation id="IDS_DEFAULT_ENCODING">windows-874</translation>
<translation id="IDS_STANDARD_FONT_IS_SERIF">true</translation>
-<if expr="os != 'darwin'">
+<if expr="os == 'win32'">
+ <translation id="IDS_WEB_FONT_FAMILY">Tahoma</translation>
<translation id="IDS_FIXED_FONT_FAMILY">Tahoma</translation>
<translation id="IDS_SERIF_FONT_FAMILY">Tahoma</translation>
<translation id="IDS_SANS_SERIF_FONT_FAMILY">Tahoma</translation>
@@ -19,12 +14,21 @@
<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
</if>
<if expr="os == 'darwin'">
+ <translation id="IDS_WEB_FONT_FAMILY">Helvetica</translation>
<translation id="IDS_FIXED_FONT_FAMILY">Courier</translation>
<translation id="IDS_SERIF_FONT_FAMILY">Times</translation>
<translation id="IDS_SANS_SERIF_FONT_FAMILY">Helvetica</translation>
<translation id="IDS_CURSIVE_FONT_FAMILY">Apple Chancery</translation>
<translation id="IDS_FANTASY_FONT_FAMILY">Papyrus</translation>
</if>
+<if expr="os == 'linux2'">
+ <translation id="IDS_WEB_FONT_FAMILY">Norasi, Waree, Garuda, Loma, sans-serif</translation>
+ <translation id="IDS_FIXED_FONT_FAMILY">TlwgMono</translation>
+ <translation id="IDS_SERIF_FONT_FAMILY">Norasi</translation>
+ <translation id="IDS_SANS_SERIF_FONT_FAMILY">Norasi</translation>
+ <translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
+ <translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
+</if>
<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
<translation id="IDS_MINIMUM_FONT_SIZE">10</translation>
diff --git a/chrome/app/resources/locale_settings_zh-CN.xtb b/chrome/app/resources/locale_settings_zh-CN.xtb
index b37ce76..60d55c2 100644
--- a/chrome/app/resources/locale_settings_zh-CN.xtb
+++ b/chrome/app/resources/locale_settings_zh-CN.xtb
@@ -1,30 +1,34 @@
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="zh-CN">
-<if expr="os != 'darwin'">
- <translation id="IDS_WEB_FONT_FAMILY">Simsun</translation>
-</if>
-<if expr="os == 'darwin'">
- <translation id="IDS_WEB_FONT_FAMILY">Helvetica, STHeiti</translation>
-</if>
<translation id="IDS_WEB_FONT_SIZE">84%</translation>
<translation id="IDS_ACCEPT_LANGUAGES">zh-CN,zh</translation>
<translation id="IDS_DEFAULT_ENCODING">GBK</translation>
<translation id="IDS_STANDARD_FONT_IS_SERIF">false</translation>
-<if expr="os != 'darwin'">
+<if expr="os == 'win32'">
+ <translation id="IDS_WEB_FONT_FAMILY">Simhei</translation>
<translation id="IDS_FIXED_FONT_FAMILY">NSimsun</translation>
<translation id="IDS_SERIF_FONT_FAMILY">Simsun</translation>
- <translation id="IDS_SANS_SERIF_FONT_FAMILY">Simsun</translation>
+ <translation id="IDS_SANS_SERIF_FONT_FAMILY">Simhei</translation>
<translation id="IDS_CURSIVE_FONT_FAMILY">Comic Sans MS</translation>
<translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
</if>
<if expr="os == 'darwin'">
+ <translation id="IDS_WEB_FONT_FAMILY">Helvetica, STHeiti</translation>
<translation id="IDS_FIXED_FONT_FAMILY">Courier</translation>
<translation id="IDS_SERIF_FONT_FAMILY">STSong</translation>
<translation id="IDS_SANS_SERIF_FONT_FAMILY">STHeiti</translation>
<translation id="IDS_CURSIVE_FONT_FAMILY">Apple Chancery</translation>
<translation id="IDS_FANTASY_FONT_FAMILY">Papyrus</translation>
</if>
+<if expr="os == 'linux2'">
+ <translation id="IDS_WEB_FONT_FAMILY">AR PL UKai CN, sans-serif</translation>
+ <translation id="IDS_FIXED_FONT_FAMILY">AR PL UKai CN</translation>
+ <translation id="IDS_SERIF_FONT_FAMILY">AR PL UMing CN</translation>
+ <translation id="IDS_SANS_SERIF_FONT_FAMILY">AR PL UKai CN</translation>
+ <translation id="IDS_CURSIVE_FONT_FAMILY">AR PL UMing CN</translation>
+ <translation id="IDS_FANTASY_FONT_FAMILY">Impact</translation>
+</if>
<translation id="IDS_DEFAULT_FONT_SIZE">16</translation>
<translation id="IDS_DEFAULT_FIXED_FONT_SIZE">13</translation>
<translation id="IDS_MINIMUM_FONT_SIZE">12</translation>