merge from trunk

bzr revid: fva@openerp.com-20120507134014-umdl4mqj2zpc6s6v

diff --cc addons/account_coda/i18n/ja.po
index 436cf1d,8b4b3d1..946b0f7
--- 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-03 00:17+0000\n"
 -"PO-Revision-Date: 2012-05-09 04:41+0000\n"
++"PO-Revision-Date: 2012-05-07 03:47+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-03 05:26+0000\n"
- "X-Generator: Launchpad (build 15185)\n"
 -"X-Launchpad-Export-Date: 2012-05-09 04:47+0000\n"
 -"X-Generator: Launchpad (build 15213)\n"
++"X-Launchpad-Export-Date: 2012-05-07 04:37+0000\n"
++"X-Generator: Launchpad (build 15195)\n"
  
  #. module: account_coda
  #: model:account.coda.trans.code,description:account_coda.actcc_09_21
@@@ -386,12 -388,12 +388,12 @@@ msgstr "取引コード
  #. module: account_coda
  #: model:account.coda.trans.code,description:account_coda.actcc_47_13
  msgid "Discount foreign supplier's bills"
- msgstr ""
 -msgstr "外国仕入先請求の割引"
++msgstr "外国仕入先請求書の割引"
  
  #. module: account_coda
  #: model:account.coda.trans.code,description:account_coda.actcf_05
  msgid "Direct debit"
- msgstr ""
 -msgstr "口座引落"
++msgstr "口座引き落とし"
  
  #. module: account_coda
  #: model:account.coda.trans.code,comment:account_coda.actcc_47_11
@@@ -560,7 -568,7 +568,7 @@@ msgstr "ユーロに相当額
  #. module: account_coda
  #: model:account.coda.trans.code,description:account_coda.actcc_47_50
  msgid "Remittance of foreign bill credit after collection"
- msgstr ""
 -msgstr "集金後外国請求クレジットの送金"
++msgstr "訂正後害外請求クレジットの送金"
  
  #. module: account_coda
  #: model:account.coda.trans.code,description:account_coda.actcc_03_03
@@@ -620,7 -633,7 +633,7 @@@ msgstr "クレジット手数料
  #. module: account_coda
  #: model:account.coda.trans.code,description:account_coda.actcc_43_58
  msgid "Remittance of foreign cheque credit after collection"
- msgstr ""
 -msgstr "集金後外国小切手クレジットの送金"
++msgstr "訂正後外国小切手クレジットの送金"
  
  #. module: account_coda
  #: model:account.coda.trans.type,description:account_coda.actt_8
@@@ -689,7 -702,7 +702,7 @@@ msgstr "å¤\96å\9b½å°\8få\88\87æ\89\8bã\81®æ\94¯æ\89\95ã\81«é\96¢é
  #. module: account_coda
  #: field:account.coda.trans.code,parent_id:0
  msgid "Family"
- msgstr ""
 -msgstr "ファミリ"
++msgstr "家族"
  
  #. module: account_coda
  #: model:account.coda.trans.code,description:account_coda.actcc_11_66
@@@ -839,7 -858,7 +858,7 @@@ msgstr "æµ·å¤\96証æ\9b¸ã\81«ã\82\88ã\82\8bé\80\81é\87\91 - é
  #. module: account_coda
  #: model:account.coda.trans.code,description:account_coda.actcc_04_52
  msgid "Loading GSM cards"
- msgstr ""
 -msgstr "GSMカードの装填"
++msgstr "GSMカードを入れる"
  
  #. module: account_coda
  #: view:coda.bank.statement:0