[MERGE] merge with main addons

bzr revid: psi@tinyerp.com-20120606053652-i211xuzmdo1qkgqr

2 files changed, 106 insertions, 5 deletions

diff --git a/addons/plugin_thunderbird/i18n/fr.po b/addons/plugin_thunderbird/i18n/fr.po
index 74bef6f2bdf..d79a72481f0 100644
--- a/addons/plugin_thunderbird/i18n/fr.po
+++ b/addons/plugin_thunderbird/i18n/fr.po
@@ -8,14 +8,15 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-02-09 00:36+0000\n"
-"PO-Revision-Date: 2011-12-26 19:12+0000\n"
-"Last-Translator: tfr (Openerp) <Unknown>\n"
+"PO-Revision-Date: 2012-05-24 17:39+0000\n"
+"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) "
+"<maxime.chambreuil@savoirfairelinux.com>\n"
 "Language-Team: French <fr@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-02-10 04:49+0000\n"
-"X-Generator: Launchpad (build 14771)\n"
+"X-Launchpad-Export-Date: 2012-05-25 04:39+0000\n"
+"X-Generator: Launchpad (build 15288)\n"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,pdf_file:0
@@ -103,4 +104,4 @@ msgstr ""
 #: model:ir.ui.menu,name:plugin_thunderbird.menu_base_config_plugins_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Install Thunderbird Plug-In"
-msgstr ""
+msgstr "Installer l'extension Thunderbird"
diff --git a/addons/plugin_thunderbird/i18n/ja.po b/addons/plugin_thunderbird/i18n/ja.po
new file mode 100644
index 00000000000..b929d9c05e4
--- /dev/null
+++ b/addons/plugin_thunderbird/i18n/ja.po
@@ -0,0 +1,100 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-09 00:36+0000\n"
+"PO-Revision-Date: 2012-05-31 22:07+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-06-01 05:33+0000\n"
+"X-Generator: Launchpad (build 15342)\n"
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,pdf_file:0
+msgid "Installation Manual"
+msgstr "インストールマニュアル"
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,description:0
+msgid "Description"
+msgstr "説明"
+
+#. module: plugin_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid "title"
+msgstr "タイトル"
+
+#. module: plugin_thunderbird
+#: model:ir.model,name:plugin_thunderbird.model_plugin_thunderbird_installer
+msgid "plugin_thunderbird.installer"
+msgstr ""
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,config_logo:0
+msgid "Image"
+msgstr "画像"
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,plugin_file:0
+#: field:plugin_thunderbird.installer,thunderbird:0
+msgid "Thunderbird Plug-in"
+msgstr "Thunderbirdプラグイン"
+
+#. module: plugin_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid ""
+"This plug-in allows you to link your e-mail to OpenERP's documents. You can "
+"attach it to any existing one in OpenERP or create a new one."
+msgstr ""
+"このプラグインはあなたのEメールをOpenERPのドキュメントにリンクさせることができます。OpenERPの既存あるいは新しく作成したドキュメントを添付で"
+"きます。"
+
+#. module: plugin_thunderbird
+#: help:plugin_thunderbird.installer,thunderbird:0
+msgid ""
+"Allows you to select an object that you would like to add to your email and "
+"its attachments."
+msgstr "あなたがEメールに追加したい、添付したいオブジェクトを選択するのが許されます。"
+
+#. module: plugin_thunderbird
+#: help:plugin_thunderbird.installer,pdf_file:0
+msgid "The documentation file :- how to install Thunderbird Plug-in."
+msgstr "ドキュメントファイル：Thunderbirdプラグインのインストール方法"
+
+#. module: plugin_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid "_Close"
+msgstr "閉じる"
+
+#. module: plugin_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid "Installation and Configuration Steps"
+msgstr "インストールと設定の手順"
+
+#. module: plugin_thunderbird
+#: field:plugin_thunderbird.installer,name:0
+#: field:plugin_thunderbird.installer,pdf_name:0
+msgid "File name"
+msgstr "ファイル名"
+
+#. module: plugin_thunderbird
+#: help:plugin_thunderbird.installer,plugin_file:0
+msgid ""
+"Thunderbird plug-in file. Save as this file and install this plug-in in "
+"thunderbird."
+msgstr "Thunderbirdプラグインファイル。このファイルを保存し、Thunderbirdの中にこのプラグインをインストールして下さい。"
+
+#. module: plugin_thunderbird
+#: model:ir.actions.act_window,name:plugin_thunderbird.action_thunderbird_installer
+#: model:ir.ui.menu,name:plugin_thunderbird.menu_base_config_plugins_thunderbird
+#: view:plugin_thunderbird.installer:0
+msgid "Install Thunderbird Plug-In"
+msgstr "Thunderbirdプラグインのインストール"