diff options
| author | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-19 05:06:00 +0000 |
|---|---|---|
| committer | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-19 05:06:00 +0000 |
| commit | 1e6b3cd2dff4749f912e720d4e985b740ac7a75d (patch) | |
| tree | ae9511bf5829619de45707a3c1cb2f48609205c8 /chrome | |
| parent | 694fbeec4cd2731d83e2cf1c48777c2237f44b4d (diff) | |
| download | chromium_src-1e6b3cd2dff4749f912e720d4e985b740ac7a75d.zip chromium_src-1e6b3cd2dff4749f912e720d4e985b740ac7a75d.tar.gz chromium_src-1e6b3cd2dff4749f912e720d4e985b740ac7a75d.tar.bz2 | |
Some new strings for setup.exe safeguard.
BUG=61609
TEST=none
Review URL: http://codereview.chromium.org/6310011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71764 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/chromium_strings.grd | 3 | ||||
| -rw-r--r-- | chrome/app/google_chrome_strings.grd | 3 | ||||
| -rwxr-xr-x | chrome/installer/util/prebuild/create_string_rc.py | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd index ece137b..c58b68e 100644 --- a/chrome/app/chromium_strings.grd +++ b/chrome/app/chromium_strings.grd @@ -427,6 +427,9 @@ be available for now. --> <message name="IDS_INSTALL_MULTI_INSTALLATION_EXISTS" desc="Error during install if a multi-install Chromium or Chromium Frame is present, thereby preventing the installation of a single-install Chromium or Chromium Frame."> A conflicting installation of Chromium or Chromium Frame was found on the system. Please uninstall it and try again. </message> + <message name="IDS_INSTALL_CONFLICTING_CHANNEL_EXISTS" desc="Error during install if a version of Chromium on a different update channel exists when installing Chromium Frame."> + A conflicting installation of Chromium was found on the system. Please uninstall it and try again. + </message> <!-- Options Dialog --> <!--TODO(kmadhusu): Remove "IDS_OPTIONS_DISABLE_SERVICES" after platform-specific dialogs are removed.--> <message name="IDS_OPTIONS_DISABLE_SERVICES" desc="The text in the options panel that describes how we use web services to improve browsing experience."> diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd index f4368ba..4a4a2b2 100644 --- a/chrome/app/google_chrome_strings.grd +++ b/chrome/app/google_chrome_strings.grd @@ -455,6 +455,9 @@ Chrome supports. --> <message name="IDS_INSTALL_MULTI_INSTALLATION_EXISTS" desc="Error during install if a multi-install Google Chrome or Google Chrome Frame is present, thereby preventing the installation of a single-install Google Chrome or Google Chrome Frame."> A conflicting installation of Google Chrome or Google Chrome Frame was found on the system. Please uninstall it and try again. </message> + <message name="IDS_INSTALL_CONFLICTING_CHANNEL_EXISTS" desc="Error during install if a version of Google Chrome on a different update channel exists when installing Google Chrome Frame."> + A conflicting installation of Google Chrome was found on the system. Please uninstall it and try again. + </message> <!-- Options Dialog --> <!-- TODO(kmadhusu): Remove "IDS_OPTIONS_DISABLE_SERVICES" after platform-specific dialogs are removed.--> <message name="IDS_OPTIONS_DISABLE_SERVICES" desc="The text in the options panel that describes how we use web services to improve browsing experience."> diff --git a/chrome/installer/util/prebuild/create_string_rc.py b/chrome/installer/util/prebuild/create_string_rc.py index e9a7748..27574b6 100755 --- a/chrome/installer/util/prebuild/create_string_rc.py +++ b/chrome/installer/util/prebuild/create_string_rc.py @@ -67,6 +67,7 @@ kStringIds = [ 'IDS_INSTALL_DIR_IN_USE', 'IDS_INSTALL_NON_MULTI_INSTALLATION_EXISTS', 'IDS_INSTALL_MULTI_INSTALLATION_EXISTS', + 'IDS_INSTALL_CONFLICTING_CHANNEL_EXISTS', 'IDS_OEM_MAIN_SHORTCUT_NAME', 'IDS_SHORTCUT_TOOLTIP', ] |