merged

bzr revid: hda@tinyerp.com-20100111071312-0a3c69af3s4kpj6x

diff --cc bin/addons/base/i18n/uk.po
index d61a025,e94db3c..a75f9cd
--- 1/bin/addons/base/i18n/uk.po
--- 2/bin/addons/base/i18n/uk.po
+++ b/bin/addons/base/i18n/uk.po
@@@ -7,13 -7,13 +7,13 @@@ msgstr "
  "Project-Id-Version: OpenERP Server 5.0.0\n"
  "Report-Msgid-Bugs-To: support@openerp.com\n"
  "POT-Creation-Date: 2009-12-18 08:39+0000\n"
- "PO-Revision-Date: 2010-01-05 06:38+0000\n"
 -"PO-Revision-Date: 2010-01-11 06:03+0000\n"
++"PO-Revision-Date: 2010-01-08 15:21+0000\n"
  "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
  "Language-Team: \n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
- "X-Launchpad-Export-Date: 2010-01-06 04:36+0000\n"
 -"X-Launchpad-Export-Date: 2010-01-12 04:46+0000\n"
++"X-Launchpad-Export-Date: 2010-01-09 07:48+0000\n"
  "X-Generator: Launchpad (build Unknown)\n"
  
  #. module: base

diff --cc bin/addons/base/i18n/zh_CN.po
index 86f271f,56f88a3..73e0e1f
--- 1/bin/addons/base/i18n/zh_CN.po
--- 2/bin/addons/base/i18n/zh_CN.po
+++ b/bin/addons/base/i18n/zh_CN.po
@@@ -7,13 -7,13 +7,13 @@@ msgstr "
  "Project-Id-Version: OpenERP Server 5.0.4\n"
  "Report-Msgid-Bugs-To: support@openerp.com\n"
  "POT-Creation-Date: 2009-12-18 08:39+0000\n"
- "PO-Revision-Date: 2009-12-27 06:10+0000\n"
 -"PO-Revision-Date: 2010-01-10 09:34+0000\n"
++"PO-Revision-Date: 2010-01-08 17:14+0000\n"
  "Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\n"
  "Language-Team: \n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
- "X-Launchpad-Export-Date: 2009-12-29 04:35+0000\n"
 -"X-Launchpad-Export-Date: 2010-01-11 04:55+0000\n"
++"X-Launchpad-Export-Date: 2010-01-09 07:48+0000\n"
  "X-Generator: Launchpad (build Unknown)\n"
  
  #. module: base

diff --cc bin/service/web_services.py
index acfe1bf,acfe1bf..85b7056
--- 1/bin/service/web_services.py
--- 2/bin/service/web_services.py
+++ b/bin/service/web_services.py
@@@ -93,7 -93,7 +93,7 @@@ class db(netsvc.ExportService)
                      serv.actions[id]['progress'] = 0
                      clean = False
                      cr = sql_db.db_connect(db_name).cursor()
--                    tools.init_db(cr)
++#                    tools.init_db(cr)
                      cr.commit()
                      cr.close()
                      cr = None