Merged with latest

bzr revid: tta@openerp.com-20120508100345-6rw7tn9mrr77prk4

diff --cc addons/account_coda/i18n/ja.po
index 946b0f7,8b4b3d1..45e68ff
--- 1/addons/account_coda/i18n/ja.po
--- 2/addons/account_coda/i18n/ja.po
+++ b/addons/account_coda/i18n/ja.po
@@@ -8,14 -8,14 +8,14 @@@ msgstr "
  "Project-Id-Version: openobject-addons\n"
  "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
  "POT-Creation-Date: 2012-02-08 00:35+0000\n"
- "PO-Revision-Date: 2012-05-07 03:47+0000\n"
 -"PO-Revision-Date: 2012-05-09 04:41+0000\n"
++"PO-Revision-Date: 2012-05-07 23:42+0000\n"
  "Last-Translator: Akira Hiyama <Unknown>\n"
  "Language-Team: Japanese <ja@li.org>\n"
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
- "X-Launchpad-Export-Date: 2012-05-07 04:37+0000\n"
- "X-Generator: Launchpad (build 15195)\n"
 -"X-Launchpad-Export-Date: 2012-05-09 04:47+0000\n"
 -"X-Generator: Launchpad (build 15213)\n"
++"X-Launchpad-Export-Date: 2012-05-08 04:49+0000\n"
++"X-Generator: Launchpad (build 15204)\n"
  
  #. module: account_coda
  #: model:account.coda.trans.code,description:account_coda.actcc_09_21