Commit dfa56f66 authored by grt@chromium.org's avatar grt@chromium.org

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
parent c2baa193
......@@ -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.">
......
......@@ -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.">
......
......@@ -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',
]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment