c2c-oerpscenario team mailing list archive

[Nicola Riolini - Micronaet <702273@xxxxxxxxxxxxxxxxxx>]

I search in it.po of base module, I've got this:

#. module: base
<<<<<<< TREE
#: code:addons/base/module/module.py:0
=======
#: code:addons/orm.py:1993
#: code:addons/orm.py:3653
#, python-format
msgid "created."
msgstr "creato."

#. module: base
#: model:res.partner.category,name:base.res_partner_category_woodsuppliers0
msgid "Wood Suppliers"
msgstr "Fornitori di legno"

#. module: base
#: code:addons/base/module/module.py:303
>>>>>>> MERGE-SOURCE
#, python-format

-- 
You received this bug notification because you are a member of C2C
OERPScenario, which is subscribed to the OpenERP Project Group.
https://bugs.launchpad.net/bugs/702273

Title:
  Problems updating italian translation

Status in OpenObject Addons Modules:
  New

Bug description:
  Hi, when I try to update italian translation in my OpenerP 6.0 RC2 on ubu 10.10 I've got this error:
  Thanks

  Traceback (most recent call last):
    File "/home/administrator/Launchpad/openerp/server/bin/netsvc.py", line 489, in dispatch
      result = ExportService.getService(service_name).dispatch(method, auth, params)
    File "/home/administrator/Launchpad/openerp/server/bin/service/web_services.py", line 598, in dispatch
      res = fn(db, uid, *params)
    File "/home/administrator/Launchpad/openerp/server/bin/osv/osv.py", line 122, in wrapper
      return f(self, dbname, *args, **kwargs)
    File "/home/administrator/Launchpad/openerp/server/bin/osv/osv.py", line 176, in execute
      res = self.execute_cr(cr, uid, obj, method, *args, **kw)
    File "/home/administrator/Launchpad/openerp/server/bin/osv/osv.py", line 167, in execute_cr
      return getattr(object, method)(cr, uid, *args, **kw)
    File "/home/administrator/Launchpad/openerp/server/bin/addons/base/module/wizard/base_language_install.py", line 51, in lang_install
      modobj.update_translations(cr, uid, mids, lang, context or {})
    File "/home/administrator/Launchpad/openerp/server/bin/addons/base/module/module.py", line 514, in update_translations
      tools.trans_load(cr.dbname, f, lang, verbose=False, context=context2)
    File "/home/administrator/Launchpad/openerp/server/bin/tools/translate.py", line 846, in trans_load
      r = trans_load_data(db_name, fileobj, fileformat, lang, verbose=verbose, context=context)
    File "/home/administrator/Launchpad/openerp/server/bin/tools/translate.py", line 927, in trans_load_data
      for row in reader:
    File "/home/administrator/Launchpad/openerp/server/bin/tools/translate.py", line 317, in next
      raise Exception("malformed file: bad line: %s" % line)
  Exception: malformed file: bad line: <<<<<<< TREE