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

Side by Side Diff: chrome/app/generated_resources.grd

Issue 149183: Merge r18858.... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/branches/172/src/
Patch Set: Created 11 years, 5 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
« no previous file with comments | « no previous file | no next file » | 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:r14162,14665,15308,15810,15950,16015,16808,18093,18210,18640,18858,18871,19044
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 3019 matching lines...) Expand 10 before | Expand all | Expand 10 after
3030 </message> 3030 </message>
3031 <message name="IDS_NEW_TAB_SEARCHES_INTRO" 3031 <message name="IDS_NEW_TAB_SEARCHES_INTRO"
3032 desc="Explains the searches concept to new users."> 3032 desc="Explains the searches concept to new users.">
3033 The search boxes that you use most frequently on other sites will appear here. 3033 The search boxes that you use most frequently on other sites will appear here.
3034 </message> 3034 </message>
3035 <message name="IDS_NEW_TAB_BOOKMARKS" 3035 <message name="IDS_NEW_TAB_BOOKMARKS"
3036 desc="The 'Bookmarks' heading on the new tab page"> 3036 desc="The 'Bookmarks' heading on the new tab page">
3037 Recent bookmarks 3037 Recent bookmarks
3038 </message> 3038 </message>
3039 <message name="IDS_NEW_TAB_HISTORY_SHOW" 3039 <message name="IDS_NEW_TAB_HISTORY_SHOW"
3040 desc="The 'Show history' link on the new tab page"> 3040 desc="The link on the new tab page that takes users to the dedica ted History page">
3041 Show full history 3041 Show full history
3042 </message> 3042 </message>
3043 <message name="IDS_NEW_TAB_REMOVE_THUMBNAILS" 3043 <message name="IDS_NEW_TAB_REMOVE_THUMBNAILS"
3044 desc="The 'Remove thumbnails' link on the new tab page"> 3044 desc="The link on the new tab page that lets users remove one or more t humbnails">
3045 Remove thumbnails 3045 Remove a thumbnail
3046 </message> 3046 </message>
3047 <message name="IDS_NEW_TAB_MOST_VISITED_DONE_REMOVING_BUTTON" 3047 <message name="IDS_NEW_TAB_MOST_VISITED_DONE_REMOVING_BUTTON"
3048 desc="The caption of the button used to validate the removal of thumbna ils"> 3048 desc="The caption of the button used to validate the removal of thumbna ils">
3049 Done 3049 Done
3050 </message> 3050 </message>
3051 <message name="IDS_NEW_TAB_MOST_VISITED_CANCEL_REMOVING_BUTTON" 3051 <message name="IDS_NEW_TAB_MOST_VISITED_CANCEL_REMOVING_BUTTON"
3052 desc="The caption of the button used to cancel the current removal thum bnails mode"> 3052 desc="The caption of the button used to cancel the current removal thum bnails mode">
3053 Cancel 3053 Cancel
3054 </message> 3054 </message>
3055 <message name="IDS_NEW_TAB_RESTORE_THUMBNAILS_LINK" 3055 <message name="IDS_NEW_TAB_RESTORE_THUMBNAILS_LINK"
(...skipping 473 matching lines...) Expand 10 before | Expand all | Expand 10 after
3529 <message name="IDS_SET_AS_DEFAULT_INFOBAR_BUTTON_LABEL" desc="The label of the 'set as default' button on the default browser infobar."> 3529 <message name="IDS_SET_AS_DEFAULT_INFOBAR_BUTTON_LABEL" desc="The label of the 'set as default' button on the default browser infobar.">
3530 Set as default 3530 Set as default
3531 </message> 3531 </message>
3532 <message name="IDS_DONT_ASK_AGAIN_INFOBAR_BUTTON_LABEL" desc="The label of the 'don't ask again' button on the default browser infobar."> 3532 <message name="IDS_DONT_ASK_AGAIN_INFOBAR_BUTTON_LABEL" desc="The label of the 'don't ask again' button on the default browser infobar.">
3533 Don't ask again 3533 Don't ask again
3534 </message> 3534 </message>
3535 3535
3536 </messages> 3536 </messages>
3537 </release> 3537 </release>
3538 </grit> 3538 </grit>
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698