[MERGE] from trunk

bzr revid: rco@openerp.com-20121219130953-tq0e2mzw145j1ewx

5 files changed, 63 insertions, 54 deletions

diff --git a/addons/plugin_thunderbird/i18n/de.po b/addons/plugin_thunderbird/i18n/de.po
index 2181c74d3e2..3c962a9b11e 100644
--- a/addons/plugin_thunderbird/i18n/de.po
+++ b/addons/plugin_thunderbird/i18n/de.po
@@ -9,29 +9,29 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2012-02-09 15:38+0000\n"
+"PO-Revision-Date: 2012-12-18 08:04+0000\n"
 "Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
 "Language-Team: German <de@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-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-19 05:17+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Restart Thunderbird."
-msgstr ""
+msgstr "Thunderbird neu starten"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Thunderbird plug-in installation:"
-msgstr ""
+msgstr "Thunderbird Plug-In installation:"
 
 #. module: plugin_thunderbird
 #: view:sale.config.settings:0
 msgid "Download and install the plug-in"
-msgstr ""
+msgstr "Herunterladen und Installieren des Plug-Ins"
 
 #. module: plugin_thunderbird
 #: model:ir.actions.act_window,name:plugin_thunderbird.action_thunderbird_installer
@@ -45,6 +45,7 @@ msgstr "Installiere Thunderbird Plug-In"
 msgid ""
 "Thunderbird plug-in file. Save this file and install it in Thunderbird."
 msgstr ""
+"Thunderbird Plug-In Datei. Bitte sichern und in Thunderbird installieren."
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
@@ -64,7 +65,7 @@ msgstr "Dateiname"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Click \"Install Now\"."
-msgstr ""
+msgstr "Klick \"Jetzt Installieren\""
 
 #. module: plugin_thunderbird
 #: model:ir.model,name:plugin_thunderbird.model_plugin_thunderbird_installer
@@ -80,7 +81,7 @@ msgstr "Thunderbird Plug-in"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Configure your openerp server."
-msgstr ""
+msgstr "Konfiguration Ihrese OpenERP Servers"
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,thunderbird:0
@@ -94,17 +95,17 @@ msgstr ""
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Save the Thunderbird plug-in."
-msgstr ""
+msgstr "Thunderbird Plug-In sichern"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Close"
-msgstr ""
+msgstr "Schließen"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Select the plug-in (the file named openerp_plugin.xpi)."
-msgstr ""
+msgstr "Plug-In auswählen (Dateiname ist  openerp_plugin.xpi)"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
@@ -112,11 +113,13 @@ msgid ""
 "From the Thunderbird menubar: Tools ­> Add-ons -> Screwdriver/Wrench Icon -> "
 "Install add-on from file..."
 msgstr ""
+"Vom Thunderbird Menü: Werkzeuge ­> Add-Ons -> Bearbeiten Ikon -> Installiere "
+"Add-On von Datei"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "From the Thunderbird menubar: OpenERP -> Configuration."
-msgstr ""
+msgstr "Vom Thunderbird Menü: OpenERP -> Konfiguration"
 
 #~ msgid "Description"
 #~ msgstr "Beschreibung"
diff --git a/addons/plugin_thunderbird/i18n/es.po b/addons/plugin_thunderbird/i18n/es.po
index ac0df5f7b50..37454bd0435 100644
--- a/addons/plugin_thunderbird/i18n/es.po
+++ b/addons/plugin_thunderbird/i18n/es.po
@@ -8,29 +8,29 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2011-12-26 19:12+0000\n"
-"Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@gmail.com>\n"
+"PO-Revision-Date: 2012-12-12 15:21+0000\n"
+"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.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: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-13 04:44+0000\n"
+"X-Generator: Launchpad (build 16361)\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Restart Thunderbird."
-msgstr ""
+msgstr "Reiniciar Thunderbird."
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Thunderbird plug-in installation:"
-msgstr ""
+msgstr "Instalación del conector de Thunderbird"
 
 #. module: plugin_thunderbird
 #: view:sale.config.settings:0
 msgid "Download and install the plug-in"
-msgstr ""
+msgstr "Descargar e instalar el conector"
 
 #. module: plugin_thunderbird
 #: model:ir.actions.act_window,name:plugin_thunderbird.action_thunderbird_installer
@@ -44,6 +44,8 @@ msgstr "Instalar plug-in de Thunderbird"
 msgid ""
 "Thunderbird plug-in file. Save this file and install it in Thunderbird."
 msgstr ""
+"Archivo del conector de Thunderbird. Guarde este archivo e instálelo en "
+"Thunderbird."
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
@@ -63,7 +65,7 @@ msgstr "Nombre fichero"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Click \"Install Now\"."
-msgstr ""
+msgstr "Pulse \"Instalar ahora\"."
 
 #. module: plugin_thunderbird
 #: model:ir.model,name:plugin_thunderbird.model_plugin_thunderbird_installer
@@ -79,7 +81,7 @@ msgstr "Conector Thunderbird"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Configure your openerp server."
-msgstr ""
+msgstr "Configure su servidor OpenERP"
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,thunderbird:0
@@ -93,17 +95,17 @@ msgstr ""
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Save the Thunderbird plug-in."
-msgstr ""
+msgstr "Guardar el conector de Thunderbird."
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Close"
-msgstr ""
+msgstr "Cerrar"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Select the plug-in (the file named openerp_plugin.xpi)."
-msgstr ""
+msgstr "Seleccione el conector (el archivo llamado openerp_plugin.xpi)."
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
@@ -111,11 +113,13 @@ msgid ""
 "From the Thunderbird menubar: Tools ­> Add-ons -> Screwdriver/Wrench Icon -> "
 "Install add-on from file..."
 msgstr ""
+"Desde la barra de menús de Thunderbird: Herramientas -> Complementos -> "
+"Icono destornillador/llave -> Instalar complemento desde archivo..."
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "From the Thunderbird menubar: OpenERP -> Configuration."
-msgstr ""
+msgstr "Desde el menú de Thunderbird: OpenERP -> Configuración."
 
 #~ msgid "Description"
 #~ msgstr "Descripción"
diff --git a/addons/plugin_thunderbird/i18n/hr.po b/addons/plugin_thunderbird/i18n/hr.po
index f3f79c293de..5549dd01efc 100644
--- a/addons/plugin_thunderbird/i18n/hr.po
+++ b/addons/plugin_thunderbird/i18n/hr.po
@@ -8,37 +8,37 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2011-12-08 15:55+0000\n"
-"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
+"PO-Revision-Date: 2012-12-17 20:59+0000\n"
+"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
 "Language-Team: Vinteh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:01+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
 "Language: hr\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Restart Thunderbird."
-msgstr ""
+msgstr "Ponovo pokreni Thunderbird."
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Thunderbird plug-in installation:"
-msgstr ""
+msgstr "Thunderbird plug-in instalacija:"
 
 #. module: plugin_thunderbird
 #: view:sale.config.settings:0
 msgid "Download and install the plug-in"
-msgstr ""
+msgstr "Preuzmi i instaliraj plug-in"
 
 #. 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 ""
+msgstr "Instaliraj Thunderbird Plug-In"
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,plugin_file:0
@@ -64,7 +64,7 @@ msgstr "Naziv datoteke"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Click \"Install Now\"."
-msgstr ""
+msgstr "Kliknite \"Install Now\"."
 
 #. module: plugin_thunderbird
 #: model:ir.model,name:plugin_thunderbird.model_plugin_thunderbird_installer
@@ -94,12 +94,12 @@ msgstr ""
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Save the Thunderbird plug-in."
-msgstr ""
+msgstr "Snimi Thunderbird plug-in."
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Close"
-msgstr ""
+msgstr "Zatvori"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
diff --git a/addons/plugin_thunderbird/i18n/it.po b/addons/plugin_thunderbird/i18n/it.po
index c54ca6de0ec..5735eaf0fdc 100644
--- a/addons/plugin_thunderbird/i18n/it.po
+++ b/addons/plugin_thunderbird/i18n/it.po
@@ -8,42 +8,43 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2011-12-26 19:12+0000\n"
-"Last-Translator: tfr (Openerp) <Unknown>\n"
+"PO-Revision-Date: 2012-12-09 23:19+0000\n"
+"Last-Translator: Sergio Corato <Unknown>\n"
 "Language-Team: Italian <it@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-11-25 06:18+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-11 04:49+0000\n"
+"X-Generator: Launchpad (build 16356)\n"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Restart Thunderbird."
-msgstr ""
+msgstr "Riavvia Thunderbird."
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Thunderbird plug-in installation:"
-msgstr ""
+msgstr "Installazione plug-in Thunderbird:"
 
 #. module: plugin_thunderbird
 #: view:sale.config.settings:0
 msgid "Download and install the plug-in"
-msgstr ""
+msgstr "Scarica e installa il plug-in"
 
 #. 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 ""
+msgstr "Installa il plug-in Thunderbird"
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,plugin_file:0
 msgid ""
 "Thunderbird plug-in file. Save this file and install it in Thunderbird."
 msgstr ""
+"File del plug-in Thunderbird. Salvare il file e installarlo in Thunderbird."
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
@@ -63,12 +64,12 @@ msgstr "Nome file"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Click \"Install Now\"."
-msgstr ""
+msgstr "Clicca \"Installa adesso\"."
 
 #. module: plugin_thunderbird
 #: model:ir.model,name:plugin_thunderbird.model_plugin_thunderbird_installer
 msgid "plugin_thunderbird.installer"
-msgstr ""
+msgstr "plugin_thunderbird.installer"
 
 #. module: plugin_thunderbird
 #: field:plugin_thunderbird.installer,plugin_file:0
@@ -79,7 +80,7 @@ msgstr "Plug-in Thunderbird"
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Configure your openerp server."
-msgstr ""
+msgstr "Configurare il server openerp."
 
 #. module: plugin_thunderbird
 #: help:plugin_thunderbird.installer,thunderbird:0
@@ -88,22 +89,22 @@ msgid ""
 "its attachments."
 msgstr ""
 "Permette di selezionare un oggetto che è possibile aggiungere all'email e ai "
-"suoi attachment."
+"suoi allegati."
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Save the Thunderbird plug-in."
-msgstr ""
+msgstr "Salvare il plug-in Thunderbird."
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Close"
-msgstr ""
+msgstr "Chiudi"
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "Select the plug-in (the file named openerp_plugin.xpi)."
-msgstr ""
+msgstr "Selezionare il plug-in (il file si chiama openerp_plugin.xpi)."
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
@@ -111,11 +112,13 @@ msgid ""
 "From the Thunderbird menubar: Tools ­> Add-ons -> Screwdriver/Wrench Icon -> "
 "Install add-on from file..."
 msgstr ""
+"Dalla barra del menu di Thunderbird: Strumenti > Componenti aggiuntivi -> "
+"Icona Cacciavite/Chiave -> Installa l'addon da file..."
 
 #. module: plugin_thunderbird
 #: view:plugin_thunderbird.installer:0
 msgid "From the Thunderbird menubar: OpenERP -> Configuration."
-msgstr ""
+msgstr "Dalla barra del menu di Thunderbird: OpenERP -> Configurazione."
 
 #~ msgid "Description"
 #~ msgstr "Descrizione"
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.py b/addons/plugin_thunderbird/plugin_thunderbird.py
index 923611b97a9..71d2aab1022 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.py
+++ b/addons/plugin_thunderbird/plugin_thunderbird.py
@@ -19,8 +19,7 @@
 #
 ##############################################################################
 
-from osv import fields
-from osv import osv
+from openerp.osv import fields, osv
 
 class plugin_thunderbird_installer(osv.osv_memory):
     _name = 'plugin_thunderbird.installer'