summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorsatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-21 06:43:11 +0000
committersatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-21 06:43:11 +0000
commitf0ed02aa9a3820f83e4837a1776134d5c73cc5e6 (patch)
tree231fe1e4b86ae0f744abe62464721d799ce53d86 /chrome/app
parent675963ce21445012094c7b7f68ec4b9b58c1d0c3 (diff)
downloadchromium_src-f0ed02aa9a3820f83e4837a1776134d5c73cc5e6.zip
chromium_src-f0ed02aa9a3820f83e4837a1776134d5c73cc5e6.tar.gz
chromium_src-f0ed02aa9a3820f83e4837a1776134d5c73cc5e6.tar.bz2
Remove Sazanami Gothic from IDS_FIXED_FONT_FAMILY and IDS_SANS_SERIF_FONT_FAMILY.
It turned out the values of these fields are used for the "Fonts and Languages" dialog, so use of commas is not allowed. On the other hand, IDS_WEB_FONT_FAMILY seems to be used for generating HTML so use of commas is fine. For instance: chrome/browser/dom_ui/chrome_url_data_manager.cc: void ChromeURLDataManager::DataSource::SetFontAndTextDirection( DictionaryValue* localized_strings) { localized_strings->SetString(L"fontfamily", l10n_util::GetString(IDS_WEB_FONT_FAMILY)); chrome/browser/dom_ui/history_ui.cc: SetFontAndTextDirection(&localized_strings); static const base::StringPiece history_html( ResourceBundle::GetSharedInstance().GetRawDataResource( IDR_HISTORY_HTML)); const std::string full_html = jstemplate_builder::GetI18nTemplateHtml( history_html, &localized_strings); BUG=30758 TEST=locally ran "LANGUAGE=ja chrome" and confirmed that specified fonts are shown in the "Fonts and Languages" dialog, and Japanese pages are rendered with VL Gothic/PGothic. Review URL: http://codereview.chromium.org/502088 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35081 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/resources/locale_settings_ja.xtb4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/app/resources/locale_settings_ja.xtb b/chrome/app/resources/locale_settings_ja.xtb
index bae43ff..f7a0544 100644
--- a/chrome/app/resources/locale_settings_ja.xtb
+++ b/chrome/app/resources/locale_settings_ja.xtb
@@ -23,9 +23,9 @@
</if>
<if expr="os == 'linux2'">
<translation id="IDS_WEB_FONT_FAMILY">VL PGothic, Sazanami Gothic, Kochi Gothic, sans-serif</translation>
- <translation id="IDS_FIXED_FONT_FAMILY">VL Gothic, Sazanami Gothic</translation>
+ <translation id="IDS_FIXED_FONT_FAMILY">VL Gothic</translation>
<translation id="IDS_SERIF_FONT_FAMILY">Sazanami Mincho</translation>
- <translation id="IDS_SANS_SERIF_FONT_FAMILY">VL PGothic, Sazanami Gothic</translation>
+ <translation id="IDS_SANS_SERIF_FONT_FAMILY">VL PGothic</translation>
<translation id="IDS_CURSIVE_FONT_FAMILY">Sazanami Mincho</translation>
<translation id="IDS_FANTASY_FONT_FAMILY">Sazanami Mincho</translation>
</if>