diff options
| author | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-24 16:06:54 +0000 |
|---|---|---|
| committer | grt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-24 16:06:54 +0000 |
| commit | dfa56f66fde2be048247a3c992dc579db409d5f2 (patch) | |
| tree | 0ae2da6594db29e0ded61846fa1b02da1e912a78 | |
| parent | c2baa193a118c7318c20696d9001b4c3b3b21ae9 (diff) | |
| download | chromium_src-dfa56f66fde2be048247a3c992dc579db409d5f2.zip chromium_src-dfa56f66fde2be048247a3c992dc579db409d5f2.tar.gz chromium_src-dfa56f66fde2be048247a3c992dc579db409d5f2.tar.bz2 | |
A new string for setup.exe safeguards.
BUG=61609
TEST=none
Review URL: http://codereview.chromium.org/6260017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72334 0039d316-1c4b-4281-b951-d872f2087c98
| -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 40ab7db..3e5cca0 100644 --- a/chrome/app/chromium_strings.grd +++ b/chrome/app/chromium_strings.grd @@ -415,6 +415,9 @@ be available for now. --> <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> + <message name="IDS_INSTALL_READY_MODE_REQUIRES_CHROME" desc="Chrome Frame in ready mode requires Chrome."> + Invalid arguments. Chromium Frame cannot be installed in ready mode without also installing Chromium. + </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 a328315..9458524 100644 --- a/chrome/app/google_chrome_strings.grd +++ b/chrome/app/google_chrome_strings.grd @@ -443,6 +443,9 @@ Chrome supports. --> <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> + <message name="IDS_INSTALL_READY_MODE_REQUIRES_CHROME" desc="Chrome Frame in ready mode requires Chrome."> + Invalid arguments. Google Chrome Frame cannot be installed in ready mode without also installing Google Chrome. + </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 27574b6..cf081e1 100755 --- a/chrome/installer/util/prebuild/create_string_rc.py +++ b/chrome/installer/util/prebuild/create_string_rc.py @@ -68,6 +68,7 @@ kStringIds = [ 'IDS_INSTALL_NON_MULTI_INSTALLATION_EXISTS', 'IDS_INSTALL_MULTI_INSTALLATION_EXISTS', 'IDS_INSTALL_CONFLICTING_CHANNEL_EXISTS', + 'IDS_INSTALL_READY_MODE_REQUIRES_CHROME', 'IDS_OEM_MAIN_SHORTCUT_NAME', 'IDS_SHORTCUT_TOOLTIP', ] |