Noissue - Allow imported translations to be overridden

packagerChrome.py

 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import ConfigParser
 import errno
 import glob
 import io
 import json
 import os
@@ skipping 236 matching lines @@
                     sourceData = json.load(handle)
 
                 # Resolve wildcard imports
                 if keys == '*':
                     importList = sourceData.keys()
                     importList = filter(lambda k: not k.startswith('_'), importList)
                     keys = ' '.join(importList)
 
                 for stringID in keys.split():
                     if stringID in sourceData:
-                        if stringID in data:
-                            print ('Warning: locale string {} defined multiple'
-                                   ' times').format(stringID)
-
-                        data[stringID] = sourceData[stringID]
+                        data.setdefault(stringID, sourceData[stringID])
             except Exception as e:
                 print 'Warning: error importing locale data from %s: %s' % (sourceFile, e)
 
             files[targetFile] = toJson(data)
 
 
 def truncate(text, length_limit):
     if len(text) <= length_limit:
         return text
     return text[:length_limit - 1].rstrip() + u'\u2026'
@@ skipping 132 matching lines @@
     if devenv:
         add_devenv_requirements(files, metadata, params)
 
     zipdata = files.zipToString()
     signature = None
     pubkey = None
     if keyFile != None:
         signature = signBinary(zipdata, keyFile)
         pubkey = getPublicKey(keyFile)
     writePackage(outFile, pubkey, signature, zipdata)