From 757e94e6d2ebee7bf4fcbdd87e2f2ff19d0b568f Mon Sep 17 00:00:00 2001
From: "grt@chromium.org"
 <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 5 Jan 2011 14:06:58 +0000
Subject: Add a new pair of installer result strings for multi-installer
 safeguards.

BUG=61609
TEST=none

Review URL: http://codereview.chromium.org/5984009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70507 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/app/chromium_strings.grd      | 6 ++++++
 chrome/app/google_chrome_strings.grd | 6 ++++++
 2 files changed, 12 insertions(+)

(limited to 'chrome/app')

diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
index 5be20ce..3e92d34 100644
--- a/chrome/app/chromium_strings.grd
+++ b/chrome/app/chromium_strings.grd
@@ -403,6 +403,12 @@ be available for now. -->
       <message name="IDS_INSTALL_DIR_IN_USE" desc="Error during install if Chromium version is missing from registry but the installation directory exists and can not be deleted.">
         Chromium installation directory seems to be in use. Please reboot your computer and try again.
       </message>
+      <message name="IDS_INSTALL_NON_MULTI_INSTALLATION_EXISTS" desc="Error during install if a single-install Chromium or Chromium Frame is present, thereby preventing the installation of a multi-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_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>
       <!-- 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 6aee81c..f4368ba 100644
--- a/chrome/app/google_chrome_strings.grd
+++ b/chrome/app/google_chrome_strings.grd
@@ -449,6 +449,12 @@ Chrome supports. -->
       <message name="IDS_INSTALL_DIR_IN_USE" desc="Error during install if Google Chrome version is missing from registry but the installation directory exists and can not be deleted.">
         Google Chrome installation directory seems to be in use. Please reboot your computer and try again.
       </message>
+      <message name="IDS_INSTALL_NON_MULTI_INSTALLATION_EXISTS" desc="Error during install if a single-install Google Chrome or Google Chrome Frame is present, thereby preventing the installation of a multi-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_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>
       <!-- 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.">
-- 
cgit v1.1