summaryrefslogtreecommitdiffstats
path: root/chrome/installer
diff options
context:
space:
mode:
authorgrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-19 05:06:00 +0000
committergrt@chromium.org <grt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-19 05:06:00 +0000
commit1e6b3cd2dff4749f912e720d4e985b740ac7a75d (patch)
treeae9511bf5829619de45707a3c1cb2f48609205c8 /chrome/installer
parent694fbeec4cd2731d83e2cf1c48777c2237f44b4d (diff)
downloadchromium_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/installer')
-rwxr-xr-xchrome/installer/util/prebuild/create_string_rc.py1
1 files changed, 1 insertions, 0 deletions
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',
]