Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6754)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/app/resources/locale_settings.grd

Issue 244039: Use Mac fonts in Mac Chrome (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/tab_contents/web_contents_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/resources/locale_settings.grd
===================================================================
--- chrome/app/resources/locale_settings.grd (revision 27524)
+++ chrome/app/resources/locale_settings.grd (working copy)
@@ -219,19 +219,31 @@
<include name="IDR_TERMS_HTML" file="terms\terms_chromium.html" type="BINDATA" />
</if>
</includes>
- <messages>
+ <messages fallback_to_english="true">
- <!-- The font used in web-style native pages (e.g. History). -->
- <message name="IDS_WEB_FONT_FAMILY" use_name_for_id="true">
- Arial
- </message>
+ <if expr="os != 'darwin'">
+ <!-- The font used in web-style native pages (e.g. History). -->
+ <message name="IDS_WEB_FONT_FAMILY" use_name_for_id="true">
+ Arial
+ </message>
- <!-- The relative font size in % used in web-style native pages
- (e.g. History). -->
- <message name="IDS_WEB_FONT_SIZE" use_name_for_id="true">
- 84%
- </message>
+ <!-- The relative font size in % used in web-style native pages
+ (e.g. History). -->
+ <message name="IDS_WEB_FONT_SIZE" use_name_for_id="true">
+ 84%
+ </message>
+ </if>
+ <if expr="os == 'darwin'">
+ <message name="IDS_WEB_FONT_FAMILY" desc="The font used in web-style native pages (e.g. History) (Mac)">
+ Helvetica
+ </message>
+
+ <message name="IDS_WEB_FONT_SIZE" desc="The relative font size in % used in web-style native pages (e.g. History) (Mac)">
+ 84%
+ </message>
+ </if>
+
<!-- The default value for HTTP Accept-Language header. -->
<message name="IDS_ACCEPT_LANGUAGES" use_name_for_id="true">
en-US,en
@@ -242,57 +254,101 @@
ISO-8859-1
</message>
- <!-- The default value to determine whether
- |WebPreference::standard_font_family| is serif or sans-serif. -->
- <message name="IDS_STANDARD_FONT_IS_SERIF" use_name_for_id="true">
- true
- </message>
+ <if expr="os != 'darwin'">
+ <!-- The default value to determine whether
+ |WebPreference::standard_font_family| is serif or sans-serif. -->
+ <message name="IDS_STANDARD_FONT_IS_SERIF" use_name_for_id="true">
+ true
+ </message>
- <!-- The default value for |WebPreference::fixed_font_family| -->
- <message name="IDS_FIXED_FONT_FAMILY" use_name_for_id="true">
- Courier New
- </message>
+ <!-- The default value for |WebPreference::fixed_font_family| -->
+ <message name="IDS_FIXED_FONT_FAMILY" use_name_for_id="true">
+ Courier New
+ </message>
- <!-- The default value for |WebPreference::serif_font_family| -->
- <message name="IDS_SERIF_FONT_FAMILY" use_name_for_id="true">
- Times New Roman
- </message>
+ <!-- The default value for |WebPreference::serif_font_family| -->
+ <message name="IDS_SERIF_FONT_FAMILY" use_name_for_id="true">
+ Times New Roman
+ </message>
- <!-- The default value for |WebPreference::sans_serif_font_family| -->
- <message name="IDS_SANS_SERIF_FONT_FAMILY" use_name_for_id="true">
- Arial
- </message>
+ <!-- The default value for |WebPreference::sans_serif_font_family| -->
+ <message name="IDS_SANS_SERIF_FONT_FAMILY" use_name_for_id="true">
+ Arial
+ </message>
- <!-- The default value for |WebPreference::cursive_font_family| -->
- <message name="IDS_CURSIVE_FONT_FAMILY" use_name_for_id="true">
- Comic Sans MS
- </message>
+ <!-- The default value for |WebPreference::cursive_font_family| -->
+ <message name="IDS_CURSIVE_FONT_FAMILY" use_name_for_id="true">
+ Comic Sans MS
+ </message>
- <!-- The default value for |WebPreference::fantasy_font_family| -->
- <message name="IDS_FANTASY_FONT_FAMILY" use_name_for_id="true">
- Impact
- </message>
+ <!-- The default value for |WebPreference::fantasy_font_family| -->
+ <message name="IDS_FANTASY_FONT_FAMILY" use_name_for_id="true">
+ Impact
+ </message>
- <!-- The default value for |WebPreference::default_font_size| -->
- <message name="IDS_DEFAULT_FONT_SIZE" use_name_for_id="true">
- 16
- </message>
+ <!-- The default value for |WebPreference::default_font_size| -->
+ <message name="IDS_DEFAULT_FONT_SIZE" use_name_for_id="true">
+ 16
+ </message>
- <!-- The default value for |WebPreference::default_fixed_font_size| -->
- <message name="IDS_DEFAULT_FIXED_FONT_SIZE" use_name_for_id="true">
- 13
- </message>
+ <!-- The default value for |WebPreference::default_fixed_font_size| -->
+ <message name="IDS_DEFAULT_FIXED_FONT_SIZE" use_name_for_id="true">
+ 13
+ </message>
- <!-- The default value for |WebPreference::minimum_font_size| -->
- <message name="IDS_MINIMUM_FONT_SIZE" use_name_for_id="true">
- 1
- </message>
+ <!-- The default value for |WebPreference::minimum_font_size| -->
+ <message name="IDS_MINIMUM_FONT_SIZE" use_name_for_id="true">
+ 1
+ </message>
- <!-- The default value for |WebPreference::minimum_logical_font_size|. -->
- <message name="IDS_MINIMUM_LOGICAL_FONT_SIZE" use_name_for_id="true">
- 6
- </message>
+ <!-- The default value for |WebPreference::minimum_logical_font_size|. -->
+ <message name="IDS_MINIMUM_LOGICAL_FONT_SIZE" use_name_for_id="true">
+ 6
+ </message>
+ </if>
+ <if expr="os == 'darwin'">
+ <message name="IDS_STANDARD_FONT_IS_SERIF" desc="The default value to determine whether |WebPreference::standard_font_family| is serif or sans-serif (Mac)">
+ true
+ </message>
+
+ <message name="IDS_FIXED_FONT_FAMILY" desc="The default value for |WebPreference::fixed_font_family| (Mac)">
+ Courier
+ </message>
+
+ <message name="IDS_SERIF_FONT_FAMILY" desc="The default value for |WebPreference::serif_font_family| (Mac)">
+ Times
+ </message>
+
+ <message name="IDS_SANS_SERIF_FONT_FAMILY" desc="The default value for |WebPreference::sans_serif_font_family| (Mac)">
+ Helvetica
+ </message>
+
+ <message name="IDS_CURSIVE_FONT_FAMILY" desc="The default value for |WebPreference::cursive_font_family| (Mac)">
+ Apple Chancery
+ </message>
+
+ <message name="IDS_FANTASY_FONT_FAMILY" desc="The default value for |WebPreference::fantasy_font_family| (Mac)">
+ Papyrus
+ </message>
+
+ <message name="IDS_DEFAULT_FONT_SIZE" desc="The default value for |WebPreference::default_font_size| (Mac)">
+ 16
+ </message>
+
+ <message name="IDS_DEFAULT_FIXED_FONT_SIZE" desc="The default value for |WebPreference::default_fixed_font_size| (Mac)">
+ 13
+ </message>
+
+ <message name="IDS_MINIMUM_FONT_SIZE" desc="The default value for |WebPreference::minimum_font_size| (Mac)">
+ 1
+ </message>
+
+ <message name="IDS_MINIMUM_LOGICAL_FONT_SIZE" desc="The default value for |WebPreference::minimum_logical_font_size| (Mac)">
+ 9
+ </message>
+ </if>
+
<!-- The default value for |WebPreference::uses_universal_detector|. -->
<message name="IDS_USES_UNIVERSAL_DETECTOR" use_name_for_id="true">
false
« no previous file with comments | « no previous file | chrome/browser/tab_contents/web_contents_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698