Fix branding in chromoting string resources

remoting/webapp/build-webapp.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Creates a directory with with the unpacked contents of the remoting webapp.
 
 The directory will contain a copy-of or a link-to to all remoting webapp
 resources.  This includes HTML/JS and any plugin binaries. The script also
 massages resulting files appropriately with host plugin data. Finally,
@@ skipping 93 matching lines @@
       # to create a symlink in that case.
       targetname = os.path.relpath(os.path.realpath(current_file),
                                    os.path.realpath(destination_file))
       os.symlink(targetname, destination_file)
     else:
       shutil.copy2(current_file, destination_file)
 
   # Copy all the locales, preserving directory structure
   destination_locales = os.path.join(destination, "_locales")
   os.mkdir(destination_locales , 0775)
-  chromium_locale_dir = "/_locales/"
-  chrome_locale_dir = "/_locales.official/"
+  locale_dir = "/_locales/"
   for current_locale in locales:
-    pos = current_locale.find(chromium_locale_dir)
-    locale_len = len(chromium_locale_dir)
+    pos = current_locale.find(locale_dir)
     if (pos == -1):
-      pos = current_locale.find(chrome_locale_dir)
-      locale_len = len(chrome_locale_dir)
-    if (pos == -1):
-      raise "Missing locales directory in " + current_locale
-    subtree = current_locale[pos+locale_len:]
+      raise Exception("Missing locales directory in " + current_locale)
+    subtree = current_locale[pos + len(locale_dir):]
     pos = subtree.find("/")
     if (pos == -1):
-      raise "Malformed locale: " + current_locale
+      raise Exception("Malformed locale: " + current_locale)
     locale_id = subtree[:pos]
     messages = subtree[pos+1:]
     destination_dir = os.path.join(destination_locales, locale_id)
     destination_file = os.path.join(destination_dir, messages)
     os.mkdir(destination_dir, 0775)
     shutil.copy2(current_locale, destination_file)
 
   # Create fake plugin files to appease the manifest checker.
   # It requires that if there is a plugin listed in the manifest that
   # there be a file in the plugin with that name.
@@ skipping 86 matching lines @@
     else:
       files.append(arg)
 
   buildWebApp(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4], sys.argv[5],
               sys.argv[6], files, locales)
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())