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

Side by Side Diff: chrome/app/resources/locale_settings_chromiumos.grd

Issue 14667011: Merge 199398 "Revert r196089 "Add default values for Latin scrip..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1500/src/
Patch Set: Created 7 years, 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/app/resources/locale_settings_google_chromeos.grd » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <grit latest_public_release="0" current_release="1"> 2 <grit latest_public_release="0" current_release="1">
3 <outputs> 3 <outputs>
4 <output filename="grit/platform_locale_settings.h" type="rc_header"> 4 <output filename="grit/platform_locale_settings.h" type="rc_header">
5 <emit emit_type='prepend'></emit> 5 <emit emit_type='prepend'></emit>
6 </output> 6 </output>
7 <output filename="platform_locale_settings_am.pak" type="data_package" lang= "am" /> 7 <output filename="platform_locale_settings_am.pak" type="data_package" lang= "am" />
8 <output filename="platform_locale_settings_ar.pak" type="data_package" lang= "ar" /> 8 <output filename="platform_locale_settings_ar.pak" type="data_package" lang= "ar" />
9 <if expr="pp_ifdef('use_third_party_translations')"> 9 <if expr="pp_ifdef('use_third_party_translations')">
10 <output filename="platform_locale_settings_ast.pak" type="data_package" la ng="ast" /> 10 <output filename="platform_locale_settings_ast.pak" type="data_package" la ng="ast" />
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 <message name="IDS_SERIF_FONT_FAMILY_KOREAN" use_name_for_id="true"> 246 <message name="IDS_SERIF_FONT_FAMILY_KOREAN" use_name_for_id="true">
247 NanumMyeongjo 247 NanumMyeongjo
248 </message> 248 </message>
249 249
250 <!-- The default value for |WebPreference::sans_serif_font_family_map| for 250 <!-- The default value for |WebPreference::sans_serif_font_family_map| for
251 Korean script. --> 251 Korean script. -->
252 <message name="IDS_SANS_SERIF_FONT_FAMILY_KOREAN" use_name_for_id="true"> 252 <message name="IDS_SANS_SERIF_FONT_FAMILY_KOREAN" use_name_for_id="true">
253 NanumGothic 253 NanumGothic
254 </message> 254 </message>
255 255
256 <!-- The default value for |WebPreference::standard_font_family| for Latin
257 script. -->
258 <message name="IDS_STANDARD_FONT_FAMILY_LATIN" use_name_for_id="true">
259 Tinos
260 </message>
261
262 <!-- The default value for |WebPreference::fixed_font_family| for Latin
263 script. -->
264 <message name="IDS_FIXED_FONT_FAMILY_LATIN" use_name_for_id="true">
265 Cousine
266 </message>
267
268 <!-- The default value for |WebPreference::serif_font_family| for Latin
269 script. -->
270 <message name="IDS_SERIF_FONT_FAMILY_LATIN" use_name_for_id="true">
271 Tinos
272 </message>
273
274 <!-- The default value for |WebPreference::sans_serif_font_family| for
275 Latin script. -->
276 <message name="IDS_SANS_SERIF_FONT_FAMILY_LATIN" use_name_for_id="true">
277 Arimo
278 </message>
279
280 <!-- The default value for |WebPreference::cursive_font_family| for Latin
281 script. -->
282 <message name="IDS_CURSIVE_FONT_FAMILY_LATIN" use_name_for_id="true">
283 Comic Sans MS
284 </message>
285
286 <!-- The default value for |WebPreference::fantasy_font_family| for Latin
287 script. -->
288 <message name="IDS_FANTASY_FONT_FAMILY_LATIN" use_name_for_id="true">
289 Impact
290 </message>
291
292 <!-- The default value for |WebPreference::pictograph_font_family| for
293 Latin script. -->
294 <message name="IDS_PICTOGRAPH_FONT_FAMILY_LATIN" use_name_for_id="true">
295 Droid Emoji
296 </message>
297
298 <!-- The default value for |WebPreference::standard_font_family_map| for 256 <!-- The default value for |WebPreference::standard_font_family_map| for
299 Simplified Chinese script. --> 257 Simplified Chinese script. -->
300 <message name="IDS_STANDARD_FONT_FAMILY_SIMPLIFIED_HAN" use_name_for_id="t rue"> 258 <message name="IDS_STANDARD_FONT_FAMILY_SIMPLIFIED_HAN" use_name_for_id="t rue">
301 Droid Sans Fallback 259 Droid Sans Fallback
302 </message> 260 </message>
303 261
304 <!-- The default value for |WebPreference::fixed_font_family_map| for 262 <!-- The default value for |WebPreference::fixed_font_family_map| for
305 Simplified Chinese script. --> 263 Simplified Chinese script. -->
306 <message name="IDS_FIXED_FONT_FAMILY_SIMPLIFIED_HAN" use_name_for_id="true "> 264 <message name="IDS_FIXED_FONT_FAMILY_SIMPLIFIED_HAN" use_name_for_id="true ">
307 Droid Sans Fallback 265 Droid Sans Fallback
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
359 </message> 317 </message>
360 318
361 <!-- The default value for |WebPreference::minimum_logical_font_size|. --> 319 <!-- The default value for |WebPreference::minimum_logical_font_size|. -->
362 <message name="IDS_MINIMUM_LOGICAL_FONT_SIZE" use_name_for_id="true"> 320 <message name="IDS_MINIMUM_LOGICAL_FONT_SIZE" use_name_for_id="true">
363 6 321 6
364 </message> 322 </message>
365 323
366 </messages> 324 </messages>
367 </release> 325 </release>
368 </grit> 326 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/app/resources/locale_settings_google_chromeos.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698