summaryrefslogtreecommitdiffstats
path: root/ui/base/strings
diff options
context:
space:
mode:
authorjshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-13 09:09:43 +0000
committerjshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-13 09:09:43 +0000
commit27036a1728b42e82bb461f4c54270c29e7a181fc (patch)
treef08186c9e6c993e873777b64e2bb155a4f8af95c /ui/base/strings
parent36d92dfd9369e065c72b14ebd27692d167d3edd9 (diff)
downloadchromium_src-27036a1728b42e82bb461f4c54270c29e7a181fc.zip
chromium_src-27036a1728b42e82bb461f4c54270c29e7a181fc.tar.gz
chromium_src-27036a1728b42e82bb461f4c54270c29e7a181fc.tar.bz2
Update Chrome OS font settings to use Noto Sans UI and other Noto fonts
Also, use a fontconfig alias 'ui-sans' to get pango's fontfallback find other fonts with UI-metrics instead of 'body/document metrics'. The corresponding ChromeOS CL (font update and fontconfig changes) is at https://gerrit.chromium.org/gerrit/#/c/39414 BUG=164769 TEST=Thai, Hindi, Marathi and Tamil do not have any glyphs truncated in the native UI area. TBR=sky,cpu Review URL: https://chromiumcodereview.appspot.com/11469037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172841 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/strings')
-rw-r--r--ui/base/strings/app_locale_settings.grd2
-rw-r--r--ui/base/strings/app_locale_settings_ar.xtb2
-rw-r--r--ui/base/strings/app_locale_settings_hi.xtb2
-rw-r--r--ui/base/strings/app_locale_settings_ja.xtb2
-rw-r--r--ui/base/strings/app_locale_settings_ko.xtb2
-rw-r--r--ui/base/strings/app_locale_settings_mr.xtb1
-rw-r--r--ui/base/strings/app_locale_settings_ta.xtb1
-rw-r--r--ui/base/strings/app_locale_settings_th.xtb2
-rw-r--r--ui/base/strings/app_locale_settings_zh-CN.xtb2
-rw-r--r--ui/base/strings/app_locale_settings_zh-TW.xtb2
10 files changed, 10 insertions, 8 deletions
diff --git a/ui/base/strings/app_locale_settings.grd b/ui/base/strings/app_locale_settings.grd
index 3c562b9..759aaae 100644
--- a/ui/base/strings/app_locale_settings.grd
+++ b/ui/base/strings/app_locale_settings.grd
@@ -197,7 +197,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">
- Noto Sans UI,Droid Sans Fallback,sans-serif, 12px
+ Noto Sans UI,ui-sans, 12px
</message>
</if>
</messages>
diff --git a/ui/base/strings/app_locale_settings_ar.xtb b/ui/base/strings/app_locale_settings_ar.xtb
index bc52bac..a87f60a 100644
--- a/ui/base/strings/app_locale_settings_ar.xtb
+++ b/ui/base/strings/app_locale_settings_ar.xtb
@@ -2,5 +2,5 @@
<!DOCTYPE translationbundle>
<translationbundle lang="ar">
<translation id="IDS_MINIMUM_UI_FONT_SIZE">10</translation>
-<translation id="IDS_UI_FONT_FAMILY_CROS">Noto Sans UI,Droid Arabic Kufi,Droid Sans Fallback,sans-serif, 13px</translation>
+<translation id="IDS_UI_FONT_FAMILY_CROS">Noto Sans UI,Droid Arabic Kufi,ui-sans, 13px</translation>
</translationbundle>
diff --git a/ui/base/strings/app_locale_settings_hi.xtb b/ui/base/strings/app_locale_settings_hi.xtb
index 95f9a5e..7e1687d 100644
--- a/ui/base/strings/app_locale_settings_hi.xtb
+++ b/ui/base/strings/app_locale_settings_hi.xtb
@@ -4,5 +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">Noto Sans UI,Mangal,Lohit Hindi,Droid Sans Fallback,sans-serif, 13px</translation>
+<translation id="IDS_UI_FONT_FAMILY_CROS">Noto Sans UI,Noto Sans Devanagari UI,ui-sans, 13px</translation>
</translationbundle>
diff --git a/ui/base/strings/app_locale_settings_ja.xtb b/ui/base/strings/app_locale_settings_ja.xtb
index 6cff933..2d6aa56 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">MotoyaG04Gothic,Noto Sans UI,IPAPGothic,Droid Sans Fallback,sans-serif, 13px</translation>
+<translation id="IDS_UI_FONT_FAMILY_CROS">MotoyaG04Gothic,Noto Sans UI,IPAPGothic,ui-sans, 13px</translation>
</translationbundle>
diff --git a/ui/base/strings/app_locale_settings_ko.xtb b/ui/base/strings/app_locale_settings_ko.xtb
index 9d39a04..7ec1114 100644
--- a/ui/base/strings/app_locale_settings_ko.xtb
+++ b/ui/base/strings/app_locale_settings_ko.xtb
@@ -2,5 +2,5 @@
<!DOCTYPE translationbundle>
<translationbundle lang="ko">
<translation id="IDS_MINIMUM_UI_FONT_SIZE">10</translation>
-<translation id="IDS_UI_FONT_FAMILY_CROS">Noto Sans UI,NanumGothic,Droid Sans Fallback,sans-serif, 13px</translation>
+<translation id="IDS_UI_FONT_FAMILY_CROS">Noto Sans UI,NanumGothic,ui-sans, 13px</translation>
</translationbundle>
diff --git a/ui/base/strings/app_locale_settings_mr.xtb b/ui/base/strings/app_locale_settings_mr.xtb
index 95ff0b3..095d8fd 100644
--- a/ui/base/strings/app_locale_settings_mr.xtb
+++ b/ui/base/strings/app_locale_settings_mr.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">Noto Sans UI,Noto Sans Devanagari UI,ui-sans, 13px</translation>
</translationbundle>
diff --git a/ui/base/strings/app_locale_settings_ta.xtb b/ui/base/strings/app_locale_settings_ta.xtb
index ef90687..9ef4cad 100644
--- a/ui/base/strings/app_locale_settings_ta.xtb
+++ b/ui/base/strings/app_locale_settings_ta.xtb
@@ -1,4 +1,5 @@
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="ta">
+<translation id="IDS_UI_FONT_FAMILY_CROS">Noto Sans UI,Noto Sans Tamil UI,ui-sans, 13px</translation>
</translationbundle>
diff --git a/ui/base/strings/app_locale_settings_th.xtb b/ui/base/strings/app_locale_settings_th.xtb
index 2137ef9..335689f 100644
--- a/ui/base/strings/app_locale_settings_th.xtb
+++ b/ui/base/strings/app_locale_settings_th.xtb
@@ -2,5 +2,5 @@
<!DOCTYPE translationbundle>
<translationbundle lang="th">
<translation id="IDS_MINIMUM_UI_FONT_SIZE">10</translation>
-<translation id="IDS_UI_FONT_FAMILY_CROS">Noto Sans UI,Droid Sans Thai,Droid Sans Fallback,sans-serif, 13px</translation>
+<translation id="IDS_UI_FONT_FAMILY_CROS">Noto Sans UI,Noto Sans Thai UI,ui-sans, 13px</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 3db754e..593e8b7 100644
--- a/ui/base/strings/app_locale_settings_zh-CN.xtb
+++ b/ui/base/strings/app_locale_settings_zh-CN.xtb
@@ -2,5 +2,5 @@
<!DOCTYPE translationbundle>
<translationbundle lang="zh-CN">
<translation id="IDS_MINIMUM_UI_FONT_SIZE">10</translation>
-<translation id="IDS_UI_FONT_FAMILY_CROS">Noto Sans UI,MYingHeiGB18030,MYingHeiB5HK,Droid Sans Fallback,sans-serif, 13px</translation>
+<translation id="IDS_UI_FONT_FAMILY_CROS">Noto Sans UI,MYingHeiGB18030,MYingHeiB5HK,ui-sans, 13px</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 a44eabd..7814e91 100644
--- a/ui/base/strings/app_locale_settings_zh-TW.xtb
+++ b/ui/base/strings/app_locale_settings_zh-TW.xtb
@@ -2,5 +2,5 @@
<!DOCTYPE translationbundle>
<translationbundle lang="zh-TW">
<translation id="IDS_MINIMUM_UI_FONT_SIZE">10</translation>
-<translation id="IDS_UI_FONT_FAMILY_CROS">Noto Sans UI,MYingHeiB5HK,MYingHeiGB18030,Droid Sans Fallback,sans-serif, 13px</translation>
+<translation id="IDS_UI_FONT_FAMILY_CROS">Noto Sans UI,MYingHeiB5HK,MYingHeiGB18030,ui-sans, 13px</translation>
</translationbundle>