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

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

Issue 200107: Merge 26041 - Fix About box truncation in some locales when new version is av... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/app/resources/locale_settings_bg.xtb » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Modified: svn:mergeinfo
Merged /trunk/src/chrome/app/resources/locale_settings.grd:r26041
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/locale_settings.h" type="rc_header"> 4 <output filename="grit/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="locale_settings_ar.rc" type="rc_all" lang="ar" /> 7 <output filename="locale_settings_ar.rc" type="rc_all" lang="ar" />
8 <output filename="locale_settings_bg.rc" type="rc_all" lang="bg" /> 8 <output filename="locale_settings_bg.rc" type="rc_all" lang="bg" />
9 <output filename="locale_settings_bn.rc" type="rc_all" lang="bn" /> 9 <output filename="locale_settings_bn.rc" type="rc_all" lang="bn" />
10 <output filename="locale_settings_ca.rc" type="rc_all" lang="ca" /> 10 <output filename="locale_settings_ca.rc" type="rc_all" lang="ca" />
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after
360 <message name="IDS_IMPORT_DIALOG_WIDTH_CHARS" use_name_for_id="true"> 360 <message name="IDS_IMPORT_DIALOG_WIDTH_CHARS" use_name_for_id="true">
361 60 361 60
362 </message> 362 </message>
363 <message name="IDS_IMPORT_DIALOG_HEIGHT_LINES" use_name_for_id="true"> 363 <message name="IDS_IMPORT_DIALOG_HEIGHT_LINES" use_name_for_id="true">
364 14 364 14
365 </message> 365 </message>
366 366
367 <!-- The width and height of the About dialog box in characters and lines (See --> 367 <!-- The width and height of the About dialog box in characters and lines (See -->
368 <!-- above). --> 368 <!-- above). -->
369 <message name="IDS_ABOUT_DIALOG_WIDTH_CHARS" use_name_for_id="true"> 369 <message name="IDS_ABOUT_DIALOG_WIDTH_CHARS" use_name_for_id="true">
370 83 370 86
371 </message> 371 </message>
372 <message name="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES" use_name_for_id="tru e"> 372 <message name="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES" use_name_for_id="tru e">
373 4 373 4
374 </message> 374 </message>
375 375
376 <!-- The width and height of the Fonts and Languages dialog box in charact ers and --> 376 <!-- The width and height of the Fonts and Languages dialog box in charact ers and -->
377 <!-- lines (See above). --> 377 <!-- lines (See above). -->
378 <message name="IDS_FONTSLANG_DIALOG_WIDTH_CHARS" use_name_for_id="true"> 378 <message name="IDS_FONTSLANG_DIALOG_WIDTH_CHARS" use_name_for_id="true">
379 96 379 96
380 </message> 380 </message>
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
557 <!-- The URL for Google Chrome welcome page. This is used for the pre --> 557 <!-- The URL for Google Chrome welcome page. This is used for the pre -->
558 <!-- populated thumbnails. --> 558 <!-- populated thumbnails. -->
559 <!-- TODO(arv): Use GRITLANGCODE --> 559 <!-- TODO(arv): Use GRITLANGCODE -->
560 <message name="IDS_CHROME_WELCOME_URL" translateable="false"> 560 <message name="IDS_CHROME_WELCOME_URL" translateable="false">
561 http://www.google.com/chrome/intl/en/welcome.html 561 http://www.google.com/chrome/intl/en/welcome.html
562 </message> 562 </message>
563 563
564 </messages> 564 </messages>
565 </release> 565 </release>
566 </grit> 566 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/app/resources/locale_settings_bg.xtb » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698