[MERGE]

bzr revid: uco@tinyerp.com-20101230060753-wujam7otb5f13f0z

7 files changed, 21 insertions, 4 deletions

diff --git a/addons/thunderbird/i18n/es.po b/addons/thunderbird/i18n/es.po
index 288f3ceae71..b09250c2f62 100644
--- a/addons/thunderbird/i18n/es.po
+++ b/addons/thunderbird/i18n/es.po
@@ -8,13 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-12-21 19:45+0000\n"
-"PO-Revision-Date: 2010-12-20 05:49+0000\n"
-"Last-Translator: Raimon Esteve (Zikzakmedia) <resteve@zikzakmedia.com>\n"
+"PO-Revision-Date: 2010-12-28 09:16+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@zikzakmedia.com>\n"
 "Language-Team: Spanish <es@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: 2010-12-24 05:51+0000\n"
+"X-Launchpad-Export-Date: 2010-12-29 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: thunderbird
@@ -87,6 +88,22 @@ msgid ""
 "\n"
 "      "
 msgstr ""
+"\n"
+"      Este módulo es necesario para que el conector (plug-in) de "
+"Thunderbird\n"
+"      funcione correctamente.\n"
+"      El conector permite guardar un correo y sus adjuntos en los objetos "
+"OpenERP\n"
+"      seleccionados. Puede seleccionar una empresa, una tarea, un proyecto, "
+"una cuenta\n"
+"      analítica, o cualquier otro objeto, y adjuntar el correo seleccionado "
+"como un fichero .eml\n"
+"      en los adjuntos del registro seleccionado. Puede crear documentos "
+"desde iniciativas CRM,\n"
+"      aplicación RRHH y incidencias de proyectos desde los correos "
+"seleccionados.\n"
+"\n"
+"      "
 
 #. module: thunderbird
 #: model:ir.ui.menu,name:thunderbird.menu_base_config_plugins_thunderbird
@@ -144,7 +161,7 @@ msgstr "Configuración conector Thunderbird"
 #. module: thunderbird
 #: model:ir.model,name:thunderbird.model_thunderbird_partner
 msgid "Thunderbid Plugin Tools"
-msgstr ""
+msgstr "Herramientas conector de Thunderbird"
 
 #. module: thunderbird
 #: view:thunderbird.installer:0
diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome.manifest b/addons/thunderbird/plugin/openerp_plugin/chrome.manifest
index 5fa9c2f5754..5fa9c2f5754 100755..100644
--- a/addons/thunderbird/plugin/openerp_plugin/chrome.manifest
+++ b/addons/thunderbird/plugin/openerp_plugin/chrome.manifest
diff --git a/addons/thunderbird/plugin/openerp_plugin/components/nsXmlRpcClient.js b/addons/thunderbird/plugin/openerp_plugin/components/nsXmlRpcClient.js
index 40347a9993d..40347a9993d 100755..100644
--- a/addons/thunderbird/plugin/openerp_plugin/components/nsXmlRpcClient.js
+++ b/addons/thunderbird/plugin/openerp_plugin/components/nsXmlRpcClient.js
diff --git a/addons/thunderbird/plugin/openerp_plugin/components/xml-rpc.xpt b/addons/thunderbird/plugin/openerp_plugin/components/xml-rpc.xpt
index 8e59aa20c85..8e59aa20c85 100755..100644
--- a/addons/thunderbird/plugin/openerp_plugin/components/xml-rpc.xpt
+++ b/addons/thunderbird/plugin/openerp_plugin/components/xml-rpc.xpt
diff --git a/addons/thunderbird/plugin/openerp_plugin/install.js b/addons/thunderbird/plugin/openerp_plugin/install.js
index 50e4b301e32..50e4b301e32 100755..100644
--- a/addons/thunderbird/plugin/openerp_plugin/install.js
+++ b/addons/thunderbird/plugin/openerp_plugin/install.js
diff --git a/addons/thunderbird/plugin/openerp_plugin/install.rdf b/addons/thunderbird/plugin/openerp_plugin/install.rdf
index b46c10c433b..b46c10c433b 100755..100644
--- a/addons/thunderbird/plugin/openerp_plugin/install.rdf
+++ b/addons/thunderbird/plugin/openerp_plugin/install.rdf
diff --git a/addons/thunderbird/plugin/openerp_plugin/packaging.sh b/addons/thunderbird/plugin/openerp_plugin/packaging.sh
index 5c1f48a9050..5c1f48a9050 100755..100644
--- a/addons/thunderbird/plugin/openerp_plugin/packaging.sh
+++ b/addons/thunderbird/plugin/openerp_plugin/packaging.sh