From 0528e00788a7cca36353a2996ab58568bdd8be78 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Fri, 9 Nov 2012 04:39:46 +0000 Subject: [PATCH 1/4] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20121109043946-6epxgg88lp1lykye --- addons/google_base_account/i18n/mn.po | 4 +- addons/l10n_fr_rib/i18n/es.po | 136 ++++++++++++++++++++ addons/l10n_multilang/i18n/es.po | 177 ++++++++++++++++++++++++++ addons/mrp/i18n/sl.po | 4 +- addons/pad_project/i18n/es.po | 39 ++++++ addons/plugin/i18n/es.po | 23 ++++ 6 files changed, 379 insertions(+), 4 deletions(-) create mode 100644 addons/l10n_fr_rib/i18n/es.po create mode 100644 addons/l10n_multilang/i18n/es.po create mode 100644 addons/pad_project/i18n/es.po create mode 100644 addons/plugin/i18n/es.po diff --git a/addons/google_base_account/i18n/mn.po b/addons/google_base_account/i18n/mn.po index 417eab16b09..940a83c37d7 100644 --- a/addons/google_base_account/i18n/mn.po +++ b/addons/google_base_account/i18n/mn.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-11-08 04:47+0000\n" -"X-Generator: Launchpad (build 16232)\n" +"X-Launchpad-Export-Date: 2012-11-09 04:39+0000\n" +"X-Generator: Launchpad (build 16250)\n" #. module: google_base_account #: field:res.users,gmail_user:0 diff --git a/addons/l10n_fr_rib/i18n/es.po b/addons/l10n_fr_rib/i18n/es.po new file mode 100644 index 00000000000..e0accc79fcb --- /dev/null +++ b/addons/l10n_fr_rib/i18n/es.po @@ -0,0 +1,136 @@ +# Spanish 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 , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 00:36+0000\n" +"PO-Revision-Date: 2012-11-08 16:01+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Spanish \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-09 04:39+0000\n" +"X-Generator: Launchpad (build 16250)\n" + +#. module: l10n_fr_rib +#: constraint:res.partner.bank:0 +msgid "" +"\n" +"Please define BIC/Swift code on bank for bank type IBAN Account to make " +"valid payments" +msgstr "" +"\n" +"Por favor defina el código BIC/Swift del banco para una cuenta de tipo IBAN " +"para realizar pagos válidos" + +#. module: l10n_fr_rib +#: model:res.partner.bank.type,name:l10n_fr_rib.bank_rib +msgid "RIB and optional IBAN" +msgstr "CC e IBAN opcional" + +#. module: l10n_fr_rib +#: field:res.partner.bank,rib_acc_number:0 +msgid "RIB account number" +msgstr "Número de la cuenta" + +#. module: l10n_fr_rib +#: field:res.partner.bank,bank_code:0 +msgid "Bank Code" +msgstr "Código de banco" + +#. module: l10n_fr_rib +#: code:addons/l10n_fr_rib/bank.py:54 +#, python-format +msgid "The RIB key %s does not correspond to the other codes: %s %s %s." +msgstr "La clave de la CC %s no se corresponde con otros códigos: %s %s %s." + +#. module: l10n_fr_rib +#: model:res.partner.bank.type.field,name:l10n_fr_rib.rib_office_field +msgid "office" +msgstr "oficina" + +#. module: l10n_fr_rib +#: field:res.bank,rib_code:0 +msgid "RIB Bank Code" +msgstr "Código CC" + +#. module: l10n_fr_rib +#: code:addons/l10n_fr_rib/bank.py:58 +#, python-format +msgid "The IBAN %s is not valid." +msgstr "El IBAN %s no es válido." + +#. module: l10n_fr_rib +#: model:ir.model,name:l10n_fr_rib.model_res_partner_bank +msgid "Bank Accounts" +msgstr "Cuentas bancarias" + +#. module: l10n_fr_rib +#: field:res.partner.bank,office:0 +msgid "Office Code" +msgstr "Código de oficina" + +#. module: l10n_fr_rib +#: model:res.partner.bank.type.field,name:l10n_fr_rib.rib_bic_field +msgid "bank_bic" +msgstr "Número BIC" + +#. module: l10n_fr_rib +#: model:res.partner.bank.type.field,name:l10n_fr_rib.rib_bank_code_field +msgid "bank_code" +msgstr "código bancario" + +#. module: l10n_fr_rib +#: model:res.partner.bank.type.field,name:l10n_fr_rib.rib_key_field +msgid "key" +msgstr "clave" + +#. module: l10n_fr_rib +#: model:res.partner.bank.type.field,name:l10n_fr_rib.rib_rib_acc_number_field +msgid "rib_acc_number" +msgstr "Número CC" + +#. module: l10n_fr_rib +#: help:res.partner.bank,key:0 +msgid "" +"The key is a number allowing to check the correctness of the other codes." +msgstr "" +"La clave es un número que permite comprobar si el resto de códigos son " +"correctos." + +#. module: l10n_fr_rib +#: field:res.partner.bank,key:0 +msgid "Key" +msgstr "Clave" + +#. module: l10n_fr_rib +#: code:addons/l10n_fr_rib/bank.py:53 +#: code:addons/l10n_fr_rib/bank.py:58 +#, python-format +msgid "Error" +msgstr "Error" + +#. module: l10n_fr_rib +#: model:res.partner.bank.type,format_layout:l10n_fr_rib.bank_rib +msgid "%(bank_name)s: %(bank_code)s %(office)s %(rib_acc_number)s %(key)s" +msgstr "%(bank_name)s: %(bank_code)s %(office)s %(rib_acc_number)s %(key)s" + +#. module: l10n_fr_rib +#: constraint:res.partner.bank:0 +msgid "The RIB and/or IBAN is not valid" +msgstr "La CC y/o IBAN no es válida" + +#. module: l10n_fr_rib +#: model:ir.model,name:l10n_fr_rib.model_res_bank +msgid "Bank" +msgstr "Banco" + +#. module: l10n_fr_rib +#: model:res.partner.bank.type.field,name:l10n_fr_rib.rib_acc_number_field +msgid "acc_number" +msgstr "Número cuenta" diff --git a/addons/l10n_multilang/i18n/es.po b/addons/l10n_multilang/i18n/es.po new file mode 100644 index 00000000000..4ba54992c5b --- /dev/null +++ b/addons/l10n_multilang/i18n/es.po @@ -0,0 +1,177 @@ +# Spanish 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 , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 01:06+0000\n" +"PO-Revision-Date: 2012-11-08 14:29+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Spanish \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-09 04:39+0000\n" +"X-Generator: Launchpad (build 16250)\n" + +#. module: l10n_multilang +#: model:ir.model,name:l10n_multilang.model_account_fiscal_position_template +msgid "Template for Fiscal Position" +msgstr "Plantilla para posición fiscal" + +#. module: l10n_multilang +#: sql_constraint:account.account:0 +msgid "The code of the account must be unique per company !" +msgstr "¡El código de la cuenta debe ser único por compañía!" + +#. module: l10n_multilang +#: constraint:account.account.template:0 +msgid "" +"Configuration Error!\n" +"You can not define children to an account with internal type different of " +"\"View\"! " +msgstr "" +"Error de configuración!\n" +"¡No puede definir hijos para una cuenta con el tipo interno distinto de " +"\"Vista\"! " + +#. module: l10n_multilang +#: model:ir.model,name:l10n_multilang.model_account_analytic_journal +msgid "Analytic Journal" +msgstr "Diario analítico" + +#. module: l10n_multilang +#: constraint:account.account.template:0 +msgid "Error ! You can not create recursive account templates." +msgstr "¡Error! No puede crear plantillas de cuentas recursivas." + +#. module: l10n_multilang +#: model:ir.model,name:l10n_multilang.model_account_journal +msgid "Journal" +msgstr "Diario" + +#. module: l10n_multilang +#: model:ir.model,name:l10n_multilang.model_account_chart_template +msgid "Templates for Account Chart" +msgstr "Plantillas para el plan contable" + +#. module: l10n_multilang +#: sql_constraint:account.tax:0 +msgid "The description must be unique per company!" +msgstr "¡La descripción debe ser única por compañia!" + +#. module: l10n_multilang +#: constraint:account.tax.code.template:0 +msgid "Error ! You can not create recursive Tax Codes." +msgstr "¡Error! No puede crear códigos de impuestos recursivos." + +#. module: l10n_multilang +#: model:ir.model,name:l10n_multilang.model_account_tax_template +msgid "account.tax.template" +msgstr "Plantilla de impuestos" + +#. module: l10n_multilang +#: model:ir.model,name:l10n_multilang.model_account_tax +msgid "account.tax" +msgstr "Impuesto" + +#. module: l10n_multilang +#: model:ir.model,name:l10n_multilang.model_account_account +msgid "Account" +msgstr "Cuenta" + +#. module: l10n_multilang +#: model:ir.model,name:l10n_multilang.model_wizard_multi_charts_accounts +msgid "wizard.multi.charts.accounts" +msgstr "Asistente de plan de cuentas" + +#. module: l10n_multilang +#: constraint:account.journal:0 +msgid "" +"Configuration error! The currency chosen should be shared by the default " +"accounts too." +msgstr "" +"¡Error de configuración! La moneda elegida debería ser también la misma en " +"las cuentas por defecto" + +#. module: l10n_multilang +#: model:ir.model,name:l10n_multilang.model_account_account_template +msgid "Templates for Accounts" +msgstr "Plantillas para cuentas" + +#. module: l10n_multilang +#: help:account.chart.template,spoken_languages:0 +msgid "" +"State here the languages for which the translations of templates could be " +"loaded at the time of installation of this localization module and copied in " +"the final object when generating them from templates. You must provide the " +"language codes separated by ';'" +msgstr "" +"Indique aquí los idiomas para los que las traducciones de las plantillas " +"pueden ser cargadas en el momento de la instalación de este módulo de " +"localización y copiados en el objeto final cuando se generen desde las " +"plantillas. Debe proveer los códigos de idioma separados por ';'." + +#. module: l10n_multilang +#: constraint:account.account:0 +msgid "Error ! You can not create recursive accounts." +msgstr "¡Error! No se pueden crear cuentas recursivas." + +#. module: l10n_multilang +#: constraint:account.account:0 +msgid "" +"Configuration Error! \n" +"You can not select an account type with a deferral method different of " +"\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"! " +msgstr "" +"¡Error de configuración! \n" +"¡No puede seleccionar un tipo de cuenta con un método de cierre diferente de " +"\"Reconciliado\" para las cuentas con tipo interno \"A pagar/A cobrar\"! " + +#. module: l10n_multilang +#: sql_constraint:account.journal:0 +msgid "The name of the journal must be unique per company !" +msgstr "¡El nombre del diaro debe ser único por compañía!" + +#. module: l10n_multilang +#: model:ir.model,name:l10n_multilang.model_account_analytic_account +msgid "Analytic Account" +msgstr "Cuenta analítica" + +#. module: l10n_multilang +#: sql_constraint:account.journal:0 +msgid "The code of the journal must be unique per company !" +msgstr "¡El código del diario debe ser único por compañía!" + +#. module: l10n_multilang +#: model:ir.model,name:l10n_multilang.model_account_fiscal_position +msgid "Fiscal Position" +msgstr "Posición fiscal" + +#. module: l10n_multilang +#: constraint:account.account:0 +msgid "" +"Configuration Error! \n" +"You can not define children to an account with internal type different of " +"\"View\"! " +msgstr "" +"¡Error de configuración! \n" +"¡No puede definir hijos en una cuenta con tipo interno distinto a \"Vista\"! " + +#. module: l10n_multilang +#: constraint:account.analytic.account:0 +msgid "Error! You can not create recursive analytic accounts." +msgstr "¡Error! No puede crear cuentas analíticas recursivas." + +#. module: l10n_multilang +#: model:ir.model,name:l10n_multilang.model_account_tax_code_template +msgid "Tax Code Template" +msgstr "Plantilla códigos de impuestos" + +#. module: l10n_multilang +#: field:account.chart.template,spoken_languages:0 +msgid "Spoken Languages" +msgstr "Idiomas hablados" diff --git a/addons/mrp/i18n/sl.po b/addons/mrp/i18n/sl.po index e36798b6ded..c36878f4d1d 100644 --- a/addons/mrp/i18n/sl.po +++ b/addons/mrp/i18n/sl.po @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-11-08 04:47+0000\n" -"X-Generator: Launchpad (build 16232)\n" +"X-Launchpad-Export-Date: 2012-11-09 04:39+0000\n" +"X-Generator: Launchpad (build 16250)\n" #. module: mrp #: view:mrp.routing.workcenter:0 diff --git a/addons/pad_project/i18n/es.po b/addons/pad_project/i18n/es.po new file mode 100644 index 00000000000..f0dbb565158 --- /dev/null +++ b/addons/pad_project/i18n/es.po @@ -0,0 +1,39 @@ +# Spanish 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 , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 00:36+0000\n" +"PO-Revision-Date: 2012-11-08 12:44+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Spanish \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-09 04:39+0000\n" +"X-Generator: Launchpad (build 16250)\n" + +#. module: pad_project +#: constraint:project.task:0 +msgid "Error ! Task end-date must be greater then task start-date" +msgstr "" +"¡Error! La fecha final de la tarea debe ser mayor que la fecha de inicio" + +#. module: pad_project +#: model:ir.model,name:pad_project.model_project_task +msgid "Task" +msgstr "Tarea" + +#. module: pad_project +#: view:project.task:0 +msgid "Pad" +msgstr "Pad" + +#. module: pad_project +#: constraint:project.task:0 +msgid "Error ! You cannot create recursive tasks." +msgstr "¡Error! No se pueden crear tareas recursivas." diff --git a/addons/plugin/i18n/es.po b/addons/plugin/i18n/es.po new file mode 100644 index 00000000000..8111105ef1f --- /dev/null +++ b/addons/plugin/i18n/es.po @@ -0,0 +1,23 @@ +# Spanish 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 , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2012-02-08 00:36+0000\n" +"PO-Revision-Date: 2012-11-08 11:25+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Spanish \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-09 04:39+0000\n" +"X-Generator: Launchpad (build 16250)\n" + +#. module: plugin +#: model:ir.model,name:plugin.model_plugin_handler +msgid "plugin.handler" +msgstr "Manejador del plug-in" From 71d81fff4d1a7086b988fad462a11df0eebaeec9 Mon Sep 17 00:00:00 2001 From: Tejas Tank Date: Fri, 9 Nov 2012 12:00:02 +0530 Subject: [PATCH 2/4] [IMP] Set api key in demo file and remove key from pad.py bzr revid: tta@openerp.com-20121109063002-ej4bmzzxut5j12e7 --- addons/pad/pad.py | 2 +- addons/pad/pad_demo.xml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/addons/pad/pad.py b/addons/pad/pad.py index e5b36e5f64c..932fc5a21a4 100644 --- a/addons/pad/pad.py +++ b/addons/pad/pad.py @@ -19,7 +19,7 @@ class pad_common(osv.osv_memory): pad = { "server" : company.pad_server, - "key" : company.pad_key or "4DxmsNIbnQUVQMW9S9tx2oLOSjFdrx1l", + "key" : company.pad_key, } # make sure pad server in the form of http://hostname diff --git a/addons/pad/pad_demo.xml b/addons/pad/pad_demo.xml index 407f90e8242..0213e3410cf 100644 --- a/addons/pad/pad_demo.xml +++ b/addons/pad/pad_demo.xml @@ -4,6 +4,10 @@ pad.openerp.com + + + 4DxmsNIbnQUVQMW9S9tx2oLOSjFdrx1l + From 8be63a00435d7757ccb1cba171700041efca3672 Mon Sep 17 00:00:00 2001 From: Tejas Tank Date: Fri, 9 Nov 2012 12:21:44 +0530 Subject: [PATCH 3/4] [FIX] Corrected etherpad rending issue. bzr revid: tta@openerp.com-20121109065144-hut93odny1ur16db --- addons/pad/static/src/js/pad.js | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/pad/static/src/js/pad.js b/addons/pad/static/src/js/pad.js index 7c6b2a639c1..929d62681c8 100644 --- a/addons/pad/static/src/js/pad.js +++ b/addons/pad/static/src/js/pad.js @@ -14,6 +14,7 @@ openerp.pad = function(instance) { object_id: self.view.datarecord.id }}).done(function(data) { if(data&&data.url){ + self.set({value: data.url}); _super(data.url); self.renderElement(); } From d3b22ccb36c727afcdfbcda2877f81338a97a753 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 9 Nov 2012 09:35:13 +0100 Subject: [PATCH 4/4] [FIX] incorrect handling of empty values in m2m listview display bzr revid: xmo@openerp.com-20121109083513-mjpzd01hhuylll4j --- addons/web/static/src/js/view_list.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_list.js b/addons/web/static/src/js/view_list.js index 03a48297eca..6779b6fe841 100644 --- a/addons/web/static/src/js/view_list.js +++ b/addons/web/static/src/js/view_list.js @@ -2217,7 +2217,7 @@ instance.web.list.Many2OneButton = instance.web.list.Column.extend({ }); instance.web.list.Many2Many = instance.web.list.Column.extend({ _format: function (row_data, options) { - if (row_data[this.id].value) { + if (!_.isEmpty(row_data[this.id].value)) { // If value, use __display version for printing row_data[this.id] = row_data[this.id + '__display']; }