diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-26 14:07:06 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-26 14:07:06 +0000 |
| commit | 423c88bfda69923766a61de7261f9bf267a82705 (patch) | |
| tree | 60b683d5e0752c18c2688da3929dbf6414ab033e /chrome/app | |
| parent | 98f397e9a7720f1476e37b0966c9ad70ea4deebc (diff) | |
| download | chromium_src-423c88bfda69923766a61de7261f9bf267a82705.zip chromium_src-423c88bfda69923766a61de7261f9bf267a82705.tar.gz chromium_src-423c88bfda69923766a61de7261f9bf267a82705.tar.bz2 | |
Update installer error strings to include Chrome Frame specific branding when running in Chrome Frame mode.
Also fix the installer_util_strings target that had a broken dependency on a file that has since been moved.
BUG=46013
TEST=Google Chrome Frame is correctly displayed when the installer is run in Chrome Frame mode.
Review URL: http://codereview.chromium.org/3968005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63888 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/chromium_strings.grd | 8 | ||||
| -rw-r--r-- | chrome/app/google_chrome_strings.grd | 6 |
2 files changed, 13 insertions, 1 deletions
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd index 5e62faa..d25125f 100644 --- a/chrome/app/chromium_strings.grd +++ b/chrome/app/chromium_strings.grd @@ -342,6 +342,9 @@ be available for now. --> <message name="IDS_INSTALL_HIGHER_VERSION" desc="Error displayed when higher version already exists."> This computer already has a more recent version of Chromium. If the software is not working, please uninstall Chromium and download it again. </message> + <message name="IDS_INSTALL_HIGHER_VERSION_CF" desc="Error displayed when higher version already exists."> + This computer already has a more recent version of Chromium Frame. If the software is not working, please uninstall Chromium Frame and download it again. + </message> <message name="IDS_INSTALL_USER_LEVEL_EXISTS" desc="Error displayed during system level install if user level Chromium is already installed."> Chromium has already been installed for this user. If the software is not working, please uninstall Chromium and download it again. </message> @@ -352,7 +355,10 @@ be available for now. --> Installation failed due to unspecified error. If Chromium is currently running, please close it and try again. </message> <message name="IDS_SAME_VERSION_REPAIR_FAILED" desc="Error displayed if installation fails due to Chrome running."> - Can not install the same Google Chrome version that is currently running. Please close Google Chrome and try again. + Can not install the same Chromium version that is currently running. Please close Chromium and try again. + </message> + <message name="IDS_SAME_VERSION_REPAIR_FAILED_CF" desc="Error displayed if installation fails due to Chrome running."> + Can not install the same Chromium Frame version that is currently running. Please close Chromium Frame and try again. </message> <message name="IDS_SETUP_PATCH_FAILED" desc="Error message when setup.exe fails to patch itself."> Installation failed due to unspecified error. Please download Chromium again. diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd index 84a934b..20ac348 100644 --- a/chrome/app/google_chrome_strings.grd +++ b/chrome/app/google_chrome_strings.grd @@ -393,6 +393,9 @@ Chrome supports. --> <message name="IDS_INSTALL_HIGHER_VERSION" desc="Error displayed when higher version already exists."> This computer already has a more recent version of Google Chrome. If the software is not working, please uninstall Google Chrome and download it again. </message> + <message name="IDS_INSTALL_HIGHER_VERSION_CF" desc="Error displayed when higher version of Chrome Frame already exists"> + This computer already has a more recent version of Google Chrome Frame. If the software is not working, please uninstall Google Chrome Frame and download it again. + </message> <message name="IDS_INSTALL_USER_LEVEL_EXISTS" desc="Error displayed during system level install if user level Chromium is already installed."> Google Chrome has already been installed for this user. If the software is not working, please uninstall Google Chrome and download it again. </message> @@ -405,6 +408,9 @@ Chrome supports. --> <message name="IDS_SAME_VERSION_REPAIR_FAILED" desc="Error displayed if installation fails due to Chrome running."> Can not install the same Google Chrome version that is currently running. Please close Google Chrome and try again. </message> + <message name="IDS_SAME_VERSION_REPAIR_FAILED_CF" desc="Error displayed if installation fails due to Chrome Frame already running."> + Can not install the same Google Chrome Frame version that is currently running. Please close Google Chrome Frame and try again. + </message> <message name="IDS_SETUP_PATCH_FAILED" desc="Error message when setup.exe fails to patch itself."> Installation failed due to unspecified error. Please download Google Chrome again. </message> |