Some new strings for setup.exe safeguard.

chrome/installer/util/prebuild/create_string_rc.py

 #!/usr/bin/python
 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """This script generates an rc file and header (setup_strings.{rc,h}) to be
 included in setup.exe. The rc file includes translations for strings pulled
 from generated_resource.grd and the localized .xtb files.
 
 The header file includes IDs for each string, but also has values to allow
@@ skipping 49 matching lines @@
   'IDS_INSTALL_OS_ERROR',
   'IDS_INSTALL_TEMP_DIR_FAILED',
   'IDS_INSTALL_UNCOMPRESSION_FAILED',
   'IDS_INSTALL_INVALID_ARCHIVE',
   'IDS_INSTALL_INSUFFICIENT_RIGHTS',
   'IDS_UNINSTALL_FAILED',
   'IDS_UNINSTALL_COMPLETE',
   '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',
 ]
 
 # The ID of the first resource string.
 kFirstResourceID = 1600
 
 class TranslationStruct:
   """A helper struct that holds information about a single translation."""
   def __init__(self, resource_id_str, language, translation):
@@ skipping 142 matching lines @@
   kFilebase = os.path.join(argv[1], 'installer_util_strings')
   WriteRCFile(translated_strings, kFilebase)
   WriteHeaderFile(translated_strings, kFilebase)
 
 if '__main__' == __name__:
   if len(sys.argv) < 2:
     print 'Usage:\n  %s <output_directory> [branding]' % sys.argv[0]
     sys.exit(1)
   # Use optparse to parse command line flags.
   main(sys.argv)