[MERGE] translations: import using lower-level sql (translations load about 6 times...

bzr revid: rco@openerp.com-20111223104824-fup1cjbjni1fsty1

diff --cc openerp/addons/base/base.sql
Simple merge

diff --cc openerp/addons/base/ir/ir_translation.py
index 121de57,27274df..c34e5ad
--- 1/openerp/addons/base/ir/ir_translation.py
--- 2/openerp/addons/base/ir/ir_translation.py
+++ b/openerp/addons/base/ir/ir_translation.py
@@@ -203,6 -317,13 +317,11 @@@ class ir_translation(osv.osv)
          result = super(ir_translation, self).unlink(cursor, user, ids, context=context)
          return result
  
+     def _get_import_cursor(self, cr, uid, context=None):
+         """ Return a cursor-like object for fast inserting translations
+         """
 -        if context is None:
 -            context = {}
+         return ir_translation_import_cursor(cr, uid, self, context=context)
+ 
  ir_translation()
  
  # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --cc openerp/addons/base/module/module.py
index 2d11d50,91c4c65..ac3f240
--- 1/openerp/addons/base/module/module.py
--- 2/openerp/addons/base/module/module.py
+++ b/openerp/addons/base/module/module.py
@@@ -592,7 -554,7 +592,6 @@@ class module(osv.osv)
                      tools.trans_load(cr, f, lang, verbose=False, context=context2)
                  elif iso_lang != 'en':
                      logger.warning('module %s: no translation for language %s', mod.name, iso_lang)
-         tools.trans_update_res_ids(cr)
 -        # tools.trans_update_res_ids(cr)
  
      def check(self, cr, uid, ids, context=None):
          logger = logging.getLogger('init')