[MERGE] Sync wirth trunk.

bzr revid: tde@openerp.com-20121218093241-y0id5g1r1k6yok42

5 files changed, 57 insertions, 55 deletions

diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index e8e24969f2a..3e7c1d1f846 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -21,10 +21,10 @@
 
 import simplejson
 import cgi
-import pooler
-import tools
-from osv import fields, osv
-from tools.translate import _
+from openerp import pooler
+from openerp import tools
+from openerp.osv import fields, osv
+from openerp.tools.translate import _
 from lxml import etree
 
 # Specify Your Terminology will move to 'partner' module
diff --git a/addons/base_setup/i18n/hr.po b/addons/base_setup/i18n/hr.po
index fb0f374e733..b6bbea31161 100644
--- a/addons/base_setup/i18n/hr.po
+++ b/addons/base_setup/i18n/hr.po
@@ -7,20 +7,20 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-01-28 20:51+0000\n"
+"PO-Revision-Date: 2012-12-17 20:31+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 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:00+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
 "Language: hr\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Emails Integration"
-msgstr ""
+msgstr "Integracija email-a"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -30,7 +30,7 @@ msgstr "Gost"
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Contacts"
-msgstr ""
+msgstr "Kontakti"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_config_settings
@@ -42,6 +42,8 @@ msgstr ""
 msgid ""
 "Use external authentication providers, sign in with google, facebook, ..."
 msgstr ""
+"Koristi vanjske davatelje usluga autentikacije, prijava s računom google, "
+"facebook, ..."
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -64,24 +66,24 @@ msgstr "Član"
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Portal access"
-msgstr ""
+msgstr "Pristup portalu"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Authentication"
-msgstr ""
+msgstr "Autentifikacija"
 
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Quotations and Sales Orders"
-msgstr ""
+msgstr "Ponude i prodajni nalozi"
 
 #. module: base_setup
 #: view:base.config.settings:0
 #: model:ir.actions.act_window,name:base_setup.action_general_configuration
 #: model:ir.ui.menu,name:base_setup.menu_general_configuration
 msgid "General Settings"
-msgstr ""
+msgstr "Opće postavke"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -91,12 +93,12 @@ msgstr "Donator"
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Email"
-msgstr ""
+msgstr "E-mail"
 
 #. module: base_setup
 #: field:sale.config.settings,module_crm:0
 msgid "CRM"
-msgstr ""
+msgstr "CRM"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -106,17 +108,17 @@ msgstr "Pacijent"
 #. module: base_setup
 #: field:base.config.settings,module_base_import:0
 msgid "Allow users to import data from CSV files"
-msgstr ""
+msgstr "Dozvoli uvoz podataka iz CSV datoteka"
 
 #. module: base_setup
 #: field:base.config.settings,module_multi_company:0
 msgid "Manage multiple companies"
-msgstr ""
+msgstr "Više organizacija (tvrtki)"
 
 #. module: base_setup
 #: help:base.config.settings,module_portal:0
 msgid "Give access your customers and suppliers to their documents."
-msgstr ""
+msgstr "Dozvoli kupcima i dobavljačima pristup relevantnim dokumentima."
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -126,12 +128,12 @@ msgstr ""
 #. module: base_setup
 #: field:sale.config.settings,module_web_linkedin:0
 msgid "Get contacts automatically from linkedIn"
-msgstr ""
+msgstr "Automatski uitaj kontakte iz LinkedIn-a"
 
 #. module: base_setup
 #: field:sale.config.settings,module_plugin_thunderbird:0
 msgid "Enable Thunderbird plug-in"
-msgstr ""
+msgstr "Omogući Thunderbird plug-in"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
@@ -141,22 +143,22 @@ msgstr ""
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Customer Features"
-msgstr ""
+msgstr "Značajke kupca"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Import / Export"
-msgstr ""
+msgstr "Uvoz / Izvoz"
 
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Sale Features"
-msgstr ""
+msgstr "Značajke prodaje"
 
 #. module: base_setup
 #: field:sale.config.settings,module_plugin_outlook:0
 msgid "Enable Outlook plug-in"
-msgstr ""
+msgstr "Omogući Outlook plug-in"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
@@ -225,7 +227,7 @@ msgstr "Klijent"
 #. module: base_setup
 #: help:base.config.settings,module_auth_anonymous:0
 msgid "Enable the public part of openerp, openerp becomes a public website."
-msgstr ""
+msgstr "Dozvoli javni dio OpenERP-a. Vaš OpenERP postaje javna web stranica."
 
 #. module: base_setup
 #: help:sale.config.settings,module_plugin_thunderbird:0
@@ -253,7 +255,7 @@ msgstr "Termin \"Kupac\""
 #: model:ir.actions.act_window,name:base_setup.action_sale_config
 #: view:sale.config.settings:0
 msgid "Configure Sales"
-msgstr ""
+msgstr "Postavke prodaje"
 
 #. module: base_setup
 #: help:sale.config.settings,module_plugin_outlook:0
@@ -270,22 +272,22 @@ msgstr ""
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Options"
-msgstr ""
+msgstr "Opcije"
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
 msgid "Activate the customer/supplier portal"
-msgstr ""
+msgstr "Activiraj portal kupcima/dobavljačima"
 
 #. module: base_setup
 #: field:base.config.settings,module_share:0
 msgid "Allow documents sharing"
-msgstr ""
+msgstr "Dozvoli dijeljenje dokumenata"
 
 #. module: base_setup
 #: field:base.config.settings,module_auth_anonymous:0
 msgid "Activate the public portal"
-msgstr ""
+msgstr "Aktiviraj javni portal"
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -295,7 +297,7 @@ msgstr ""
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Social Network Integration"
-msgstr ""
+msgstr "Integracija društvenih mreža"
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -307,7 +309,7 @@ msgstr "Odustani"
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Primjeni"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
@@ -318,12 +320,12 @@ msgstr "Termin"
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
 msgid "or"
-msgstr ""
+msgstr "ili"
 
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Configure your company data"
-msgstr ""
+msgstr "Upišite podatke o Vašoj organizaciji (tvrtci)"
 
 #~ msgid "Currency"
 #~ msgstr "Valuta"
diff --git a/addons/base_setup/i18n/pt.po b/addons/base_setup/i18n/pt.po
index e32b736de9e..a0139638ab2 100644
--- a/addons/base_setup/i18n/pt.po
+++ b/addons/base_setup/i18n/pt.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2011-11-07 12:42+0000\n"
-"Last-Translator: OpenERP Administrators <Unknown>\n"
+"PO-Revision-Date: 2012-12-17 14:06+0000\n"
+"Last-Translator: Rui Franco (multibase.pt) <Unknown>\n"
 "Language-Team: \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 05:52+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:00+0000\n"
+"X-Generator: Launchpad (build 16372)\n"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -29,12 +29,12 @@ msgstr "Convidado"
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Contacts"
-msgstr ""
+msgstr "Contactos"
 
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_base_config_settings
 msgid "base.config.settings"
-msgstr ""
+msgstr "base.config.settings"
 
 #. module: base_setup
 #: field:base.config.settings,module_auth_oauth:0
@@ -68,19 +68,19 @@ msgstr ""
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Authentication"
-msgstr ""
+msgstr "Autenticação"
 
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Quotations and Sales Orders"
-msgstr ""
+msgstr "Orçamentos e ordens de venda"
 
 #. module: base_setup
 #: view:base.config.settings:0
 #: model:ir.actions.act_window,name:base_setup.action_general_configuration
 #: model:ir.ui.menu,name:base_setup.menu_general_configuration
 msgid "General Settings"
-msgstr ""
+msgstr "Configurações Gerais"
 
 #. module: base_setup
 #: selection:base.setup.terminology,partner:0
@@ -105,12 +105,12 @@ msgstr "Paciente"
 #. module: base_setup
 #: field:base.config.settings,module_base_import:0
 msgid "Allow users to import data from CSV files"
-msgstr ""
+msgstr "Permitir importação de dados através de ficheiros CSV"
 
 #. module: base_setup
 #: field:base.config.settings,module_multi_company:0
 msgid "Manage multiple companies"
-msgstr ""
+msgstr "Gerir várias empresas"
 
 #. module: base_setup
 #: help:base.config.settings,module_portal:0
@@ -125,7 +125,7 @@ msgstr ""
 #. module: base_setup
 #: field:sale.config.settings,module_web_linkedin:0
 msgid "Get contacts automatically from linkedIn"
-msgstr ""
+msgstr "Conseguir os contactos automaticamente (através do linkedIn)"
 
 #. module: base_setup
 #: field:sale.config.settings,module_plugin_thunderbird:0
@@ -145,7 +145,7 @@ msgstr ""
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Import / Export"
-msgstr ""
+msgstr "Importar / Exportar"
 
 #. module: base_setup
 #: view:sale.config.settings:0
@@ -206,7 +206,7 @@ msgstr ""
 #. module: base_setup
 #: model:ir.model,name:base_setup.model_sale_config_settings
 msgid "sale.config.settings"
-msgstr ""
+msgstr "sale.config.settings"
 
 #. module: base_setup
 #: field:base.setup.terminology,partner:0
@@ -271,7 +271,7 @@ msgstr ""
 #. module: base_setup
 #: view:base.config.settings:0
 msgid "Options"
-msgstr ""
+msgstr "Opções"
 
 #. module: base_setup
 #: field:base.config.settings,module_portal:0
@@ -281,7 +281,7 @@ msgstr ""
 #. module: base_setup
 #: field:base.config.settings,module_share:0
 msgid "Allow documents sharing"
-msgstr ""
+msgstr "Permitir a partilha de documentos"
 
 #. module: base_setup
 #: field:base.config.settings,module_auth_anonymous:0
@@ -296,7 +296,7 @@ msgstr ""
 #. module: base_setup
 #: view:sale.config.settings:0
 msgid "Social Network Integration"
-msgstr ""
+msgstr "Integração com redes sociais"
 
 #. module: base_setup
 #: view:base.config.settings:0
@@ -308,7 +308,7 @@ msgstr "Cancelar"
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Aplicar"
 
 #. module: base_setup
 #: view:base.setup.terminology:0
@@ -319,7 +319,7 @@ msgstr "Especifique a sua terminologia"
 #: view:base.config.settings:0
 #: view:sale.config.settings:0
 msgid "or"
-msgstr ""
+msgstr "ou"
 
 #. module: base_setup
 #: view:base.config.settings:0
diff --git a/addons/base_setup/i18n/pt_BR.po b/addons/base_setup/i18n/pt_BR.po
index bf3109c7873..71590a0bd33 100644
--- a/addons/base_setup/i18n/pt_BR.po
+++ b/addons/base_setup/i18n/pt_BR.po
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-17 04:45+0000\n"
+"X-Launchpad-Export-Date: 2012-12-18 05:00+0000\n"
 "X-Generator: Launchpad (build 16372)\n"
 
 #. module: base_setup
diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index bec7034c023..33c5aa863bf 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from osv import osv, fields
+from openerp.osv import fields, osv
 
 class base_config_settings(osv.osv_memory):
     _name = 'base.config.settings'