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

Side by Side Diff: chrome/app/generated_resources.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 | « no previous file | chrome/app/resources/locale_settings.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/generated_resources.grd:r21608
OLDNEW
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 2
3 <!-- This file contains definitions of resources that will be translated for 3 <!-- This file contains definitions of resources that will be translated for
4 each locale. --> 4 each locale. -->
5 5
6 <grit base_dir="." latest_public_release="0" current_release="1" 6 <grit base_dir="." latest_public_release="0" current_release="1"
7 source_lang_id="en" enc_check="möl"> 7 source_lang_id="en" enc_check="möl">
8 <outputs> 8 <outputs>
9 <output filename="grit/generated_resources.h" type="rc_header"> 9 <output filename="grit/generated_resources.h" type="rc_header">
10 <emit emit_type='prepend'></emit> 10 <emit emit_type='prepend'></emit>
(...skipping 3598 matching lines...) Expand 10 before | Expand all | Expand 10 after
3609 Change page layout 3609 Change page layout
3610 </message> 3610 </message>
3611 <message name="IDS_NEW_TAB_FIRST_RUN_NOTIFICATION" 3611 <message name="IDS_NEW_TAB_FIRST_RUN_NOTIFICATION"
3612 desc="Notification text to show in the banner at the top of the new tab page when the user first sees it."> 3612 desc="Notification text to show in the banner at the top of the new tab page when the user first sees it.">
3613 Over time, the area below will show your eight most visited sites. 3613 Over time, the area below will show your eight most visited sites.
3614 </message> 3614 </message>
3615 <message name="IDS_NEW_TAB_CLOSE_FIRST_RUN_NOTIFICATION" 3615 <message name="IDS_NEW_TAB_CLOSE_FIRST_RUN_NOTIFICATION"
3616 desc="Action text for link that closes the first run notification."> 3616 desc="Action text for link that closes the first run notification.">
3617 Close 3617 Close
3618 </message> 3618 </message>
3619 3619 <!-- TODO: Should this be something none Chrome for Chromium? -->
3620 <message name="IDS_NEW_TAB_CHROME_WELCOME_PAGE_TITLE"
3621 desc="Title for the hard coded thumbnail that represents the Google Chr ome Welcome page. This is used on the NTP when there aren't enough thumbnails to show.">
3622 Google Chrome
3623 </message>
3624 <!-- TODO: Should this be something none Chrome for Chromium? -->
3625 <message name="IDS_NEW_TAB_THEMES_GALLERY_PAGE_TITLE"
3626 desc="Title for the hard coded thumbnail that represents the Google Chr ome Themes Gallery page. This is used on the NTP when there aren't enough thumbn ails to show.">
3627 Google Chrome Themes Gallery
3628 </message>
3629
3620 <!-- SafeBrowsing --> 3630 <!-- SafeBrowsing -->
3621 <message name="IDS_SAFE_BROWSING_MALWARE_TITLE" desc="SafeBrowsing Malware HTML title"> 3631 <message name="IDS_SAFE_BROWSING_MALWARE_TITLE" desc="SafeBrowsing Malware HTML title">
3622 Malware Detected! 3632 Malware Detected!
3623 </message> 3633 </message>
3624 <message name="IDS_SAFE_BROWSING_MALWARE_HEADLINE" desc="SafeBrowsing Malw are HTML headline"> 3634 <message name="IDS_SAFE_BROWSING_MALWARE_HEADLINE" desc="SafeBrowsing Malw are HTML headline">
3625 Warning: Visiting this site may harm your computer! 3635 Warning: Visiting this site may harm your computer!
3626 </message> 3636 </message>
3627 <message name="IDS_SAFE_BROWSING_MALWARE_DESCRIPTION1" desc="SafeBrowsing Malware HTML description, first line"> 3637 <message name="IDS_SAFE_BROWSING_MALWARE_DESCRIPTION1" desc="SafeBrowsing Malware HTML description, first line">
3628 The website at &lt;strong&gt;<ph name="HOST_NAME">$1<ex>www.malware.com< /ex></ph>&lt;/strong&gt; appears to host malware – software that can hurt your c omputer or otherwise operate without your consent. Just visiting a site that ho sts malware can infect your computer. 3638 The website at &lt;strong&gt;<ph name="HOST_NAME">$1<ex>www.malware.com< /ex></ph>&lt;/strong&gt; appears to host malware – software that can hurt your c omputer or otherwise operate without your consent. Just visiting a site that ho sts malware can infect your computer.
3629 </message> 3639 </message>
(...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after
4079 rgba($1, $2, $3, $4) 4089 rgba($1, $2, $3, $4)
4080 </message> 4090 </message>
4081 4091
4082 <message name="IDS_USED_EXISTING_BROWSER" desc="Linux-specific message pri nted to console when the app is ran a second time, causing a new window to show rather than starting up a new browser."> 4092 <message name="IDS_USED_EXISTING_BROWSER" desc="Linux-specific message pri nted to console when the app is ran a second time, causing a new window to show rather than starting up a new browser.">
4083 Created new window in existing browser session. 4093 Created new window in existing browser session.
4084 </message> 4094 </message>
4085 4095
4086 </messages> 4096 </messages>
4087 </release> 4097 </release>
4088 </grit> 4098 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/app/resources/locale_settings.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698