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

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

Issue 165373: Merge 23055 - Make the theme install infobar have an 'undo' button instead... (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/browser/extensions/extension_install_ui.h » ('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:r23055
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 2053 matching lines...) Expand 10 before | Expand all | Expand 10 after
2064 Restart 2064 Restart
2065 </message> 2065 </message>
2066 <message name="IDS_EXTENSION_CRASHED_INFOBAR_MESSAGE" desc="Message displa yed on the extension crashed infobar."> 2066 <message name="IDS_EXTENSION_CRASHED_INFOBAR_MESSAGE" desc="Message displa yed on the extension crashed infobar.">
2067 The following extension has crashed : <ph name="EXTENSION_NAME">$1<ex>Bu ildbot Monitor</ex></ph> 2067 The following extension has crashed : <ph name="EXTENSION_NAME">$1<ex>Bu ildbot Monitor</ex></ph>
2068 </message> 2068 </message>
2069 2069
2070 <!-- Theme preview info bar --> 2070 <!-- Theme preview info bar -->
2071 <message name="IDS_THEME_INSTALL_INFOBAR_LABEL" desc="Text displayed on an infobar when a theme has been installed."> 2071 <message name="IDS_THEME_INSTALL_INFOBAR_LABEL" desc="Text displayed on an infobar when a theme has been installed.">
2072 Installed theme "<ph name="THEME_NAME">$1<ex>Snowflake Theme</ex></ph>" 2072 Installed theme "<ph name="THEME_NAME">$1<ex>Snowflake Theme</ex></ph>"
2073 </message> 2073 </message>
2074 <message name="IDS_THEME_INSTALL_INFOBAR_UNDO_BUTTON" desc="Text displayed on the button to undo a theme installation and go back to the default theme."> 2074 <message name="IDS_THEME_INSTALL_INFOBAR_UNDO_BUTTON" desc="Text displayed on the button to undo a theme installation and go back to the previous theme.">
2075 Back to default 2075 Undo
2076 </message> 2076 </message>
2077 2077
2078 <!-- Extesion install prompt --> 2078 <!-- Extesion install prompt -->
2079 <message name="IDS_EXTENSION_PROMPT_TITLE" desc="Titlebar of the extension installation prompt window"> 2079 <message name="IDS_EXTENSION_PROMPT_TITLE" desc="Titlebar of the extension installation prompt window">
2080 Confirm Installation 2080 Confirm Installation
2081 </message> 2081 </message>
2082 <message name="IDS_EXTENSION_PROMPT_HEADING" desc="First bold line in the content area of the extension installation prompt. Asks the user if they want to install a particular extension."> 2082 <message name="IDS_EXTENSION_PROMPT_HEADING" desc="First bold line in the content area of the extension installation prompt. Asks the user if they want to install a particular extension.">
2083 Install "<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>"? 2083 Install "<ph name="EXTENSION_NAME">$1<ex>Gmail Checker</ex></ph>"?
2084 </message> 2084 </message>
2085 <message name="IDS_EXTENSION_PROMPT_WARNING_1" desc="Humorous warning disp layed in the extension install prompt that tells users that extensions have acce ss to their computer and private data."> 2085 <message name="IDS_EXTENSION_PROMPT_WARNING_1" desc="Humorous warning disp layed in the extension install prompt that tells users that extensions have acce ss to their computer and private data.">
(...skipping 2347 matching lines...) Expand 10 before | Expand all | Expand 10 after
4433 rgba($1, $2, $3, $4) 4433 rgba($1, $2, $3, $4)
4434 </message> 4434 </message>
4435 4435
4436 <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."> 4436 <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.">
4437 Created new window in existing browser session. 4437 Created new window in existing browser session.
4438 </message> 4438 </message>
4439 4439
4440 </messages> 4440 </messages>
4441 </release> 4441 </release>
4442 </grit> 4442 </grit>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_install_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698