diff options
| author | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-15 21:15:31 +0000 |
|---|---|---|
| committer | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-15 21:15:31 +0000 |
| commit | 843a6efbb0bad716d9d44d34a5eebcf47d1f7bd2 (patch) | |
| tree | cd9173951c36fd1fdd046ab7ef53bad2c37c8ae5 /chrome/app | |
| parent | 037edb562c99661e1390bd7f200083a743394ba9 (diff) | |
| download | chromium_src-843a6efbb0bad716d9d44d34a5eebcf47d1f7bd2.zip chromium_src-843a6efbb0bad716d9d44d34a5eebcf47d1f7bd2.tar.gz chromium_src-843a6efbb0bad716d9d44d34a5eebcf47d1f7bd2.tar.bz2 | |
Allow updates to user-level products when system-level products are present.
This will drop the frequency of update error 6 (SYSTEM_LEVEL_INSTALL_EXISTS). There's no good reason to block updates in this case, only new installs.
BUG=103374
TEST=Install user-level Chrome, Install system-level Chrome, Update the user-level Chrome. Expect the update to succeed.
Review URL: http://codereview.chromium.org/8570006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110165 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/chromium_strings.grd | 4 | ||||
| -rw-r--r-- | chrome/app/google_chrome_strings.grd | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd index 21f28c7..50b70af 100644 --- a/chrome/app/chromium_strings.grd +++ b/chrome/app/chromium_strings.grd @@ -375,8 +375,8 @@ be available for now. --> <message name="IDS_INSTALL_HIGHER_VERSION_CB_CF" desc="Error displayed when higher version of Chromium and Chromium Frame already exists"> This computer already has a more recent version of Chromium and Chromium Frame. If the software is not working, please uninstall both Chromium and Chromium Frame and try again. </message> - <message name="IDS_INSTALL_SYSTEM_LEVEL_EXISTS" desc="Error displayed during user level install if system level Chromium is already installed."> - Chromium is already installed and available to all users of this computer. If you want to install Chromium at the user level, you must first uninstall the system-level version installed by an administrator. + <message name="IDS_INSTALL_SYSTEM_LEVEL_EXISTS" desc="Error displayed during user level install if system level Chromium Frame is already installed."> + Chromium Frame is already installed and available to all users of this computer. If you want to install Chromium Frame at the user level, you must first uninstall the system-level version installed by an administrator. </message> <message name="IDS_INSTALL_FAILED" desc="Error displayed if installation fails due to some unknown error."> Installation failed due to unspecified error. If Chromium is currently running, please close it and try again. diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd index 81d3f58..d838b5b 100644 --- a/chrome/app/google_chrome_strings.grd +++ b/chrome/app/google_chrome_strings.grd @@ -349,8 +349,8 @@ Chrome supports. --> <message name="IDS_INSTALL_HIGHER_VERSION_CB_CF" desc="Error displayed when higher version of Chrome and Chrome Frame already exists"> This computer already has a more recent version of Google Chrome and Google Chrome Frame. If the software is not working, please uninstall both Google Chrome and Google Chrome Frame and try again. </message> - <message name="IDS_INSTALL_SYSTEM_LEVEL_EXISTS" desc="Error displayed during user level install if system level Chromium is already installed."> - Google Chrome is already installed and available to all users of this computer. If you want to install Google Chrome at the user level, you must first uninstall the system-level version installed by an administrator. + <message name="IDS_INSTALL_SYSTEM_LEVEL_EXISTS" desc="Error displayed during user level install if system level Chrome Frame is already installed."> + Google Chrome Frame is already installed and available to all users of this computer. If you want to install Google Chrome Frame at the user level, you must first uninstall the system-level version installed by an administrator. </message> <message name="IDS_INSTALL_FAILED" desc="Error displayed if installation fails due to some unknown error."> Installation failed due to unspecified error. If Google Chrome is currently running, please close it and try again. |