[MERGE]

bzr revid: apa@tinyerp.com-20120417112722-7rz5vvcg6eo0jf3e
bzr revid: apa@tinyerp.com-20120419051214-j4wvjp9kz1w0zqs7
bzr revid: apa@tinyerp.com-20120423053400-unc6y6lonksopys3
bzr revid: apa@tinyerp.com-20120424092925-ezqfnppvfgocj94t

diff --cc addons/account/i18n/ja.po
index 781f574,9f07bab..037e90d
--- 1/addons/account/i18n/ja.po
--- 2/addons/account/i18n/ja.po
+++ b/addons/account/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-04-17 04:15+0000\n"
 -"PO-Revision-Date: 2012-04-25 04:45+0000\n"
++"PO-Revision-Date: 2012-04-24 03:35+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-04-17 04:51+0000\n"
- "X-Generator: Launchpad (build 15099)\n"
 -"X-Launchpad-Export-Date: 2012-04-25 04:46+0000\n"
 -"X-Generator: Launchpad (build 15139)\n"
++"X-Launchpad-Export-Date: 2012-04-24 04:53+0000\n"
++"X-Generator: Launchpad (build 15135)\n"
  
  #. module: account
  #: view:account.invoice.report:0
@@@ -1229,7 -1248,7 +1248,7 @@@ msgstr "ã\81\93ã\81®ä»\95訳帳ã\81«ã\81¯ã\81\93ã\81®ä¸\80è
  #. module: account
  #: field:account.move.line.reconcile,trans_nbr:0
  msgid "# of Transaction"
- msgstr ""
 -msgstr "取引数"
++msgstr "取引番号"
  
  #. module: account
  #: report:account.general.ledger:0
@@@ -1436,7 -1455,7 +1455,7 @@@ msgstr "エントリー作成
  #. module: account
  #: field:account.entries.report,nbr:0
  msgid "# of Items"
- msgstr ""
 -msgstr "項目数"
++msgstr "項目番号"
  
  #. module: account
  #: field:account.automatic.reconcile,max_amount:0
@@@ -1477,7 -1498,7 +1498,7 @@@ msgstr "
  #. module: account
  #: view:account.entries.report:0
  msgid "# of Entries "
- msgstr ""
 -msgstr "エントリー数 "
++msgstr "エントリー番号 "
  
  #. module: account
  #: help:account.fiscal.position,active:0
@@@ -3229,7 -3285,7 +3285,7 @@@ msgstr "消費税：
  #. module: account
  #: constraint:account.invoice:0
  msgid "Invalid BBA Structured Communication !"
- msgstr ""
 -msgstr "無効なBBA（ブロードバンドアクセス）構造の通信"
++msgstr "無効なBBA構造のコミュニケーション"
  
  #. module: account
  #: help:account.analytic.line,amount_currency:0
@@@ -5460,7 -5544,7 +5540,7 @@@ msgstr "
  #. module: account
  #: help:account.tax,type:0
  msgid "The computation method for the tax amount."
- msgstr ""
 -msgstr "税額の計算方法"
++msgstr "税額のための計算方法"
  
  #. module: account
  #: view:account.payment.term.line:0

diff --cc addons/project/project_view.xml
Simple merge

diff --cc addons/project_issue/project_issue_view.xml
Simple merge