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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 159475: Merge 21608 - , INNTP: Adds 2 hard coded thumbnails.... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/
Patch Set: Created 11 years, 4 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 | « chrome/app/generated_resources.grd ('k') | chrome/app/theme/theme_resources.grd » ('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:r21608
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 530 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 541
542 <!-- The URL for Chromium project used in About dialog. --> 542 <!-- The URL for Chromium project used in About dialog. -->
543 <message name="IDS_CHROMIUM_PROJECT_URL" translateable="false"> 543 <message name="IDS_CHROMIUM_PROJECT_URL" translateable="false">
544 http://code.google.com/chromium/?hl=[GRITLANGCODE] 544 http://code.google.com/chromium/?hl=[GRITLANGCODE]
545 </message> 545 </message>
546 546
547 <!-- The URL for Linux ssl certificate configuration help. --> 547 <!-- The URL for Linux ssl certificate configuration help. -->
548 <message name="IDS_LINUX_CERTIFICATES_CONFIG_URL" translateable="false"> 548 <message name="IDS_LINUX_CERTIFICATES_CONFIG_URL" translateable="false">
549 http://code.google.com/p/chromium/wiki/LinuxCertManagement 549 http://code.google.com/p/chromium/wiki/LinuxCertManagement
550 </message> 550 </message>
551 551
552 <!-- The URL for the themes gallery. --> 552 <!-- The URL for the themes gallery. -->
553 <!-- TODO(arv): Use GRITLANGCODE -->
553 <message name="IDS_THEMES_GALLERY_URL" translateable="false"> 554 <message name="IDS_THEMES_GALLERY_URL" translateable="false">
554 https://tools.google.com/chrome/intl/en/themes/index.html 555 https://tools.google.com/chrome/intl/en/themes/
555 </message> 556 </message>
557 <!-- The URL for Google Chrome welcome page. This is used for the pre -->
558 <!-- populated thumbnails. -->
559 <!-- TODO(arv): Use GRITLANGCODE -->
560 <message name="IDS_CHROME_WELCOME_URL" translateable="false">
561 http://www.google.com/chrome/intl/en/welcome.html
562 </message>
563
556 </messages> 564 </messages>
557 </release> 565 </release>
558 </grit> 566 </grit>
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/app/theme/theme_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698