diff options
313 files changed, 3561 insertions, 2448 deletions
diff --git a/addons/account/i18n/ar.po b/addons/account/i18n/ar.po index af1c2b7aed3..25710f7572c 100644 --- a/addons/account/i18n/ar.po +++ b/addons/account/i18n/ar.po @@ -44,6 +44,7 @@ # Ali Alrehawi <alrehawi@hotmail.com>, 2018 # Osoul <baruni@osoul.ly>, 2018 # Mustafa Rawi <mustafa@cubexco.com>, 2018 +# Lucas Perais <lcsperais@gmail.com>, 2018 # jahzar <jahzar@gmail.com>, 2018 # msgid "" @@ -455,7 +456,9 @@ msgstr "" #. module: account #: model_terms:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view msgid "<span name=\"button_import_placeholder\"/> Statements" -msgstr "كشف حساب" +msgstr "" +"<span name=\"button_import_placeholder\"/><span " +"name=\\\"button_import_placeholder\\\"/>كشف حساب" #. module: account #: model_terms:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po index fc178d8f107..61a1987d143 100644 --- a/addons/account/i18n/cs.po +++ b/addons/account/i18n/cs.po @@ -1213,7 +1213,7 @@ msgstr "Přidat dobropis" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_send__add_sign msgid "Add Sign" -msgstr "" +msgstr "Přidat podpis" #. module: account #: model_terms:ir.ui.view,arch_db:account.onboarding_bank_account_step @@ -1868,7 +1868,7 @@ msgstr "Připojit soubor" #: model:ir.model.fields,field_description:account.field_account_invoice__message_attachment_count #: model:ir.model.fields,field_description:account.field_account_payment__message_attachment_count msgid "Attachment Count" -msgstr "" +msgstr "Počet příloh" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_send__attachment_ids @@ -1927,7 +1927,7 @@ msgstr "Automatické rozpoznání" #: model:ir.model.fields,field_description:account.field_account_reconcile_model__auto_reconcile #: model:ir.model.fields,field_description:account.field_account_reconcile_model_template__auto_reconcile msgid "Auto-validate" -msgstr "" +msgstr "Automatické ověření" #. module: account #: model_terms:ir.ui.view,arch_db:account.res_config_settings_view_form @@ -1990,7 +1990,7 @@ msgstr "ÚČET" #. module: account #: selection:res.partner,trust:0 msgid "Bad Debtor" -msgstr "" +msgstr "Špatný dlužník" #. module: account #: selection:account.payment.term.line,value:0 @@ -2058,6 +2058,9 @@ msgid "" "account if this is a Customer Invoice or Vendor Credit Note, otherwise a " "Partner bank account number." msgstr "" +"Číslo bankovního účtu, na které bude faktura uhrazena. Bankovní účet " +"společnosti, pokud se jedná o fakturaci zákazníka nebo kreditní poznámku " +"prodávajícího, jinak číslo bankovního účtu partnera." #. module: account #: model:ir.actions.act_window,name:account.action_account_bank_journal_form @@ -2113,7 +2116,7 @@ msgstr "Předvolba bankovního vyúčtování" #: model:ir.model.fields,field_description:account.field_res_company__account_bank_reconciliation_start #: model:ir.model.fields,field_description:account.field_res_config_settings__account_bank_reconciliation_start msgid "Bank Reconciliation Threshold" -msgstr "" +msgstr "Bankovní vyrovnávací prah" #. module: account #: model:ir.model,name:account.model_account_bank_statement @@ -3917,7 +3920,7 @@ msgstr "Smazat emaily" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_send__auto_delete_message msgid "Delete Message Copy" -msgstr "" +msgstr "Odstranit kopii zprávy" #. module: account #: model:ir.model.fields,help:account.field_account_invoice_send__auto_delete @@ -4265,6 +4268,8 @@ msgid "" "Email address of the sender. This field is set when no matching partner is " "found and replaces the author_id field in the chatter." msgstr "" +"E-mailová adresa odesílatele. Toto pole je nastaveno, pokud nebyl nalezen " +"žádný odpovídající partner a nahrazuje pole autor_id v chatu." #. module: account #: model:ir.model.fields,field_description:account.field_res_company__invoice_is_email @@ -5569,6 +5574,8 @@ msgid "" "Invoice_${(object.number or '').replace('/','_')}${object.state == 'draft' " "and '_draft' or ''}" msgstr "" +"Invoice_${(object.number or '').replace('/','_')}${object.state == 'draft' " +"and '_draft' or ''}" #. module: account #: model_terms:ir.ui.view,arch_db:account.view_account_invoice_report_search diff --git a/addons/account/i18n/et.po b/addons/account/i18n/et.po index 26908a8d5ad..215029ffb79 100644 --- a/addons/account/i18n/et.po +++ b/addons/account/i18n/et.po @@ -13,8 +13,8 @@ # Martin Aavastik <martin@avalah.ee>, 2018 # Helen Sulaoja <helen@avalah.ee>, 2018 # Egon Raamat <egon@avalah.ee>, 2018 -# Eneli Õigus <enelioigus@gmail.com>, 2018 # Rivo Zängov <eraser@eraser.ee>, 2018 +# Eneli Õigus <enelioigus@gmail.com>, 2018 # msgid "" msgstr "" @@ -22,7 +22,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:48+0000\n" "PO-Revision-Date: 2018-08-24 09:14+0000\n" -"Last-Translator: Rivo Zängov <eraser@eraser.ee>, 2018\n" +"Last-Translator: Eneli Õigus <enelioigus@gmail.com>, 2018\n" "Language-Team: Estonian (https://www.transifex.com/odoo/teams/41243/et/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2764,7 +2764,7 @@ msgstr "" #: code:addons/account/static/src/xml/account_reconciliation.xml:137 #, python-format msgid "Choose counterpart or Create Write-off" -msgstr "" +msgstr "Vali vastaspool või kanna summa mingile kontole" #. module: account #: model:ir.model.fields,help:account.field_account_invoice_refund__filter_refund diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po index 6e53329394a..c1e4efccfbb 100644 --- a/addons/account/i18n/it.po +++ b/addons/account/i18n/it.po @@ -21,9 +21,9 @@ # Federico Castellano <castellano.federico@outlook.com>, 2018 # Paolo Valier, 2018 # David Minneci <david@numeko.it>, 2018 -# efraimbiffi <eab@odoo.com>, 2018 # Martin Trigaux, 2018 # Lorenzo Battistini <lorenzo.battistini@agilebg.com>, 2018 +# efraimbiffi <eab@odoo.com>, 2018 # Léonie Bouchat <lbo@odoo.com>, 2018 # Sergio Zanchetta <primes2h@gmail.com>, 2018 # @@ -160,7 +160,7 @@ msgstr "45 giorni" #: code:addons/account/models/account.py:686 #, python-format msgid ": Refund" -msgstr ": rettifica" +msgstr ": rimborso" #. module: account #: model:mail.template,body_html:account.mail_template_data_payment_receipt @@ -587,7 +587,7 @@ msgstr "<span>Vista</span>" #. module: account #: model_terms:ir.ui.view,arch_db:account.report_invoice_document msgid "<strong class=\"mr16\">Subtotal</strong>" -msgstr "<strong class=\"mr16\">Subtotale</strong>" +msgstr "<strong class=\"mr16\">Imponibile</strong>" #. module: account #: model_terms:ir.ui.view,arch_db:account.report_invoice_document @@ -695,7 +695,7 @@ msgstr "<strong>Origine:</strong>" #. module: account #: model_terms:ir.ui.view,arch_db:account.report_invoice_document msgid "<strong>Subtotal</strong>" -msgstr "<strong>Subtotale</strong>" +msgstr "<strong>Imponibile</strong>" #. module: account #: model_terms:ir.ui.view,arch_db:account.report_journal @@ -1199,7 +1199,7 @@ msgstr "Contabilità" #. module: account #: model_terms:ir.ui.view,arch_db:account.view_account_journal_form msgid "Accounting App Options" -msgstr "Opzioni app di contabilità" +msgstr "Opzioni applicazione contabilità" #. module: account #: model:ir.model.fields,field_description:account.field_account_bank_statement__accounting_date @@ -1222,7 +1222,7 @@ msgstr "Registrazioni contabili" #. module: account #: model:ir.actions.act_window,name:account.open_account_journal_dashboard_kanban msgid "Accounting Overview" -msgstr "Quadro generale contabilità" +msgstr "Bacheca Contabilità" #. module: account #: model_terms:ir.ui.view,arch_db:account.view_partner_property_form @@ -1326,7 +1326,7 @@ msgstr "Aggiungi una banca" #. module: account #: model_terms:ir.actions.act_window,help:account.action_account_journal_form msgid "Add a journal" -msgstr "Aggiungi un registro" +msgstr "Aggiungere un registro" #. module: account #: model_terms:ir.ui.view,arch_db:account.invoice_form @@ -1511,9 +1511,9 @@ msgid "" "and will be created in 'Posted' status." msgstr "" "Le registrazioni create in modo manuale si trovano solitamente nello stato " -"\"Non generata\". È possibile disattivare tale stato impostando l'opzione " +"\"Non registrato\". È possibile disattivare tale stato impostando l'opzione " "che si trova nel relativo registro. In questo caso, le registrazioni " -"verranno create automaticamente dal sistema, con stato \"Generata\", " +"verranno create automaticamente dal sistema, con stato \"Registrato\", " "all'atto di validazione del documento (fatture, estratti conto bancari...)." #. module: account @@ -2028,7 +2028,7 @@ msgstr "Avatar Autore" #. module: account #: model_terms:ir.ui.view,arch_db:account.invoice_supplier_form msgid "Auto-Complete" -msgstr "Autocompletamento" +msgstr "Autocompilazione" #. module: account #: model:ir.model.fields,help:account.field_account_invoice__vendor_bill_id @@ -2399,7 +2399,7 @@ msgstr "Fatturazione" #. module: account #: model:res.groups,name:account.group_account_manager msgid "Billing Manager" -msgstr "Gestione fatturazione" +msgstr "Responsabile fatturazione" #. module: account #: model:ir.actions.server,name:account.action_invoice_tree2 @@ -3348,17 +3348,17 @@ msgstr "Creazione di un conto corrente bancario" #. module: account #: model_terms:ir.actions.act_window,help:account.action_account_bank_journal_form msgid "Create a bank account" -msgstr "Crea un conto bancario" +msgstr "Creare un conto bancario" #. module: account #: model_terms:ir.actions.act_window,help:account.action_invoice_out_refund msgid "Create a credit note" -msgstr "Creazione di una nota di credito" +msgstr "Creare una nota di credito" #. module: account #: model_terms:ir.actions.act_window,help:account.action_invoice_tree1 msgid "Create a customer invoice" -msgstr "Crea una fattura cliente" +msgstr "Creare una fattura cliente" #. module: account #: selection:account.invoice.refund,filter_refund:0 @@ -3384,12 +3384,12 @@ msgstr "Crea un nuovo cash log" #: model_terms:ir.actions.act_window,help:account.action_account_fiscal_position_form #: model_terms:ir.actions.act_window,help:account.action_account_fiscal_position_template_form msgid "Create a new fiscal position" -msgstr "Crea una nuova posizione fiscale" +msgstr "Creare una nuova posizione fiscale" #. module: account #: model_terms:ir.actions.act_window,help:account.action_incoterms_tree msgid "Create a new incoterm" -msgstr "Crea un nuovo incoterm" +msgstr "Creare un nuovo Incoterm" #. module: account #: model_terms:ir.actions.act_window,help:account.product_product_action_purchasable @@ -3409,12 +3409,12 @@ msgstr "Crea un nuovo prodotto vendibile" #. module: account #: model_terms:ir.actions.act_window,help:account.action_tax_form msgid "Create a new tax" -msgstr "Crea una nuova imposta" +msgstr "Creare una nuova imposta" #. module: account #: model_terms:ir.actions.act_window,help:account.action_invoice_in_refund msgid "Create a vendor credit note" -msgstr "Creazione di una nota di credito fornitore" +msgstr "Creare una nota di credito fornitore" #. module: account #: model_terms:ir.ui.view,arch_db:account.tax_adjustments_wizard @@ -3439,8 +3439,7 @@ msgid "" "Create invoices, register payments and keep track of the discussions with " "your customers." msgstr "" -"Crea fatture, registra pagamenti e tieni traccia delle conversazioni con i " -"clienti." +"Creazione fatture, registrazione pagamenti e conversazioni con i clienti." #. module: account #. openerp-web @@ -3963,7 +3962,7 @@ msgstr "Dicembre" #. module: account #: model:ir.model.fields,field_description:account.field_account_journal__refund_sequence msgid "Dedicated Credit Note Sequence" -msgstr "Sequenza riservata a note di credito" +msgstr "Sequenza dedicata per note di credito" #. module: account #: model:ir.model.fields,field_description:account.field_res_company__invoice_reference_type @@ -6662,7 +6661,7 @@ msgstr "Valuta principale dell'azienda" #: model:ir.ui.menu,name:account.account_reports_management_menu #: model:ir.ui.menu,name:account.menu_finance_entries_management msgid "Management" -msgstr "Gestione" +msgstr "Amministrazione" #. module: account #: model:account.payment.method,name:account.account_payment_method_manual_in @@ -7216,7 +7215,7 @@ msgid "" "Note that the easiest way to create a credit note is to do it directly\n" " from the customer invoice." msgstr "" -"Si noti che il modo più semplice per creare una nota di credito è di\n" +"Da evidenziare che il modo più semplice per creare una nota di credito è di\n" " farlo direttamente dalla fattura cliente." #. module: account @@ -7225,8 +7224,8 @@ msgid "" "Note that the easiest way to create a vendor credit note it to do it " "directly from the vendor bill." msgstr "" -"Si noti che il modo più semplice per creare una nota di credito fornitore è " -"di farlo direttamente dalla fattura." +"Da evidenziare che il modo più semplice per creare una nota di credito " +"fornitore è di farlo direttamente dalla fattura." #. module: account #: model:ir.model.fields,field_description:account.field_account_bank_statement_line__note @@ -7385,7 +7384,7 @@ msgstr "" #: code:addons/account/models/account_payment.py:599 #, python-format msgid "Only a draft payment can be posted." -msgstr "Un pagamento può essere generato solo se è in bozza." +msgstr "Un pagamento può essere registrato solo se è in bozza." #. module: account #: code:addons/account/models/chart_template.py:185 @@ -7422,7 +7421,7 @@ msgstr "Saldo di apertura" #: code:addons/account/static/src/xml/account_reconciliation.xml:137 #, python-format msgid "Open balance" -msgstr "Saldo di apertura" +msgstr "Apri saldo" #. module: account #: model:ir.model,name:account.model_account_financial_year_op @@ -7450,7 +7449,7 @@ msgstr "Registrazione contabile di apertura" #. module: account #: model:ir.model.fields,field_description:account.field_account_financial_year_op__opening_move_posted msgid "Opening Move Posted" -msgstr "Movimento di apertura generato" +msgstr "Movimento di apertura registrato" #. module: account #: model:ir.model.fields,help:account.field_account_cashbox_line__number @@ -7845,13 +7844,13 @@ msgstr "Metodo di pagamento" #: model:ir.model.fields,field_description:account.field_account_payment__payment_method_id #: model:ir.model.fields,field_description:account.field_account_register_payments__payment_method_id msgid "Payment Method Type" -msgstr "Tipo di metodo di pagamento" +msgstr "Tipologia metodo di pagamento" #. module: account #: model_terms:ir.ui.view,arch_db:account.view_account_bank_journal_form #: model_terms:ir.ui.view,arch_db:account.view_account_journal_form msgid "Payment Method Types" -msgstr "Tipi di metodo di pagamento" +msgstr "Tipologie metodo di pagamento" #. module: account #. openerp-web @@ -7883,7 +7882,7 @@ msgstr "Documento in casso:" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice__reference msgid "Payment Ref." -msgstr "Rif. di pagamento" +msgstr "Rif. per pagamento" #. module: account #: model:ir.model.fields,field_description:account.field_account_payment__payment_reference @@ -7918,7 +7917,7 @@ msgstr "Riga termini di pagamento" #: model:ir.model.fields,field_description:account.field_account_payment_method__payment_type #: model:ir.model.fields,field_description:account.field_account_register_payments__payment_type msgid "Payment Type" -msgstr "Tipo di pagamento" +msgstr "Tipo pagamento" #. module: account #: model_terms:ir.ui.view,arch_db:account.view_payment_term_form @@ -8110,7 +8109,7 @@ msgstr "" #. module: account #: model_terms:ir.ui.view,arch_db:account.report_invoice_document msgid "Please use the following communication for your payment :" -msgstr "Usa la seguente comunicazione per il pagamento:" +msgstr "Usare la seguente causale per il pagamento:" #. module: account #: model_terms:ir.ui.view,arch_db:account.view_account_form @@ -8185,7 +8184,7 @@ msgstr "Registrazioni contabili generate" #. module: account #: model_terms:ir.ui.view,arch_db:account.view_account_move_line_filter msgid "Posted Journal Items" -msgstr "Movimenti contabili generati" +msgstr "Movimenti contabili registrati" #. module: account #: model:ir.model.fields,field_description:account.field_account_chart_template__bank_account_code_prefix @@ -8248,7 +8247,7 @@ msgstr "Prezzo" #: model_terms:ir.ui.view,arch_db:account.account_invoice_send_wizard_form #: model_terms:ir.ui.view,arch_db:account.portal_invoice_page msgid "Print" -msgstr "Stampa" +msgstr "Stampare" #. module: account #: model:ir.model.fields,help:account.field_account_common_journal_report__amount_currency @@ -8462,7 +8461,7 @@ msgstr "Crediti" #: selection:account.payment,payment_type:0 #: selection:account.register.payments,payment_type:0 msgid "Receive Money" -msgstr "Ricevi denaro" +msgstr "Ricevere denaro" #. module: account #: model:ir.model.fields,field_description:account.field_account_abstract_payment__partner_bank_account_id @@ -8507,7 +8506,7 @@ msgstr "" #: model:ir.model.fields,field_description:account.field_account_move_line__reconciled #: model_terms:ir.ui.view,arch_db:account.view_account_payment_search msgid "Reconciled" -msgstr "Riconciliato" +msgstr "Riconciliata" #. module: account #: model:ir.model.fields,field_description:account.field_account_payment__reconciled_invoice_ids @@ -8659,7 +8658,7 @@ msgstr "ID documento collegato" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_send__model msgid "Related Document Model" -msgstr "Modello Documento correlato" +msgstr "Modello documento collegato" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_send__rating_ids @@ -9141,7 +9140,7 @@ msgstr "Selezionare una controparte o scegliere una contropartita" #. module: account #: model_terms:ir.ui.view,arch_db:account.invoice_supplier_form msgid "Select an old vendor bill" -msgstr "Selezionare una precedente fattura fornitore" +msgstr "Selezionare una fattura fornitore precedente" #. module: account #: model:ir.model.fields,help:account.field_account_payment_term_line__value @@ -9208,7 +9207,7 @@ msgstr "Invia fattura" #: selection:account.payment,payment_type:0 #: selection:account.register.payments,payment_type:0 msgid "Send Money" -msgstr "Invia denaro" +msgstr "Inviare denaro" #. module: account #: model:ir.actions.act_window,name:account.account_send_payment_receipt_by_email_action @@ -9395,18 +9394,18 @@ msgstr "Mostrare registro nella bacheca" #. module: account #: model:ir.model.fields,field_description:account.field_res_config_settings__group_show_line_subtotals_tax_included msgid "Show line subtotals with taxes (B2C)" -msgstr "" +msgstr "Mostra gli importi riga con imposte (B2C)" #. module: account #: model:res.groups,comment:account.group_show_line_subtotals_tax_included msgid "Show line subtotals with taxes included (B2C)" -msgstr "Mostra righe dei subtotali includendo le imposte (B2C)" +msgstr "Mostra gli importi riga imposte incluse (B2C)" #. module: account #: model:ir.model.fields,field_description:account.field_res_config_settings__group_show_line_subtotals_tax_excluded #: model:res.groups,comment:account.group_show_line_subtotals_tax_excluded msgid "Show line subtotals without taxes (B2B)" -msgstr "Mostra righe dei subtotali escludendo le imposte (B2B)" +msgstr "Mostra gli importi riga imposte escluse (B2B)" #. module: account #. openerp-web @@ -9624,7 +9623,7 @@ msgstr "Oggetto..." #: model:ir.model.fields,field_description:account.field_account_cashbox_line__subtotal #: model_terms:ir.ui.view,arch_db:account.invoice_form msgid "Subtotal" -msgstr "Subtotale" +msgstr "Imponibile" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_send__subtype_id @@ -9879,7 +9878,7 @@ msgstr "Metodo di arrotondamento per il calcolo imposte" #. module: account #: model:res.groups,name:account.group_show_line_subtotals_tax_excluded msgid "Tax display B2B" -msgstr "Visualizzazione delle Imposte B2B" +msgstr "Visualizzare imposte B2B" #. module: account #: model:res.groups,name:account.group_show_line_subtotals_tax_included @@ -11148,13 +11147,13 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:account.view_move_form #: model_terms:ir.ui.view,arch_db:account.view_move_line_tree msgid "Total Credit" -msgstr "Totale Avere" +msgstr "Totale avere" #. module: account #: model_terms:ir.ui.view,arch_db:account.view_move_form #: model_terms:ir.ui.view,arch_db:account.view_move_line_tree msgid "Total Debit" -msgstr "Totale Dare" +msgstr "Totale dare" #. module: account #: model:ir.model.fields,field_description:account.field_res_partner__total_invoiced @@ -11271,7 +11270,7 @@ msgstr "Operazioni" #. module: account #: model:ir.model.fields,field_description:account.field_account_bank_statement__total_entry_encoding msgid "Transactions Subtotal" -msgstr "Subtotale operazioni" +msgstr "Imponibile operazioni" #. module: account #: model:ir.model.fields,field_description:account.field_account_payment__destination_journal_id @@ -11355,7 +11354,7 @@ msgstr "Partner sconosciuto" #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened #: model_terms:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view msgid "Unpaid Invoices" -msgstr "fatture non pagate" +msgstr "Fatture non pagate" #. module: account #: selection:account.move,state:0 @@ -11372,7 +11371,7 @@ msgstr "Registrazioni contabili non generate" #. module: account #: model_terms:ir.ui.view,arch_db:account.view_account_move_line_filter msgid "Unposted Journal Items" -msgstr "Movimenti contabili non generati" +msgstr "Movimenti contabili non registrati" #. module: account #: model:ir.model.fields,field_description:account.field_account_bank_statement__message_unread @@ -11737,7 +11736,7 @@ msgstr "Fornitori" #: code:addons/account/static/src/xml/account_payment.xml:82 #, python-format msgid "View" -msgstr "Vista" +msgstr "Visualizza" #. module: account #: model_terms:ir.ui.view,arch_db:account.view_partner_property_form @@ -12009,7 +12008,7 @@ msgstr "" #: code:addons/account/models/account_payment.py:583 #, python-format msgid "You cannot delete a payment that is already posted." -msgstr "Impossibile eliminare un pagamento già generato." +msgstr "Impossibile eliminare un pagamento già registrato." #. module: account #: code:addons/account/models/account_invoice.py:729 @@ -12106,7 +12105,8 @@ msgstr "Non puoi abbinare movimenti da conti cliente e fornitore." #, python-format msgid "You cannot modify a journal entry linked to a posted payment." msgstr "" -"Impossibile modificare una registrazione collegata a un pagamento generato." +"Impossibile modificare una registrazione collegata a un pagamento " +"registrato." #. module: account #: code:addons/account/models/account_move.py:331 @@ -12205,7 +12205,7 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:account.invoice_form #: model_terms:ir.ui.view,arch_db:account.invoice_supplier_form msgid "You have" -msgstr "Hai" +msgstr "Ci sono" #. module: account #: code:addons/account/models/account_payment.py:622 @@ -12371,15 +12371,13 @@ msgstr "es. commissioni bancarie" #: model_terms:ir.ui.view,arch_db:account.invoice_form msgid "for this customer. You can allocate them to mark this invoice as paid." msgstr "" -"per questo cliente. Puoi allocarli per contrassegnare la fattura come " -"pagata." +"per questo cliente. Puoi assegnarli per impostare la fattura come pagata." #. module: account #: model_terms:ir.ui.view,arch_db:account.invoice_supplier_form msgid "for this supplier. You can allocate them to mark this bill as paid." msgstr "" -"per questo cliente. Puoi allocarli per contrassegnare la fattura come " -"pagata." +"per questo fornitore. Puoi assegnarli per impostare la fattura come pagata." #. module: account #. openerp-web @@ -12418,12 +12416,12 @@ msgstr "del mese prossimo" #. module: account #: model_terms:ir.ui.view,arch_db:account.invoice_supplier_form msgid "outstanding debits" -msgstr "Crediti aperti" +msgstr "debiti in sospeso" #. module: account #: model_terms:ir.ui.view,arch_db:account.invoice_form msgid "outstanding payments" -msgstr "pagamenti aperti" +msgstr "pagamenti in sospeso" #. module: account #. openerp-web diff --git a/addons/account/i18n/ja.po b/addons/account/i18n/ja.po index eccbb635a01..5d615f4f048 100644 --- a/addons/account/i18n/ja.po +++ b/addons/account/i18n/ja.po @@ -2703,7 +2703,7 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:account.account_invoice_onboarding_sale_tax_form #: model_terms:ir.ui.view,arch_db:account.onboarding_sale_tax_step msgid "Choose a default sales tax for your products." -msgstr "" +msgstr "プロダクトのデフォルト販売税を選択してください。" #. module: account #. openerp-web @@ -8508,7 +8508,7 @@ msgstr "販売税" #. module: account #: model:ir.actions.act_window,name:account.action_open_account_onboarding_sale_tax msgid "Sales tax" -msgstr "" +msgstr "販売税" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice__user_id @@ -8862,7 +8862,7 @@ msgstr "" #. module: account #: model_terms:ir.ui.view,arch_db:account.onboarding_sale_tax_step msgid "Set taxes" -msgstr "" +msgstr "税を設定" #. module: account #: model:ir.model.fields,help:account.field_account_chart_template__visible diff --git a/addons/account/i18n/nb.po b/addons/account/i18n/nb.po index 60fd3598cd8..4627741cf23 100644 --- a/addons/account/i18n/nb.po +++ b/addons/account/i18n/nb.po @@ -3,16 +3,18 @@ # * account # # Translators: +# Jan Pedro Tumusok <jpt@eyenetworks.no>, 2018 # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 -# Jan Pedro Tumusok <jpt@eyenetworks.no>, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:48+0000\n" -"PO-Revision-Date: 2018-10-08 06:48+0000\n" -"Last-Translator: Jan Pedro Tumusok <jpt@eyenetworks.no>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:14+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -33,7 +35,7 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_account_chart_template__code_digits msgid "# of Digits" -msgstr "# tall" +msgstr "# sifre" #. module: account #: model:mail.template,report_name:account.mail_template_data_payment_receipt @@ -1184,7 +1186,7 @@ msgstr "" #. module: account #: model_terms:ir.ui.view,arch_db:account.invoice_form msgid "Add a line" -msgstr "" +msgstr "Legg til linje" #. module: account #: model_terms:ir.actions.act_window,help:account.action_account_form @@ -1687,7 +1689,7 @@ msgstr "Analytiske linjer" #. module: account #: model_terms:ir.ui.view,arch_db:account.res_config_settings_view_form msgid "Analytics" -msgstr "" +msgstr "Analyse" #. module: account #: model:ir.model.fields,help:account.field_account_invoice_send__no_auto_thread @@ -2949,7 +2951,7 @@ msgstr "" #. module: account #: model:ir.model,name:account.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: account #: model:ir.ui.menu,name:account.menu_finance_configuration @@ -4343,7 +4345,7 @@ msgstr "Ekstern referanse" #: code:addons/account/static/src/xml/account_reconciliation.xml:333 #, python-format msgid "External link" -msgstr "" +msgstr "Ekstern link" #. module: account #: model:account.incoterms,name:account.incoterm_FAS @@ -6154,7 +6156,7 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_send__layout msgid "Layout" -msgstr "" +msgstr "Layout" #. module: account #: model_terms:ir.ui.view,arch_db:account.view_account_position_form @@ -7288,7 +7290,7 @@ msgstr "Partner melding" #. module: account #: model:ir.model.fields,field_description:account.field_account_group__parent_path msgid "Parent Path" -msgstr "" +msgstr "Overordnet sti" #. module: account #: model:ir.model.fields,field_description:account.field_account_move_line__parent_state diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po index d36f18c1a2f..9d6af1f3e6e 100644 --- a/addons/account/i18n/nl.po +++ b/addons/account/i18n/nl.po @@ -3273,7 +3273,7 @@ msgstr "" #. module: account #: model:account.account.type,name:account.data_account_type_direct_costs msgid "Cost of Revenue" -msgstr "Kosten van de omzet" +msgstr "Inkoopwaarde van de omzet" #. module: account #: code:addons/account/models/chart_template.py:192 @@ -3560,7 +3560,7 @@ msgstr "Credit" #. module: account #: model:account.account.type,name:account.data_account_type_credit_card msgid "Credit Card" -msgstr "Credit Card" +msgstr "Creditcard" #. module: account #: model:ir.model.fields,field_description:account.field_account_move_line__credit_cash_basis @@ -3679,17 +3679,17 @@ msgstr "Verschil wisselkoers" #: model:account.account.type,name:account.data_account_type_current_assets #: model_terms:ir.ui.view,arch_db:account.view_account_form msgid "Current Assets" -msgstr "Huidige activa" +msgstr "Vlottende activa" #. module: account #: model:account.account.type,name:account.data_account_type_current_liabilities msgid "Current Liabilities" -msgstr "Huidige passiva" +msgstr "Kort vreemd vermogen" #. module: account #: model:account.account.type,name:account.data_unaffected_earnings msgid "Current Year Earnings" -msgstr "Huidige jaaromzet" +msgstr "Huidige jaarwinst" #. module: account #: model:ir.model.fields,help:account.field_account_invoice_send__starred @@ -4512,7 +4512,7 @@ msgstr "Boekingsregels" #: model_terms:ir.ui.view,arch_db:account.view_account_form #: model_terms:ir.ui.view,arch_db:account.view_account_search msgid "Equity" -msgstr "Vermogen" +msgstr "Eigen vermogen" #. module: account #: code:addons/account/models/res_config_settings.py:145 @@ -6863,7 +6863,7 @@ msgstr "Berichten" #. module: account #: model_terms:ir.ui.view,arch_db:account.view_account_form msgid "Minus Cost of Revenue" -msgstr "Min kosten van de omzet" +msgstr "Min inkoopwaarde van de omzet" #. module: account #: model_terms:ir.ui.view,arch_db:account.view_account_form @@ -6873,7 +6873,7 @@ msgstr "Min creditcard rekeningen" #. module: account #: model_terms:ir.ui.view,arch_db:account.view_account_form msgid "Minus Current Liabilities" -msgstr "Huidige passiva" +msgstr "Min kort vreemd vermogen" #. module: account #: model_terms:ir.ui.view,arch_db:account.view_account_form @@ -6883,7 +6883,7 @@ msgstr "Min kosten" #. module: account #: model_terms:ir.ui.view,arch_db:account.view_account_form msgid "Minus Non-Current Liabilities" -msgstr "Minus huidige passiva" +msgstr "Min lang vreemd vermogen" #. module: account #: model_terms:ir.ui.view,arch_db:account.view_account_form @@ -7161,7 +7161,7 @@ msgstr "Langlopende activa" #. module: account #: model:account.account.type,name:account.data_account_type_non_current_liabilities msgid "Non-current Liabilities" -msgstr "Langlopende passiva" +msgstr "Lang vreemd vermogen" #. module: account #: selection:account.tax,type_tax_use:0 @@ -7751,7 +7751,7 @@ msgstr "Relatiesoort" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_send__needaction_partner_ids msgid "Partners with Need Action" -msgstr "Relaties met Nodige Actie" +msgstr "Relaties met benodigde actie" #. module: account #: code:addons/account/models/account_journal_dashboard.py:95 @@ -8218,7 +8218,7 @@ msgstr "Prefix van de transfer rekeningen" #: model:account.account.type,name:account.data_account_type_prepayments #: model_terms:ir.ui.view,arch_db:account.view_account_form msgid "Prepayments" -msgstr "Voorafbetalingen" +msgstr "Vooruitbetalingen" #. module: account #: model:ir.model,name:account.model_account_reconcile_model diff --git a/addons/account/i18n/ro.po b/addons/account/i18n/ro.po index feda92849c0..fff60638e96 100644 --- a/addons/account/i18n/ro.po +++ b/addons/account/i18n/ro.po @@ -3,16 +3,18 @@ # * account # # Translators: +# Cozmin Candea <office@terrabit.ro>, 2018 # Martin Trigaux, 2018 +# Sorin Trifu <sorin.trifu@bizconsulting.ro>, 2018 # Dorin Hongu <dhongu@gmail.com>, 2018 -# Cozmin Candea <office@terrabit.ro>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:48+0000\n" -"PO-Revision-Date: 2018-10-08 06:48+0000\n" -"Last-Translator: Cozmin Candea <office@terrabit.ro>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:14+0000\n" +"Last-Translator: Dorin Hongu <dhongu@gmail.com>, 2018\n" "Language-Team: Romanian (https://www.transifex.com/odoo/teams/41243/ro/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1405,7 +1407,7 @@ msgstr "Permite reconcilierea facturilor și plaților" #. module: account #: model:ir.model.fields,field_description:account.field_res_config_settings__module_product_margin msgid "Allow Product Margin" -msgstr "" +msgstr "Permite Marja Produsului" #. module: account #: model:ir.model.fields,field_description:account.field_account_account__reconcile @@ -1415,12 +1417,12 @@ msgstr "Permite reconciliere" #. module: account #: model:ir.model.fields,field_description:account.field_res_config_settings__module_account_check_printing msgid "Allow check printing and deposits" -msgstr "" +msgstr "Permie tiparire cec si depozite" #. module: account #: model:res.groups,name:account.group_cash_rounding msgid "Allow the cash rounding management" -msgstr "" +msgstr "Permite gestiune rotunjire numerar " #. module: account #: model_terms:ir.ui.view,arch_db:account.res_config_settings_view_form @@ -1522,19 +1524,19 @@ msgstr "" #: model:ir.model.fields,field_description:account.field_account_reconcile_model__match_amount_max #: model:ir.model.fields,field_description:account.field_account_reconcile_model_template__match_amount_max msgid "Amount Max Parameter" -msgstr "" +msgstr "Parametru Suma Max" #. module: account #: model:ir.model.fields,field_description:account.field_account_reconcile_model__match_amount_min #: model:ir.model.fields,field_description:account.field_account_reconcile_model_template__match_amount_min msgid "Amount Min Parameter" -msgstr "" +msgstr "Parametru Suma Min" #. module: account #: model:ir.model.fields,field_description:account.field_account_reconcile_model__match_nature #: model:ir.model.fields,field_description:account.field_account_reconcile_model_template__match_nature msgid "Amount Nature" -msgstr "" +msgstr "Natura Sumei" #. module: account #: selection:account.reconcile.model,match_nature:0 @@ -3070,7 +3072,7 @@ msgstr "" #: code:addons/account/static/src/xml/account_reconciliation.xml:54 #, python-format msgid "Congrats, you're all done!" -msgstr "" +msgstr "Felicitări, ai terminat!" #. module: account #: model_terms:ir.ui.view,arch_db:account.account_invoice_onboarding_panel @@ -4342,7 +4344,7 @@ msgstr "Eroare!" #: code:addons/account/models/chart_template.py:412 #, python-format msgid "Exchange Difference" -msgstr "" +msgstr "Diferență curs" #. module: account #: model:ir.model.fields,field_description:account.field_res_company__currency_exchange_journal_id @@ -4768,7 +4770,7 @@ msgstr "" #: code:addons/account/static/src/xml/account_reconciliation.xml:63 #, python-format msgid "Go to bank statement(s)" -msgstr "" +msgstr "Mergi la extrase bancă" #. module: account #: code:addons/account/models/account_invoice.py:758 @@ -6314,7 +6316,7 @@ msgstr "Încarcă mai mult ... (" #. module: account #: model:ir.model.fields,field_description:account.field_res_company__fiscalyear_lock_date msgid "Lock Date" -msgstr "" +msgstr "Dată blocare" #. module: account #: model:ir.model.fields,field_description:account.field_res_company__period_lock_date @@ -6949,7 +6951,7 @@ msgstr "Note" #: code:addons/account/static/src/xml/account_reconciliation.xml:37 #, python-format msgid "Nothing to do!" -msgstr "" +msgstr "Nimic de făcut!" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_send__notification_ids @@ -7572,12 +7574,12 @@ msgstr "" #. module: account #: model:ir.actions.report,name:account.action_report_payment_receipt msgid "Payment Receipt" -msgstr "" +msgstr "Încasare" #. module: account #: model_terms:ir.ui.view,arch_db:account.report_payment_receipt_document msgid "Payment Receipt:" -msgstr "" +msgstr "Încasare" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice__reference @@ -11009,7 +11011,7 @@ msgstr "Folosește domeniul activ" #. module: account #: model:ir.model.fields,field_description:account.field_res_company__anglo_saxon_accounting msgid "Use anglo-saxon accounting" -msgstr "" +msgstr "Utilizare contabilitate anglo-saxonă " #. module: account #: model:ir.model.fields,field_description:account.field_res_config_settings__module_account_batch_payment @@ -11717,7 +11719,7 @@ msgstr "" #: code:addons/account/static/src/xml/account_reconciliation.xml:55 #, python-format msgid "You reconciled" -msgstr "" +msgstr "Ai reconciliat" #. module: account #: code:addons/account/models/account_move.py:1624 diff --git a/addons/account/i18n/uk.po b/addons/account/i18n/uk.po index fce521ef88a..30486e427fd 100644 --- a/addons/account/i18n/uk.po +++ b/addons/account/i18n/uk.po @@ -854,7 +854,7 @@ msgstr "І'мя власника рахунку" #. module: account #: model:ir.model,name:account.model_account_invoice_send msgid "Account Invoice Send" -msgstr "" +msgstr "Рахунок-фактуру надіслано" #. module: account #: model:ir.model.fields,field_description:account.field_account_setup_bank_manual_config__journal_id @@ -8222,7 +8222,7 @@ msgstr "Купівля" #. module: account #: model_terms:ir.ui.view,arch_db:account.invoice_supplier_form msgid "Purchase Representative" -msgstr "" +msgstr "Представник закупівель" #. module: account #: model_terms:ir.ui.view,arch_db:account.res_config_settings_view_form diff --git a/addons/account/models/account_invoice.py b/addons/account/models/account_invoice.py index 34d510af50d..55d7cacb274 100644 --- a/addons/account/models/account_invoice.py +++ b/addons/account/models/account_invoice.py @@ -504,6 +504,9 @@ class AccountInvoice(models.Model): @api.model def create(self, vals): + if not vals.get('journal_id') and vals.get('type'): + vals['journal_id'] = self.with_context(type=vals.get('type'))._default_journal().id + onchanges = { '_onchange_partner_id': ['account_id', 'payment_term_id', 'fiscal_position_id', 'partner_bank_id'], '_onchange_journal_id': ['currency_id'], diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py index b724a2be893..2f321769caa 100644 --- a/addons/account/models/account_move.py +++ b/addons/account/models/account_move.py @@ -1457,6 +1457,9 @@ class AccountPartialReconcile(models.Model): ''' return tax.cash_basis_base_account_id or line.account_id + def _get_amount_tax_cash_basis(self, amount, line): + return line.company_id.currency_id.round(amount) + def create_tax_cash_basis_entry(self, percentage_before_rec): self.ensure_one() move_date = self.debit_move_id.date @@ -1471,7 +1474,7 @@ class AccountPartialReconcile(models.Model): percentage_after = line._get_matched_percentage()[move.id] #amount is the current cash_basis amount minus the one before the reconciliation amount = line.balance * percentage_after - line.balance * percentage_before - rounded_amt = line.company_id.currency_id.round(amount) + rounded_amt = self._get_amount_tax_cash_basis(amount, line) if float_is_zero(rounded_amt, precision_rounding=line.company_id.currency_id.rounding): continue if line.tax_line_id and line.tax_line_id.tax_exigibility == 'on_payment': diff --git a/addons/account/models/account_reconcile_model.py b/addons/account/models/account_reconcile_model.py index 0941a34fb2f..dd03494ccc8 100644 --- a/addons/account/models/account_reconcile_model.py +++ b/addons/account/models/account_reconcile_model.py @@ -392,17 +392,17 @@ class AccountReconcileModel(models.Model): aml.date_maturity AS aml_date_maturity, aml.amount_residual AS aml_amount_residual, aml.amount_residual_currency AS aml_amount_residual_currency, - CASE WHEN TRIM(REGEXP_REPLACE(move.name, '[^0-9]', '', 'g')) = '' THEN FALSE - ELSE - TRIM(REGEXP_REPLACE(move.name, '[^0-9]', '', 'g')) - = ANY(regexp_split_to_array(REGEXP_REPLACE(st_line.name, '[^(0-9|\s)]', '', 'g'), '\s+')) - OR ( - move.ref IS NOT NULL - AND TRIM(REGEXP_REPLACE(move.ref, '[^0-9]', '', 'g')) != '' - AND TRIM(REGEXP_REPLACE(move.ref, '[^0-9]', '', 'g')) - = ANY(regexp_split_to_array(REGEXP_REPLACE(st_line.name, '[^(0-9|\s)]', '', 'g'), '\s+')) - ) - END AS communication_flag + + -- Determine a matching or not with the statement line communication using the move.name or move.ref. + regexp_split_to_array(TRIM(REGEXP_REPLACE(move.name, '[^0-9|^\s]', '', 'g')),'\s+') + && regexp_split_to_array(TRIM(REGEXP_REPLACE(st_line.name, '[^0-9|^\s]', '', 'g')), '\s+') + OR + ( + move.ref IS NOT NULL + AND + regexp_split_to_array(TRIM(REGEXP_REPLACE(move.ref, '[^0-9|^\s]', '', 'g')),'\s+') + && regexp_split_to_array(TRIM(REGEXP_REPLACE(st_line.name, '[^0-9|^\s]', '', 'g')), '\s+') + ) AS communication_flag FROM account_bank_statement_line st_line LEFT JOIN account_journal journal ON journal.id = st_line.journal_id LEFT JOIN jnl_precision ON jnl_precision.journal_id = journal.id @@ -427,24 +427,30 @@ class AccountReconcileModel(models.Model): -- if there is a partner, propose all aml of the partner, otherwise propose only the ones -- matching the statement line communication - AND CASE WHEN line_partner.partner_id != 0 THEN + AND + ( + ( + line_partner.partner_id != 0 + AND aml.partner_id = line_partner.partner_id - ELSE - ( - CASE WHEN TRIM(REGEXP_REPLACE(move.name, '[^0-9]', '', 'g')) = '' THEN FALSE - ELSE - TRIM(REGEXP_REPLACE(move.name, '[^0-9]', '', 'g')) - = ANY(regexp_split_to_array(REGEXP_REPLACE(st_line.name, '[^(0-9|\s)]', '', 'g'), '\s+')) - OR ( - move.ref IS NOT NULL - AND TRIM(REGEXP_REPLACE(move.ref, '[^0-9]', '', 'g')) != '' - AND TRIM(REGEXP_REPLACE(move.ref, '[^0-9]', '', 'g')) - = ANY(regexp_split_to_array(REGEXP_REPLACE(st_line.name, '[^(0-9|\s)]', '', 'g'), '\s+')) - ) - END + ) + OR + ( + line_partner.partner_id = 0 + AND + ( + regexp_split_to_array(TRIM(REGEXP_REPLACE(move.name, '[^0-9|^\s]', '', 'g')),'\s+') + && regexp_split_to_array(TRIM(REGEXP_REPLACE(st_line.name, '[^0-9|^\s]', '', 'g')), '\s+') + OR + ( + move.ref IS NOT NULL + AND + regexp_split_to_array(TRIM(REGEXP_REPLACE(move.ref, '[^0-9|^\s]', '', 'g')),'\s+') + && regexp_split_to_array(TRIM(REGEXP_REPLACE(st_line.name, '[^0-9|^\s]', '', 'g')), '\s+') + ) ) - END - + ) + ) AND ( ( diff --git a/addons/account/models/chart_template.py b/addons/account/models/chart_template.py index 1bed913ba37..7272c1623f0 100644 --- a/addons/account/models/chart_template.py +++ b/addons/account/models/chart_template.py @@ -4,6 +4,7 @@ from odoo.exceptions import AccessError from odoo import api, fields, models, _ from odoo import SUPERUSER_ID from odoo.exceptions import UserError +from odoo.http import request import logging @@ -163,7 +164,13 @@ class AccountChartTemplate(models.Model): of accounts had been created for it yet. """ self.ensure_one() - company = self.env.user.company_id + if request: + company_id = request.env.user.company_id.id + company = self.env['res.company'].browse(company_id) + else: + # fallback to company of current user, most likely __system__ + # (won't work well for multi-company) + company = self.env.user.company_id # If we don't have any chart of account on this company, install this chart of account if not company.chart_template_id: self.load_for_current_company(15.0, 15.0) @@ -177,7 +184,13 @@ class AccountChartTemplate(models.Model): rights. """ self.ensure_one() - company = self.env.user.company_id + if request: + company_id = request.env.user.company_id.id + company = self.env['res.company'].browse(company_id) + else: + # fallback to company of current user, most likely __system__ + # (won't work well for multi-company) + company = self.env.user.company_id # Ensure everything is translated to the company's language, not the user's one. self = self.with_context(lang=company.partner_id.lang) if not self.env.user._is_admin(): diff --git a/addons/account/tests/test_account_supplier_invoice.py b/addons/account/tests/test_account_supplier_invoice.py index d6584ab6138..d1a6ef46902 100644 --- a/addons/account/tests/test_account_supplier_invoice.py +++ b/addons/account/tests/test_account_supplier_invoice.py @@ -24,6 +24,7 @@ class TestAccountSupplierInvoice(AccountingTestCase): 'account_id': invoice_account, 'type': 'in_invoice', }) + self.assertEquals(invoice.journal_id.type, 'purchase') self.env['account.invoice.line'].create({'product_id': self.env.ref('product.product_product_4').id, 'quantity': 1.0, @@ -79,6 +80,7 @@ class TestAccountSupplierInvoice(AccountingTestCase): 'account_id': invoice_account, 'type': 'in_invoice', }) + self.assertEquals(invoice.journal_id.type, 'purchase') invoice_line = self.env['account.invoice.line'].create({'product_id': self.env.ref('product.product_product_4').id, 'quantity': 5.0, diff --git a/addons/account/views/account_view.xml b/addons/account/views/account_view.xml index bb8481bb2dd..86fc19225b8 100644 --- a/addons/account/views/account_view.xml +++ b/addons/account/views/account_view.xml @@ -906,7 +906,7 @@ <field name="amount" class="oe_inline"/> <span class="o_form_label oe_inline" attrs="{'invisible':[('amount_type','!=','percentage')]}">%</span> </div> - <field name="journal_id" domain="[('company_id', '=', company_id)]" widget="selection" + <field name="journal_id" domain="[('type', '!=', 'general'), ('company_id', '=', company_id)]" widget="selection" attrs="{'invisible': [('rule_type', '!=', 'writeoff_button')]}"/> </group> </group> @@ -939,7 +939,7 @@ <field name="second_amount" class="oe_inline"/> <span class="o_form_label oe_inline" attrs="{'invisible':[('amount_type','!=','percentage')]}">%</span> </div> - <field name="second_journal_id" string="Journal" domain="[('company_id', '=', company_id)]" widget="selection" + <field name="second_journal_id" string="Journal" domain="[('type', '!=', 'general'), ('company_id', '=', company_id)]" widget="selection" attrs="{'invisible': [('rule_type', '!=', 'writeoff_button')]}"/> </group> </group> diff --git a/addons/account/views/report_invoice.xml b/addons/account/views/report_invoice.xml index 3a653d3b78f..75140895390 100644 --- a/addons/account/views/report_invoice.xml +++ b/addons/account/views/report_invoice.xml @@ -19,36 +19,36 @@ <span t-field="o.number"/> </h2> - <div class="row mt32 mb32"> - <div class="col-auto" t-if="o.name" name="description"> + <div id="informations" class="row mt32 mb32"> + <div class="col-auto mw-100 mb-2" t-if="o.name" name="description"> <strong>Description:</strong> - <p t-field="o.name"/> + <p class="m-0" t-field="o.name"/> </div> - <div class="col-auto" t-if="o.date_invoice" name="invoice_date"> + <div class="col-auto mw-100 mb-2" t-if="o.date_invoice" name="invoice_date"> <strong>Invoice Date:</strong> - <p t-field="o.date_invoice"/> + <p class="m-0" t-field="o.date_invoice"/> </div> - <div class="col-auto" t-if="o.date_due and o.type == 'out_invoice' and o.state in ('open', 'in_payment', 'paid')" name="due_date"> + <div class="col-auto mw-100 mb-2" t-if="o.date_due and o.type == 'out_invoice' and o.state in ('open', 'in_payment', 'paid')" name="due_date"> <strong>Due Date:</strong> - <p t-field="o.date_due"/> + <p class="m-0" t-field="o.date_due"/> </div> - <div class="col-auto" t-if="o.origin" name="origin"> + <div class="col-auto mw-100 mb-2" t-if="o.origin" name="origin"> <strong>Source:</strong> - <p t-field="o.origin"/> + <p class="m-0" t-field="o.origin"/> </div> - <div class="col-auto" t-if="o.partner_id.ref" name="customer_code"> + <div class="col-auto mw-100 mb-2" t-if="o.partner_id.ref" name="customer_code"> <strong>Customer Code:</strong> - <p t-field="o.partner_id.ref"/> + <p class="m-0" t-field="o.partner_id.ref"/> </div> - <div name="reference" class="col-auto" t-if="o.reference"> + <div name="reference" class="col-auto mw-100 mb-2" t-if="o.reference"> <strong>Reference:</strong> - <p t-field="o.reference"/> + <p class="m-0" t-field="o.reference"/> </div> </div> <t t-set="display_discount" t-value="any([l.discount for l in o.invoice_line_ids])"/> - <table class="table table-sm" name="invoice_line_table"> + <table class="table table-sm o_main_table" name="invoice_line_table"> <thead> <tr> <t t-set="colspan" t-value="6"/> @@ -75,7 +75,7 @@ <t t-set="current_subtotal" t-value="current_subtotal + line.price_subtotal" groups="account.group_show_line_subtotals_tax_excluded"/> <t t-set="current_subtotal" t-value="current_subtotal + line.price_total" groups="account.group_show_line_subtotals_tax_included"/> - <tr t-att-class="'bg-200 font-weight-bold' if line.display_type == 'line_section' else 'font-italic' if line.display_type == 'line_note' else ''"> + <tr t-att-class="'bg-200 font-weight-bold o_line_section' if line.display_type == 'line_section' else 'font-italic o_line_note' if line.display_type == 'line_note' else ''"> <t t-if="not line.display_type" name="account_invoice_line_accountable"> <td name="account_invoice_line_name"><span t-field="line.name"/></td> <td class="d-none"><span t-field="line.origin"/></td> @@ -92,7 +92,7 @@ <td t-attf-class="text-left {{ 'd-none d-md-table-cell' if report_type == 'html' else '' }}"> <span t-esc="', '.join(map(lambda x: (x.description or x.name), line.invoice_line_tax_ids))"/> </td> - <td class="text-right"> + <td class="text-right o_price_total"> <span t-field="line.price_subtotal" groups="account.group_show_line_subtotals_tax_excluded"/> <span t-field="line.price_total" groups="account.group_show_line_subtotals_tax_included"/> </td> @@ -130,17 +130,17 @@ <div id="total" class="row"> <div t-attf-class="#{'col-4' if report_type != 'html' else 'col-sm-7 col-md-5'} ml-auto"> <table class="table table-sm"> - <tr class="border-black" style="border-bottom:1px solid #dddddd;"> + <tr class="border-black o_subtotal" style=""> <td><strong>Subtotal</strong></td> <td class="text-right"> <span t-field="o.amount_untaxed"/> </td> </tr> <t t-foreach="o.amount_by_group" t-as="amount_by_group"> - <tr style="border-bottom:1px solid #dddddd;"> + <tr style=""> <t t-if="len(o.tax_line_ids) == 1 and o.amount_untaxed == amount_by_group[2]"> <td><span t-esc="amount_by_group[0]"/></td> - <td class="text-right"> + <td class="text-right o_price_total"> <span t-esc="amount_by_group[3]" /> </td> </t> @@ -151,13 +151,13 @@ <t t-esc="amount_by_group[4]"/> </span> </td> - <td class="text-right"> + <td class="text-right o_price_total"> <span t-esc="amount_by_group[3]"/> </td> </t> </tr> </t> - <tr class="border-black"> + <tr class="border-black o_total"> <td><strong>Total</strong></td> <td class="text-right"> <span t-field="o.amount_total"/> diff --git a/addons/account_check_printing/i18n/nb.po b/addons/account_check_printing/i18n/nb.po index ef123287fcd..eb9f55ff6df 100644 --- a/addons/account_check_printing/i18n/nb.po +++ b/addons/account_check_printing/i18n/nb.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:15+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -156,7 +158,7 @@ msgstr "" #. module: account_check_printing #: model:ir.model,name:account_check_printing.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: account_check_printing #: model:ir.model.fields,field_description:account_check_printing.field_print_prenumbered_checks__create_uid diff --git a/addons/account_payment/models/payment.py b/addons/account_payment/models/payment.py index 7d20ec0d6b0..02d52d25eb3 100644 --- a/addons/account_payment/models/payment.py +++ b/addons/account_payment/models/payment.py @@ -20,7 +20,7 @@ class PaymentTransaction(models.Model): values.update(render_values) return self.acquirer_id.with_context(submit_class='btn btn-primary', submit_txt=submit_txt or _('Pay Now')).sudo().render( self.reference, - invoice.amount_total, + invoice.residual_signed, invoice.currency_id.id, values=values, ) diff --git a/addons/account_voucher/i18n/cs.po b/addons/account_voucher/i18n/cs.po index 7b39622ae86..c08372d578f 100644 --- a/addons/account_voucher/i18n/cs.po +++ b/addons/account_voucher/i18n/cs.po @@ -94,7 +94,7 @@ msgstr "Opravdu chcete zrušit tuto účtenku?" #. module: account_voucher #: model:ir.model.fields,field_description:account_voucher.field_account_voucher__message_attachment_count msgid "Attachment Count" -msgstr "" +msgstr "Počet příloh" #. module: account_voucher #: model:ir.model.fields,field_description:account_voucher.field_account_voucher__date diff --git a/addons/analytic/i18n/cs.po b/addons/analytic/i18n/cs.po index 5ff58ca5e20..9fa5ffb6a63 100644 --- a/addons/analytic/i18n/cs.po +++ b/addons/analytic/i18n/cs.po @@ -7,14 +7,15 @@ # Jakub Lohnisky <jakub@lepremier.cz>, 2018 # Jan Horzinka <jan.horzinka@centrum.cz>, 2018 # Michal Veselý <michal@veselyberanek.net>, 2018 -# J. Podhorecky <j.podhorecky@volny.cz>, 2018 +# trendspotter <j.podhorecky@volny.cz>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: J. Podhorecky <j.podhorecky@volny.cz>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:15+0000\n" +"Last-Translator: trendspotter <j.podhorecky@volny.cz>, 2018\n" "Language-Team: Czech (https://www.transifex.com/odoo/teams/41243/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -154,7 +155,7 @@ msgstr "Přidružený partner" #. module: analytic #: model:ir.model.fields,field_description:analytic.field_account_analytic_account__message_attachment_count msgid "Attachment Count" -msgstr "" +msgstr "Počet příloh" #. module: analytic #: model:ir.model.fields,field_description:analytic.field_account_analytic_account__balance diff --git a/addons/analytic/i18n/nb.po b/addons/analytic/i18n/nb.po index 016e03e9e59..505102d44e3 100644 --- a/addons/analytic/i18n/nb.po +++ b/addons/analytic/i18n/nb.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:15+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -442,7 +444,7 @@ msgstr "Overordnet" #. module: analytic #: model:ir.model.fields,field_description:analytic.field_account_analytic_group__parent_path msgid "Parent Path" -msgstr "" +msgstr "Overordnet sti" #. module: analytic #: model:ir.model.fields,field_description:analytic.field_account_analytic_distribution__tag_id diff --git a/addons/auth_ldap/i18n/nb.po b/addons/auth_ldap/i18n/nb.po index c3f7bc3f014..07514110029 100644 --- a/addons/auth_ldap/i18n/nb.po +++ b/addons/auth_ldap/i18n/nb.po @@ -4,13 +4,15 @@ # # Translators: # Martin Trigaux, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: Martin Trigaux, 2018\n" +"PO-Revision-Date: 2018-08-24 09:15+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -45,7 +47,7 @@ msgstr "" #. module: auth_ldap #: model:ir.model,name:auth_ldap.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: auth_ldap #: model:ir.model.fields,field_description:auth_ldap.field_res_company_ldap__create_user diff --git a/addons/auth_ldap/models/res_company_ldap.py b/addons/auth_ldap/models/res_company_ldap.py index 7f36b1ba2dc..7c809f3aaeb 100644 --- a/addons/auth_ldap/models/res_company_ldap.py +++ b/addons/auth_ldap/models/res_company_ldap.py @@ -192,7 +192,7 @@ class CompanyLDAP(models.Model): elif conf['create_user']: _logger.debug("Creating new Odoo user \"%s\" from LDAP" % login) values = self._map_ldap_attributes(conf, login, ldap_entry) - SudoUser = self.env['res.users'].sudo() + SudoUser = self.env['res.users'].sudo().with_context(no_reset_password=True) if conf['user']: values['active'] = True return SudoUser.browse(conf['user'][0]).copy(default=values).id diff --git a/addons/auth_oauth/i18n/nb.po b/addons/auth_oauth/i18n/nb.po index 9a5fa916147..1d99aaf8c34 100644 --- a/addons/auth_oauth/i18n/nb.po +++ b/addons/auth_oauth/i18n/nb.po @@ -4,13 +4,15 @@ # # Translators: # Martin Trigaux, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: Martin Trigaux, 2018\n" +"PO-Revision-Date: 2018-08-24 09:15+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -78,7 +80,7 @@ msgstr "Klient-ID" #. module: auth_oauth #: model:ir.model,name:auth_oauth.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: auth_oauth #: model:ir.model.fields,field_description:auth_oauth.field_auth_oauth_provider__create_uid diff --git a/addons/auth_password_policy/i18n/nb.po b/addons/auth_password_policy/i18n/nb.po index 37b7fc0bebd..46b634cc99e 100644 --- a/addons/auth_password_policy/i18n/nb.po +++ b/addons/auth_password_policy/i18n/nb.po @@ -4,13 +4,15 @@ # # Translators: # Martin Trigaux, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:48+0000\n" -"PO-Revision-Date: 2018-10-08 06:48+0000\n" -"Last-Translator: Martin Trigaux, 2018\n" +"PO-Revision-Date: 2018-10-08 07:10+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +23,7 @@ msgstr "" #. module: auth_password_policy #: model:ir.model,name:auth_password_policy.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: auth_password_policy #: model:ir.model.fields,field_description:auth_password_policy.field_res_config_settings__minlength diff --git a/addons/auth_signup/i18n/nb.po b/addons/auth_signup/i18n/nb.po index 1239e014243..70e9804747c 100644 --- a/addons/auth_signup/i18n/nb.po +++ b/addons/auth_signup/i18n/nb.po @@ -4,13 +4,15 @@ # # Translators: # Martin Trigaux, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: Martin Trigaux, 2018\n" +"PO-Revision-Date: 2018-08-24 09:16+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -349,7 +351,7 @@ msgstr "Lukk" #. module: auth_signup #: model:ir.model,name:auth_signup.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: auth_signup #: model_terms:ir.ui.view,arch_db:auth_signup.reset_password @@ -407,7 +409,7 @@ msgstr "Tillat tilbakestilling av passord fra innloggingssiden" #. module: auth_signup #: model:ir.model,name:auth_signup.model_ir_http msgid "HTTP Routing" -msgstr "" +msgstr "HTTP-ruting" #. module: auth_signup #: code:addons/auth_signup/controllers/main.py:115 @@ -573,6 +575,9 @@ msgid "" "list view and click on 'Portal Access Management' option in the dropdown " "menu *Action*." msgstr "" +"For å sende invitasjoner i B2B modus, åpne en kontrakt, eller velg flere i " +"listevisning, og klikk på 'Tilgangsadministrasjon for Portal' i " +"nedtrekksmenyen *Handling\"." #. module: auth_signup #: model:ir.model,name:auth_signup.model_res_users diff --git a/addons/barcodes/i18n/nb.po b/addons/barcodes/i18n/nb.po index d54cec1204f..af3487dc6dd 100644 --- a/addons/barcodes/i18n/nb.po +++ b/addons/barcodes/i18n/nb.po @@ -4,13 +4,15 @@ # # Translators: # Martin Trigaux, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: Martin Trigaux, 2018\n" +"PO-Revision-Date: 2018-08-24 09:16+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -87,7 +89,7 @@ msgstr "" #. module: barcodes #: selection:barcode.rule,encoding:0 msgid "Any" -msgstr "" +msgstr "Noen" #. module: barcodes #: model:ir.model,name:barcodes.model_barcodes_barcode_events_mixin @@ -229,7 +231,7 @@ msgstr "" #. module: barcodes #: model:ir.model,name:barcodes.model_ir_http msgid "HTTP Routing" -msgstr "" +msgstr "HTTP-ruting" #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature__id diff --git a/addons/barcodes/i18n/nl.po b/addons/barcodes/i18n/nl.po index d70b6cbb386..916e031d71e 100644 --- a/addons/barcodes/i18n/nl.po +++ b/addons/barcodes/i18n/nl.po @@ -4,15 +4,16 @@ # # Translators: # Martin Trigaux, 2018 -# Erwin van der Ploeg <erwin@odooexperts.nl>, 2018 # Yenthe Van Ginneken <yenthespam@gmail.com>, 2018 +# Erwin van der Ploeg <erwin@odooexperts.nl>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: Yenthe Van Ginneken <yenthespam@gmail.com>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:16+0000\n" +"Last-Translator: Erwin van der Ploeg <erwin@odooexperts.nl>, 2018\n" "Language-Team: Dutch (https://www.transifex.com/odoo/teams/41243/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -162,7 +163,7 @@ msgstr "Aangemaakt op" #. module: barcodes #: selection:barcode.rule,type:0 msgid "Credit Card" -msgstr "Credit Card" +msgstr "Creditcard" #. module: barcodes #. openerp-web diff --git a/addons/barcodes/i18n/uk.po b/addons/barcodes/i18n/uk.po index 4ba581de392..f874a894b88 100644 --- a/addons/barcodes/i18n/uk.po +++ b/addons/barcodes/i18n/uk.po @@ -69,7 +69,7 @@ msgstr "" #. module: barcodes #: model_terms:ir.actions.act_window,help:barcodes.action_barcode_nomenclature_form msgid "Add a new barcode nomenclature" -msgstr "" +msgstr "Додати нову номенклатуру штрих-коду" #. module: barcodes #: selection:barcode.rule,type:0 @@ -100,7 +100,7 @@ msgstr "Будь-який" #. module: barcodes #: model:ir.model,name:barcodes.model_barcodes_barcode_events_mixin msgid "Barcode Event Mixin" -msgstr "" +msgstr "Мікс подій штрих-коду" #. module: barcodes #: model:ir.model,name:barcodes.model_barcode_nomenclature @@ -208,21 +208,21 @@ msgstr "Кодування" #: code:addons/barcodes/static/src/js/barcode_form_view.js:326 #, python-format msgid "Error: Barcode command is undefined" -msgstr "" +msgstr "Помилка: команда штрих-коду невизначена" #. module: barcodes #. openerp-web #: code:addons/barcodes/static/src/js/barcode_form_view.js:63 #, python-format msgid "Error: Document not editable" -msgstr "" +msgstr "Помилка: документ не редагується" #. module: barcodes #. openerp-web #: code:addons/barcodes/static/src/js/barcode_form_view.js:362 #, python-format msgid "Error: No last scanned barcode" -msgstr "" +msgstr "Помилка: немає останнього відсканованого штрих-коду" #. module: barcodes #. openerp-web @@ -232,7 +232,7 @@ msgstr "" #: code:addons/barcodes/static/src/js/barcode_form_view.js:139 #, python-format msgid "Error: Pager not available" -msgstr "" +msgstr "Помилка: сторінка не доступна" #. module: barcodes #: model:ir.model,name:barcodes.model_ir_http @@ -283,7 +283,7 @@ msgstr "Ніколи" #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_res_company__nomenclature_id msgid "Nomenclature" -msgstr "" +msgstr "Номенклатура" #. module: barcodes #: selection:barcode.rule,type:0 diff --git a/addons/barcodes/static/src/js/barcode_field.js b/addons/barcodes/static/src/js/barcode_field.js index 7b9b29aa4c8..ca5baa90b49 100644 --- a/addons/barcodes/static/src/js/barcode_field.js +++ b/addons/barcodes/static/src/js/barcode_field.js @@ -4,6 +4,7 @@ odoo.define('barcodes.field', function(require) { var AbstractField = require('web.AbstractField'); var basicFields = require('web.basic_fields'); var fieldRegistry = require('web.field_registry'); +var is_special_key = require('barcodes.BarcodeEvents').BarcodeEvents.is_special_key; // Field in which the user can both type normally and scan barcodes @@ -41,7 +42,9 @@ var FieldFloatScannable = basicFields.FieldFloat.extend({ _onKeypress: function (e) { /* only simulate a keypress if it has been previously prevented */ if (e.dispatched_by_barcode_reader !== true) { - e.preventDefault(); + if (!is_special_key(e)) { + e.preventDefault(); + } return; } var character = String.fromCharCode(e.which); diff --git a/addons/base_automation/i18n/cs.po b/addons/base_automation/i18n/cs.po index 3d751e191f5..f25226ddd58 100644 --- a/addons/base_automation/i18n/cs.po +++ b/addons/base_automation/i18n/cs.po @@ -6,14 +6,15 @@ # Martin Trigaux, 2018 # Jan Horzinka <jan.horzinka@centrum.cz>, 2018 # Michal Veselý <michal@veselyberanek.net>, 2018 -# J. Podhorecky <j.podhorecky@volny.cz>, 2018 +# trendspotter <j.podhorecky@volny.cz>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" -"PO-Revision-Date: 2018-10-08 06:49+0000\n" -"Last-Translator: J. Podhorecky <j.podhorecky@volny.cz>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:16+0000\n" +"Last-Translator: trendspotter <j.podhorecky@volny.cz>, 2018\n" "Language-Team: Czech (https://www.transifex.com/odoo/teams/41243/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -55,7 +56,7 @@ msgstr "Činnost" #. module: base_automation #: model:ir.model.fields,field_description:base_automation.field_base_automation__activity_user_type msgid "Activity User Type" -msgstr "" +msgstr "Typ uživatelské aktivity" #. module: base_automation #: model:ir.model.fields,field_description:base_automation.field_base_automation__channel_ids @@ -206,7 +207,7 @@ msgstr "Uzavřeno" #. module: base_automation #: model:ir.model.fields,help:base_automation.field_base_automation__on_change_fields msgid "Comma-separated list of field names that triggers the onchange." -msgstr "" +msgstr "Seznam názvů polí oddělených čárkami, který spouští výměnu." #. module: base_automation #: model:ir.model.fields,field_description:base_automation.field_base_automation__crud_model_id @@ -645,6 +646,8 @@ msgid "" "When calculating a day-based timed condition, it is possible to use a " "calendar to compute the date based on working days." msgstr "" +"Při výpočtu denního časového stavu je možné pro výpočet data podle " +"pracovních dnů použít kalendář." #. module: base_automation #: model:ir.model.fields,help:base_automation.field_base_automation__sequence diff --git a/addons/base_gengo/i18n/nb.po b/addons/base_gengo/i18n/nb.po index 302c57ea603..7fafbf669c5 100644 --- a/addons/base_gengo/i18n/nb.po +++ b/addons/base_gengo/i18n/nb.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-02 10:05+0000\n" -"PO-Revision-Date: 2018-10-02 10:05+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:16+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -108,7 +110,7 @@ msgstr "Firmaer" #. module: base_gengo #: model:ir.model,name:base_gengo.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: base_gengo #: model:ir.model.fields,field_description:base_gengo.field_base_gengo_translations__create_uid diff --git a/addons/base_import/i18n/it.po b/addons/base_import/i18n/it.po index 63a91dc7750..5ebf5d301ba 100644 --- a/addons/base_import/i18n/it.po +++ b/addons/base_import/i18n/it.po @@ -3,23 +3,24 @@ # * base_import # # Translators: -# Sergio Zanchetta <primes2h@gmail.com>, 2018 # Francesco Garganese <francesco.garganese@aeromnia.aero>, 2018 # Martin Trigaux, 2018 # Simone Bernini <simone@aperturelabs.it>, 2018 # Giacomo Grasso <giacomo.grasso.82@gmail.com>, 2018 # Sebastiano Pistore <SebastianoPistore.info@protonmail.ch>, 2018 -# Paolo Valier, 2018 # Pietro Della Notte <pdellanotte@gmail.com>, 2018 # Léonie Bouchat <lbo@odoo.com>, 2018 +# Paolo Valier, 2018 +# Sergio Zanchetta <primes2h@gmail.com>, 2018 # Petra <bop@odoo.com>, 2018 # David Minneci <david@numeko.it>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-02 10:05+0000\n" -"PO-Revision-Date: 2018-10-02 10:05+0000\n" +"PO-Revision-Date: 2018-08-24 09:16+0000\n" "Last-Translator: David Minneci <david@numeko.it>, 2018\n" "Language-Team: Italian (https://www.transifex.com/odoo/teams/41243/it/)\n" "MIME-Version: 1.0\n" @@ -106,7 +107,7 @@ msgstr "La colonna %s contiene valori errati. Errore nella riga %d: %s" #. module: base_import #: model:ir.model.fields,field_description:base_import.field_base_import_mapping__column_name msgid "Column Name" -msgstr "Nome Colonna" +msgstr "Nome colonna" #. module: base_import #. openerp-web @@ -131,7 +132,7 @@ msgstr "" #: code:addons/base_import/static/src/xml/base_import.xml:108 #, python-format msgid "Create if doesn't exist" -msgstr "Creare se non già esistente" +msgstr "Creare se non esistente" #. module: base_import #: model:ir.model.fields,field_description:base_import.field_base_import_import__create_uid @@ -207,7 +208,7 @@ msgstr "ID database" #: code:addons/base_import/static/src/js/import_action.js:83 #, python-format msgid "Date Format:" -msgstr "Formato Data:" +msgstr "Formato data:" #. module: base_import #. openerp-web @@ -221,7 +222,7 @@ msgstr "Formato di Date e d'Ora:" #: code:addons/base_import/static/src/js/import_action.js:88 #, python-format msgid "Decimal Separator:" -msgstr "Separatore Decimale:" +msgstr "Separatore decimale:" #. module: base_import #. openerp-web @@ -288,13 +289,13 @@ msgstr "Codifica:" #: code:addons/base_import/models/base_import.py:790 #, python-format msgid "Error Parsing Date [%s:L%d]: %s" -msgstr "Errore nel Parsing della Data [%s:L%d]: %s" +msgstr "Errore nell'analisi della data [%s:L%d]: %s" #. module: base_import #: code:addons/base_import/models/base_import.py:289 #, python-format msgid "Error cell found while reading XLS/XLSX file: %s" -msgstr "Cella errata trovata durante la lettura del file XLS/XLSX: %s" +msgstr "Rilevata cella errata nella lettura del file XLS/XLSX: %s" #. module: base_import #. openerp-web @@ -317,7 +318,7 @@ msgstr "" #: code:addons/base_import/models/base_import.py:206 #, python-format msgid "External ID" -msgstr "ID Esterno" +msgstr "ID esterno" #. module: base_import #: model:ir.model.fields,field_description:base_import.field_base_import_mapping__field_name @@ -332,19 +333,19 @@ msgstr "File" #. module: base_import #: model:ir.model.fields,field_description:base_import.field_base_import_import__file_name msgid "File Name" -msgstr "Nome File" +msgstr "Nome file" #. module: base_import #: model:ir.model.fields,field_description:base_import.field_base_import_import__file_type msgid "File Type" -msgstr "Tipo di file" +msgstr "Tipo file" #. module: base_import #: code:addons/base_import/models/base_import.py:808 #: code:addons/base_import/models/base_import.py:814 #, python-format msgid "File size exceeds configured maximum (%s bytes)" -msgstr "La grandezza del file eccede il massimo configurato (%sbytes)" +msgstr "Dimensione del file superiore alla massima configurata (%sbyte)" #. module: base_import #: model:ir.model.fields,help:base_import.field_base_import_import__file @@ -357,14 +358,15 @@ msgstr "File da controllare e/o importare, riga binaria (not base64)" #, python-format msgid "For CSV files, you may need to select the correct separator." msgstr "" -"Per file CSV, potresti avere bisogno di selezionae il corretto separatore." +"Per i file CSV potrebbe essere necessario selezionare il separatore " +"corretto." #. module: base_import #. openerp-web #: code:addons/base_import/static/src/xml/base_import.xml:13 #, python-format msgid "Formatting Options…" -msgstr "Opzioni di formattazione" +msgstr "Opzioni di formattazione..." #. module: base_import #. openerp-web @@ -519,7 +521,7 @@ msgstr "" #: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child____last_update #: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview____last_update msgid "Last Modified on" -msgstr "Data di ultima modifica" +msgstr "Ultima modifica il" #. module: base_import #: model:ir.model.fields,field_description:base_import.field_base_import_import__write_uid @@ -540,7 +542,7 @@ msgstr "Data di ultima modifica" #: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child__write_uid #: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__write_uid msgid "Last Updated by" -msgstr "Ultima modifica di" +msgstr "Ultimo aggiornamento di" #. module: base_import #: model:ir.model.fields,field_description:base_import.field_base_import_import__write_date @@ -561,7 +563,7 @@ msgstr "Ultima modifica di" #: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_o2m_child__write_date #: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__write_date msgid "Last Updated on" -msgstr "Ultima modifica il" +msgstr "Ultimo aggiornamento il" #. module: base_import #. openerp-web @@ -613,7 +615,7 @@ msgstr "Nessun Separatore" #: code:addons/base_import/static/src/js/import_action.js:513 #, python-format msgid "Normal Fields" -msgstr "Campi Normali" +msgstr "Campi normali" #. module: base_import #: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_preview__othervalue @@ -630,7 +632,7 @@ msgstr "Padre" #: code:addons/base_import/static/src/js/import_action.js:514 #, python-format msgid "Relation Fields" -msgstr "Campi Relazione" +msgstr "Campi relazione" #. module: base_import #. openerp-web @@ -649,7 +651,7 @@ msgstr "Res Model" #: code:addons/base_import/static/src/xml/base_import.xml:79 #, python-format msgid "Select a CSV or Excel file to import." -msgstr "Seleziona un file CSV o Excel da importare." +msgstr "Selezionare un file CSV o Excel da importare." #. module: base_import #. openerp-web @@ -778,7 +780,7 @@ msgstr "" #: code:addons/base_import/static/src/js/import_action.js:80 #, python-format msgid "Text Delimiter:" -msgstr "Delimitatore di Testo:" +msgstr "Delimitatore di testo:" #. module: base_import #. openerp-web @@ -796,7 +798,7 @@ msgstr "" #: code:addons/base_import/static/src/js/import_action.js:87 #, python-format msgid "Thousands Separator:" -msgstr "Separatore delle Migliaia:" +msgstr "Separatore delle migliaia:" #. module: base_import #. openerp-web @@ -810,7 +812,7 @@ msgstr "Mantieni uno storico durante l'importazione" #, python-format msgid "Unable to load \"{extension}\" file: requires Python module \"{modname}\"" msgstr "" -"Impossibile caricare \"{extension}\" file: richiede il modulo Python " +"Impossibile caricare il file \"{extension}\": richiede il modulo Python " "\"{modname}\"" #. module: base_import @@ -819,8 +821,8 @@ msgstr "" msgid "" "Unsupported file format \"{}\", import only supports CSV, ODS, XLS and XLSX" msgstr "" -"Formato file non supportato \"{}\", si possono importare solo CSV, ODS, XLS " -"e XLSX" +"Formato file \"{}\" non supportato, è possibile importare solo CSV, ODS, XLS" +" e XLSX" #. module: base_import #: model:ir.model,name:base_import.model_res_users @@ -863,7 +865,7 @@ msgstr "" #: code:addons/base_import/models/base_import.py:631 #, python-format msgid "You must configure at least one field to import" -msgstr "Dovete configurare almeno un campo da importare" +msgstr "Deve essere configurato almeno un campo da importare" #. module: base_import #. openerp-web diff --git a/addons/base_setup/i18n/nb.po b/addons/base_setup/i18n/nb.po index 77973774026..d9ab02ee91f 100644 --- a/addons/base_setup/i18n/nb.po +++ b/addons/base_setup/i18n/nb.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:16+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -150,7 +152,7 @@ msgstr "Firma" #. module: base_setup #: model:ir.model,name:base_setup.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: base_setup #: model_terms:ir.ui.view,arch_db:base_setup.res_config_settings_view_form @@ -240,7 +242,7 @@ msgstr "Google regneark" #. module: base_setup #: model:ir.model,name:base_setup.model_ir_http msgid "HTTP Routing" -msgstr "" +msgstr "HTTP-ruting" #. module: base_setup #: model_terms:ir.ui.view,arch_db:base_setup.res_config_settings_view_form diff --git a/addons/base_vat/i18n/nb.po b/addons/base_vat/i18n/nb.po index 9986ff02f36..c52a76448cc 100644 --- a/addons/base_vat/i18n/nb.po +++ b/addons/base_vat/i18n/nb.po @@ -4,13 +4,15 @@ # # Translators: # Martin Trigaux, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: Martin Trigaux, 2018\n" +"PO-Revision-Date: 2018-08-24 09:16+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,7 +28,7 @@ msgstr "Firmaer" #. module: base_vat #: model:ir.model,name:base_vat.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: base_vat #: model:ir.model,name:base_vat.model_res_partner diff --git a/addons/base_vat/models/res_partner.py b/addons/base_vat/models/res_partner.py index 778cf9c31d6..432f7f04c42 100644 --- a/addons/base_vat/models/res_partner.py +++ b/addons/base_vat/models/res_partner.py @@ -356,3 +356,10 @@ class ResPartner(models.Model): return int(vat[9]) == c1 and int(vat[10]) == c2 return False + + def check_vat_al(self, vat): + try: + import stdnum.al + return stdnum.al.vat.is_valid(vat) + except ImportError: + return True diff --git a/addons/board/i18n/nb.po b/addons/board/i18n/nb.po index 060c49f69a9..07b6e0f2cef 100644 --- a/addons/board/i18n/nb.po +++ b/addons/board/i18n/nb.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-18 09:49+0000\n" -"PO-Revision-Date: 2018-09-18 09:49+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:16+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -128,7 +130,7 @@ msgstr "Sist endret" #: code:addons/board/static/src/xml/board.xml:41 #, python-format msgid "Layout" -msgstr "" +msgstr "Layout" #. module: board #. openerp-web diff --git a/addons/calendar/i18n/cs.po b/addons/calendar/i18n/cs.po index 1b621d2603a..84ede32a82b 100644 --- a/addons/calendar/i18n/cs.po +++ b/addons/calendar/i18n/cs.po @@ -386,7 +386,7 @@ msgstr "Příloha" #. module: calendar #: model:ir.model.fields,field_description:calendar.field_calendar_event__message_attachment_count msgid "Attachment Count" -msgstr "" +msgstr "Počet příloh" #. module: calendar #: model:ir.model.fields,field_description:calendar.field_calendar_event__is_attendee @@ -469,6 +469,8 @@ msgstr "" #: model:ir.model.fields,help:calendar.field_mail_activity_type__category msgid "Categories may trigger specific behavior like opening calendar view" msgstr "" +"Kategorie mohou vyvolat určité chování, například otevření zobrazení " +"kalendáře" #. module: calendar #: model:ir.model.fields,field_description:calendar.field_mail_activity_type__category diff --git a/addons/calendar/i18n/nb.po b/addons/calendar/i18n/nb.po index ae7ce2b8f88..f8fd1309562 100644 --- a/addons/calendar/i18n/nb.po +++ b/addons/calendar/i18n/nb.po @@ -3,15 +3,17 @@ # * calendar # # Translators: -# Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Martin Trigaux, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:18+0000\n" -"PO-Revision-Date: 2018-09-21 13:18+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:17+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -752,7 +754,7 @@ msgstr "Du kan ikke gruppere på dato, bruk kalendervisning i stedet." #. module: calendar #: model:ir.model,name:calendar.model_ir_http msgid "HTTP Routing" -msgstr "" +msgstr "HTTP-ruting" #. module: calendar #: selection:calendar.alarm,interval:0 diff --git a/addons/crm/i18n/cs.po b/addons/crm/i18n/cs.po index 1f15928deaa..a6b5c69f12b 100644 --- a/addons/crm/i18n/cs.po +++ b/addons/crm/i18n/cs.po @@ -236,7 +236,7 @@ msgstr "Datum přidělení" #. module: crm #: model:ir.model.fields,field_description:crm.field_crm_lead__message_attachment_count msgid "Attachment Count" -msgstr "" +msgstr "Počet příloh" #. module: crm #: model_terms:ir.ui.view,arch_db:crm.crm_case_tree_view_oppor @@ -1772,7 +1772,7 @@ msgstr "" #. module: crm #: model:ir.model.fields,field_description:crm.field_crm_lead__partner_is_blacklisted msgid "Partner is blacklisted" -msgstr "" +msgstr "Partner je na černé listině" #. module: crm #: model:ir.model,name:crm.model_crm_partner_binding diff --git a/addons/crm/i18n/ja.po b/addons/crm/i18n/ja.po index 132de8c05e4..712ab4d3c5c 100644 --- a/addons/crm/i18n/ja.po +++ b/addons/crm/i18n/ja.po @@ -4,22 +4,23 @@ # # Translators: # SHIMIZU Taku <shimizu.taku@gmail.com>, 2018 -# Martin Trigaux, 2018 -# Yoshi Tashiro <tashiro@roomsfor.hk>, 2018 -# Manami Hashi <manami@roomsfor.hk>, 2018 # 髙木雄介 <yuusuke.takagi@pro-spire.co.jp>, 2018 +# 城谷 龍弥 <tatsuya.shirotani@pro-spire.co.jp>, 2018 +# Manami Hashi <manami@roomsfor.hk>, 2018 # 高木正勝 <masakatsu.takagi@pro-spire.co.jp>, 2018 # kent_ocean <ke.tanabe@gmail.com>, 2018 # Norimichi Sugimoto <norimichi.sugimoto@tls-ltd.co.jp>, 2018 -# 城谷 龍弥 <tatsuya.shirotani@pro-spire.co.jp>, 2018 # Tim Siu Lai <tl@roomsfor.hk>, 2018 +# Martin Trigaux, 2018 +# Yoshi Tashiro <tashiro@roomsfor.hk>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:48+0000\n" -"PO-Revision-Date: 2018-10-08 06:48+0000\n" -"Last-Translator: Tim Siu Lai <tl@roomsfor.hk>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:17+0000\n" +"Last-Translator: Yoshi Tashiro <tashiro@roomsfor.hk>, 2018\n" "Language-Team: Japanese (https://www.transifex.com/odoo/teams/41243/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -530,7 +531,7 @@ msgstr "作成" #. module: crm #: model_terms:ir.ui.view,arch_db:crm.view_create_opportunity_simplified msgid "Create & Edit" -msgstr "" +msgstr "作成 & 編集" #. module: crm #: model:ir.model.fields,field_description:crm.field_res_config_settings__module_crm_reveal diff --git a/addons/crm/i18n/nb.po b/addons/crm/i18n/nb.po index 0e83e69a7af..d47eff069a4 100644 --- a/addons/crm/i18n/nb.po +++ b/addons/crm/i18n/nb.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:48+0000\n" -"PO-Revision-Date: 2018-10-08 06:48+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:17+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -404,7 +406,7 @@ msgstr "Firmanavn" #. module: crm #: model:ir.model,name:crm.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: crm #: model:ir.ui.menu,name:crm.crm_menu_config @@ -757,7 +759,7 @@ msgstr "Ikke koble til en kunde" #. module: crm #: model_terms:ir.ui.view,arch_db:crm.crm_case_kanban_view_leads msgid "Dropdown menu" -msgstr "" +msgstr "Nedtrekksmeny" #. module: crm #: model_terms:ir.ui.view,arch_db:crm.crm_case_kanban_view_leads diff --git a/addons/crm_phone_validation/i18n/nb.po b/addons/crm_phone_validation/i18n/nb.po index 12c6d790c59..48b7fe08510 100644 --- a/addons/crm_phone_validation/i18n/nb.po +++ b/addons/crm_phone_validation/i18n/nb.po @@ -4,13 +4,15 @@ # # Translators: # Martin Trigaux, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:18+0000\n" -"PO-Revision-Date: 2018-09-21 13:18+0000\n" -"Last-Translator: Martin Trigaux, 2018\n" +"PO-Revision-Date: 2018-08-24 09:17+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,7 +34,7 @@ msgstr "" #. module: crm_phone_validation #: model:ir.model,name:crm_phone_validation.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: crm_phone_validation #: model:ir.model,name:crm_phone_validation.model_res_partner diff --git a/addons/decimal_precision/i18n/nb.po b/addons/decimal_precision/i18n/nb.po index a42b18993e6..1a5fc815205 100644 --- a/addons/decimal_precision/i18n/nb.po +++ b/addons/decimal_precision/i18n/nb.po @@ -4,13 +4,15 @@ # # Translators: # Martin Trigaux, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: Martin Trigaux, 2018\n" +"PO-Revision-Date: 2018-08-24 09:17+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -106,7 +108,7 @@ msgstr "Bare en verdi kan defineres for hvert gitt bruksområde!" #. module: decimal_precision #: model:ir.model,name:decimal_precision.model_ir_qweb_field_float msgid "Qweb Field Float" -msgstr "" +msgstr "Qweb-felt Flyttall" #. module: decimal_precision #: model:ir.model.fields,field_description:decimal_precision.field_decimal_precision__name diff --git a/addons/delivery/i18n/cs.po b/addons/delivery/i18n/cs.po index 0a08a6c904b..05dc328c618 100644 --- a/addons/delivery/i18n/cs.po +++ b/addons/delivery/i18n/cs.po @@ -7,14 +7,15 @@ # Ladislav Tomm <tomm@helemik.cz>, 2018 # Jan Horzinka <jan.horzinka@centrum.cz>, 2018 # Michal Veselý <michal@veselyberanek.net>, 2018 -# J. Podhorecky <j.podhorecky@volny.cz>, 2018 +# trendspotter <j.podhorecky@volny.cz>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" -"PO-Revision-Date: 2018-10-08 06:49+0000\n" -"Last-Translator: J. Podhorecky <j.podhorecky@volny.cz>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:17+0000\n" +"Last-Translator: trendspotter <j.podhorecky@volny.cz>, 2018\n" "Language-Team: Czech (https://www.transifex.com/odoo/teams/41243/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -524,7 +525,7 @@ msgstr "Název" #. module: delivery #: selection:product.packaging,package_carrier_type:0 msgid "No carrier integration" -msgstr "" +msgstr "Žádná integrace operátora" #. module: delivery #: code:addons/delivery/models/sale_order.py:80 diff --git a/addons/delivery/i18n/nb.po b/addons/delivery/i18n/nb.po index 8d1f31f96ec..d8e6e9eea2b 100644 --- a/addons/delivery/i18n/nb.po +++ b/addons/delivery/i18n/nb.po @@ -3,15 +3,17 @@ # * delivery # # Translators: -# Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Martin Trigaux, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" -"PO-Revision-Date: 2018-10-08 06:49+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:17+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -176,7 +178,7 @@ msgstr "Betingelse" #. module: delivery #: model:ir.model,name:delivery.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: delivery #: model:ir.model,name:delivery.model_res_partner diff --git a/addons/delivery/models/delivery_carrier.py b/addons/delivery/models/delivery_carrier.py index 9f07ad5c6e5..b5b0fcb0644 100644 --- a/addons/delivery/models/delivery_carrier.py +++ b/addons/delivery/models/delivery_carrier.py @@ -120,7 +120,7 @@ class DeliveryCarrier(models.Model): if hasattr(self, '%s_rate_shipment' % self.delivery_type): res = getattr(self, '%s_rate_shipment' % self.delivery_type)(order) # apply margin on computed price - res['price'] = res['price'] * (1.0 + (float(self.margin) / 100.0)) + res['price'] = float(res['price']) * (1.0 + (float(self.margin) / 100.0)) # free when order is large enough if res['success'] and self.free_over and order._compute_amount_total_without_delivery() >= self.amount: res['warning_message'] = _('Info:\nThe shipping is free because the order amount exceeds %.2f.\n(The actual shipping cost is: %.2f)') % (self.amount, res['price']) diff --git a/addons/digest/i18n/nb.po b/addons/digest/i18n/nb.po index 7d6075572c3..192284231dc 100644 --- a/addons/digest/i18n/nb.po +++ b/addons/digest/i18n/nb.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-02 10:05+0000\n" -"PO-Revision-Date: 2018-10-02 10:05+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:17+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -226,7 +228,7 @@ msgstr "Firma" #. module: digest #: model:ir.model,name:digest.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: digest #: model_terms:ir.ui.view,arch_db:digest.res_config_settings_view_form diff --git a/addons/event/i18n/cs.po b/addons/event/i18n/cs.po index 7917534b326..0a2c6aafbcf 100644 --- a/addons/event/i18n/cs.po +++ b/addons/event/i18n/cs.po @@ -615,7 +615,7 @@ msgstr "" #: model:ir.model.fields,field_description:event.field_event_event__message_attachment_count #: model:ir.model.fields,field_description:event.field_event_registration__message_attachment_count msgid "Attachment Count" -msgstr "" +msgstr "Počet příloh" #. module: event #: model_terms:ir.ui.view,arch_db:event.res_config_settings_view_form @@ -716,7 +716,7 @@ msgstr "" #. module: event #: model_terms:event.event,description:event.event_2 msgid "Best regards," -msgstr "" +msgstr "S pozdravem," #. module: event #: model_terms:event.event,description:event.event_0 diff --git a/addons/event/i18n/nb.po b/addons/event/i18n/nb.po index e1a421a4f41..8ce68de35f8 100644 --- a/addons/event/i18n/nb.po +++ b/addons/event/i18n/nb.po @@ -5,6 +5,7 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 # msgid "" msgstr "" @@ -12,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" "PO-Revision-Date: 2018-08-24 09:17+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -802,7 +803,7 @@ msgstr "" #. module: event #: model:ir.model,name:event.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: event #: model:ir.ui.menu,name:event.menu_event_configuration @@ -971,7 +972,7 @@ msgstr "Fullført" #. module: event #: model_terms:ir.ui.view,arch_db:event.view_event_kanban msgid "Dropdown menu" -msgstr "" +msgstr "Nedtrekksmeny" #. module: event #: model_terms:event.event,description:event.event_2 diff --git a/addons/event/i18n/pt_BR.po b/addons/event/i18n/pt_BR.po index ddba9fd5154..c569e1df711 100644 --- a/addons/event/i18n/pt_BR.po +++ b/addons/event/i18n/pt_BR.po @@ -16,6 +16,7 @@ # grazziano <gra.negocia@gmail.com>, 2018 # Munique Shih <muniqueshih@hotmail.com>, 2018 # Yannick Belot <yannickbh@gmail.com>, 2018 +# Rafael H L Moretti <rafael.moretti@gmail.com>, 2018 # msgid "" msgstr "" @@ -23,7 +24,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" "PO-Revision-Date: 2018-08-24 09:17+0000\n" -"Last-Translator: Yannick Belot <yannickbh@gmail.com>, 2018\n" +"Last-Translator: Rafael H L Moretti <rafael.moretti@gmail.com>, 2018\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/odoo/teams/41243/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1253,7 +1254,7 @@ msgstr "Seguidores (Parceiros)" #. module: event #: model_terms:event.event,description:event.event_2 msgid "For any additional information, please contact us at" -msgstr "" +msgstr "Para qualquer informação adicional, favor nos contactar em" #. module: event #: model:ir.model.fields,help:event.field_event_event__seats_max diff --git a/addons/fetchmail/i18n/it.po b/addons/fetchmail/i18n/it.po index 00ad219b1ec..7cda8cd7614 100644 --- a/addons/fetchmail/i18n/it.po +++ b/addons/fetchmail/i18n/it.po @@ -3,22 +3,21 @@ # * fetchmail # # Translators: -# Sergio Zanchetta <primes2h@gmail.com>, 2018 # Francesco Garganese <francesco.garganese@aeromnia.aero>, 2018 # Martin Trigaux, 2018 # Giovanni Perteghella <giovanni@perteghella.org>, 2018 -# Marius Marolla <mariusmarolla@entersys.it>, 2018 -# Francesco <francesco.bianchi.88@gmail.com>, 2018 # Sebastiano Pistore <SebastianoPistore.info@protonmail.ch>, 2018 # Paolo Valier, 2018 # David Minneci <david@numeko.it>, 2018 +# Sergio Zanchetta <primes2h@gmail.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-18 09:49+0000\n" -"PO-Revision-Date: 2018-09-18 09:49+0000\n" -"Last-Translator: David Minneci <david@numeko.it>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:17+0000\n" +"Last-Translator: Sergio Zanchetta <primes2h@gmail.com>, 2018\n" "Language-Team: Italian (https://www.transifex.com/odoo/teams/41243/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,7 +28,7 @@ msgstr "" #. module: fetchmail #: model_terms:ir.ui.view,arch_db:fetchmail.view_email_server_form msgid "Actions to Perform on Incoming Mails" -msgstr "Azione da effettuare sulle mail in entrata" +msgstr "Azioni da eseguire sulle email in ingresso" #. module: fetchmail #: model:ir.model.fields,field_description:fetchmail.field_fetchmail_server__active @@ -44,7 +43,7 @@ msgstr "Avanzato" #. module: fetchmail #: model_terms:ir.ui.view,arch_db:fetchmail.view_email_server_form msgid "Advanced Options" -msgstr "Opzioni Avanzate" +msgstr "Opzioni avanzate" #. module: fetchmail #: model:ir.model.fields,field_description:fetchmail.field_fetchmail_server__configuration @@ -61,7 +60,7 @@ msgstr "Confermato" #: code:addons/fetchmail/models/fetchmail.py:136 #, python-format msgid "Connection test failed: %s" -msgstr "Test connessione fallito: %s" +msgstr "Prova di connessione non riuscita: %s" #. module: fetchmail #: model:ir.model.fields,help:fetchmail.field_fetchmail_server__is_ssl @@ -69,8 +68,8 @@ msgid "" "Connections are encrypted with SSL/TLS through a dedicated port (default: " "IMAPS=993, POP3S=995)" msgstr "" -"Le connessioni sono criptata con SSL/TLS attraverso una porta dedicata " -"(default: IMAPS = 993, POP3S = 995)" +"Le connessioni sono cifrate con SSL/TLS tramite una porta dedicata " +"(predefinite: IMAPS = 993, POP3S = 995)" #. module: fetchmail #: model:ir.model.fields,field_description:fetchmail.field_fetchmail_server__object_id @@ -91,7 +90,7 @@ msgstr "Creato il" #: model:ir.model.fields,help:fetchmail.field_fetchmail_server__priority msgid "Defines the order of processing, lower values mean higher priority" msgstr "" -"Definisce l'ordine di esecuzione, valori bassi significano priorità alta" +"Definisce l'ordine di elaborazione, valori bassi indicano alta priorità" #. module: fetchmail #: model:ir.model.fields,field_description:fetchmail.field_fetchmail_server__display_name @@ -101,7 +100,7 @@ msgstr "Nome visualizzato" #. module: fetchmail #: model_terms:ir.ui.view,arch_db:fetchmail.view_email_server_tree msgid "Email Count" -msgstr "" +msgstr "Totale email" #. module: fetchmail #: model_terms:ir.ui.view,arch_db:fetchmail.view_email_server_form @@ -111,7 +110,7 @@ msgstr "Preleva ora" #. module: fetchmail #: model:ir.model.fields,help:fetchmail.field_fetchmail_server__server msgid "Hostname or IP of the mail server" -msgstr "Hostname o IP del mail server" +msgstr "Nome host o IP del server email" #. module: fetchmail #: model:ir.model.fields,field_description:fetchmail.field_fetchmail_server__id @@ -136,24 +135,24 @@ msgstr "Se SSL è richiesta." #. module: fetchmail #: model:ir.model.fields,field_description:fetchmail.field_mail_mail__fetchmail_server_id msgid "Inbound Mail Server" -msgstr "Server mail in ingresso" +msgstr "Server email in arrivo" #. module: fetchmail #: model_terms:ir.ui.view,arch_db:fetchmail.res_config_settings_view_form msgid "Incoming Email Servers" -msgstr "Server Email in Entrata" +msgstr "Server email in ingresso" #. module: fetchmail #: model_terms:ir.ui.view,arch_db:fetchmail.view_email_server_form #: model_terms:ir.ui.view,arch_db:fetchmail.view_email_server_search msgid "Incoming Mail Server" -msgstr "Mail server in ingresso" +msgstr "Server email in ingresso" #. module: fetchmail #: model:ir.actions.act_window,name:fetchmail.action_email_server_tree #: model:ir.ui.menu,name:fetchmail.menu_action_fetchmail_server_tree msgid "Incoming Mail Servers" -msgstr "Mail server in ingresso" +msgstr "Server email in ingresso" #. module: fetchmail #: model:ir.model.fields,field_description:fetchmail.field_fetchmail_server__attach @@ -168,22 +167,22 @@ msgstr "Mantieni Originale" #. module: fetchmail #: model:ir.model.fields,field_description:fetchmail.field_fetchmail_server__date msgid "Last Fetch Date" -msgstr "Ultima data prelievo mail" +msgstr "Data ultimo prelievo" #. module: fetchmail #: model:ir.model.fields,field_description:fetchmail.field_fetchmail_server____last_update msgid "Last Modified on" -msgstr "Data di ultima modifica" +msgstr "Ultima modifica il" #. module: fetchmail #: model:ir.model.fields,field_description:fetchmail.field_fetchmail_server__write_uid msgid "Last Updated by" -msgstr "Ultima modifica di" +msgstr "Ultimo aggiornamento di" #. module: fetchmail #: model:ir.model.fields,field_description:fetchmail.field_fetchmail_server__write_date msgid "Last Updated on" -msgstr "Ultima modifica il" +msgstr "Ultimo aggiornamento il" #. module: fetchmail #: selection:fetchmail.server,type:0 @@ -200,7 +199,7 @@ msgstr "Informazioni accesso" #: model:ir.cron,cron_name:fetchmail.ir_cron_mail_gateway_action #: model:ir.cron,name:fetchmail.ir_cron_mail_gateway_action msgid "Mail: Fetchmail Service" -msgstr "" +msgstr "Email: servizio fetchmail" #. module: fetchmail #: model:ir.actions.act_window,name:fetchmail.act_server_history @@ -221,12 +220,12 @@ msgstr "Non confermato" #. module: fetchmail #: model_terms:ir.ui.view,arch_db:fetchmail.res_config_settings_view_form msgid "Outgoing Email Servers" -msgstr "Server Email in Uscita" +msgstr "Server email in uscita" #. module: fetchmail #: model:ir.model,name:fetchmail.model_mail_mail msgid "Outgoing Mails" -msgstr "Mail in Uscita" +msgstr "Email in uscita" #. module: fetchmail #: model_terms:ir.ui.view,arch_db:fetchmail.view_email_server_search @@ -246,7 +245,7 @@ msgstr "Server POP/IMAP" #. module: fetchmail #: model_terms:ir.ui.view,arch_db:fetchmail.view_email_server_tree msgid "POP/IMAP Servers" -msgstr "POP / IMAP Server" +msgstr "Server POP/IMAP" #. module: fetchmail #: model:ir.model.fields,field_description:fetchmail.field_fetchmail_server__password @@ -298,17 +297,17 @@ msgstr "Cerca mail server in ingresso" #. module: fetchmail #: model_terms:ir.ui.view,arch_db:fetchmail.view_email_server_form msgid "Server & Login" -msgstr "Server & Login" +msgstr "Server e accesso" #. module: fetchmail #: model_terms:ir.ui.view,arch_db:fetchmail.view_email_server_form msgid "Server Information" -msgstr "Informazioni sul server" +msgstr "Informazioni server" #. module: fetchmail #: model:ir.model.fields,field_description:fetchmail.field_fetchmail_server__server msgid "Server Name" -msgstr "Nome Server" +msgstr "Nome server" #. module: fetchmail #: model:ir.model.fields,field_description:fetchmail.field_fetchmail_server__priority @@ -318,17 +317,17 @@ msgstr "Priorità server" #. module: fetchmail #: model:ir.model.fields,field_description:fetchmail.field_fetchmail_server__type msgid "Server Type" -msgstr "Tipo di Server" +msgstr "Tipo server" #. module: fetchmail #: model_terms:ir.ui.view,arch_db:fetchmail.view_email_server_search msgid "Server type IMAP." -msgstr "Tipo di server IMAP." +msgstr "Server di tipo IMAP." #. module: fetchmail #: model_terms:ir.ui.view,arch_db:fetchmail.view_email_server_search msgid "Server type POP." -msgstr "Tipo server POP." +msgstr "Server di tipo POP." #. module: fetchmail #: model:ir.model.fields,field_description:fetchmail.field_fetchmail_server__state @@ -338,7 +337,7 @@ msgstr "Stato" #. module: fetchmail #: model_terms:ir.ui.view,arch_db:fetchmail.view_email_server_form msgid "Test & Confirm" -msgstr "Test & Conferma" +msgstr "Prova e conferma" #. module: fetchmail #: model:ir.model.fields,field_description:fetchmail.field_fetchmail_server__user diff --git a/addons/fleet/i18n/cs.po b/addons/fleet/i18n/cs.po index 75c03188aff..71935d03a20 100644 --- a/addons/fleet/i18n/cs.po +++ b/addons/fleet/i18n/cs.po @@ -8,8 +8,8 @@ # Martin Trigaux, 2018 # Jaroslav Helemik Nemec <nemec@helemik.cz>, 2018 # Michal Veselý <michal@veselyberanek.net>, 2018 -# trendspotter <j.podhorecky@volny.cz>, 2018 # Ladislav Tomm <tomm@helemik.cz>, 2018 +# trendspotter <j.podhorecky@volny.cz>, 2018 # msgid "" msgstr "" @@ -17,7 +17,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" "PO-Revision-Date: 2018-08-24 09:18+0000\n" -"Last-Translator: Ladislav Tomm <tomm@helemik.cz>, 2018\n" +"Last-Translator: trendspotter <j.podhorecky@volny.cz>, 2018\n" "Language-Team: Czech (https://www.transifex.com/odoo/teams/41243/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -154,7 +154,7 @@ msgstr "Asistence" #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__message_attachment_count #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__message_attachment_count msgid "Attachment Count" -msgstr "" +msgstr "Počet příloh" #. module: fleet #: model_terms:ir.ui.view,arch_db:fleet.fleet_vehicle_view_kanban diff --git a/addons/fleet/i18n/uk.po b/addons/fleet/i18n/uk.po index c08c7cecf1e..3b135e0c2d5 100644 --- a/addons/fleet/i18n/uk.po +++ b/addons/fleet/i18n/uk.po @@ -1594,7 +1594,7 @@ msgstr "Інше технічне обслуговування" #: selection:fleet.vehicle,activity_state:0 #: selection:fleet.vehicle.log.contract,activity_state:0 msgid "Overdue" -msgstr "Прострочено" +msgstr "Протерміновано" #. module: fleet #: model:fleet.service.type,name:fleet.type_service_34 diff --git a/addons/fleet/i18n/zh_CN.po b/addons/fleet/i18n/zh_CN.po index 8f9c42fba4e..5db84676ec8 100644 --- a/addons/fleet/i18n/zh_CN.po +++ b/addons/fleet/i18n/zh_CN.po @@ -15,6 +15,7 @@ # snow wang <147156565@qq.com>, 2018 # Martin Trigaux, 2018 # Jeffery CHEN Fan <jeffery9@gmail.com>, 2018 +# jian liu <lj1989419@gmail.com>, 2018 # msgid "" msgstr "" @@ -22,7 +23,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" "PO-Revision-Date: 2018-08-24 09:18+0000\n" -"Last-Translator: Jeffery CHEN Fan <jeffery9@gmail.com>, 2018\n" +"Last-Translator: jian liu <lj1989419@gmail.com>, 2018\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -670,7 +671,7 @@ msgstr "车门数量" #. module: fleet #: model:fleet.vehicle.state,name:fleet.fleet_vehicle_state_downgraded msgid "Downgraded" -msgstr "" +msgstr "信用等级下降" #. module: fleet #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle__driver_id @@ -1696,7 +1697,7 @@ msgstr "加油明细" #. module: fleet #: model:fleet.vehicle.state,name:fleet.fleet_vehicle_state_registered msgid "Registered" -msgstr "" +msgstr "已注册" #. module: fleet #: code:addons/fleet/models/fleet_vehicle_cost.py:209 @@ -2266,7 +2267,7 @@ msgstr "供应商" #. module: fleet #: model:fleet.vehicle.state,name:fleet.fleet_vehicle_state_waiting_list msgid "Waiting List" -msgstr "" +msgstr "等待清单" #. module: fleet #: model:ir.model.fields,field_description:fleet.field_fleet_vehicle_log_contract__days_left diff --git a/addons/gamification/i18n/cs.po b/addons/gamification/i18n/cs.po index 5affdbda5a8..6f37d037a24 100644 --- a/addons/gamification/i18n/cs.po +++ b/addons/gamification/i18n/cs.po @@ -480,7 +480,7 @@ msgstr "" #: model:ir.model.fields,field_description:gamification.field_gamification_badge__message_attachment_count #: model:ir.model.fields,field_description:gamification.field_gamification_challenge__message_attachment_count msgid "Attachment Count" -msgstr "" +msgstr "Počet příloh" #. module: gamification #: model:ir.model.fields,field_description:gamification.field_gamification_badge__rule_auth_user_ids diff --git a/addons/gamification/i18n/pt_BR.po b/addons/gamification/i18n/pt_BR.po index 9e081289929..ac3d0ac8ca9 100644 --- a/addons/gamification/i18n/pt_BR.po +++ b/addons/gamification/i18n/pt_BR.po @@ -3,23 +3,25 @@ # * gamification # # Translators: -# Rodrigo de Almeida Sottomaior Macedo <rmsolucoeseminformatic4@gmail.com>, 2018 -# Martin Trigaux, 2018 -# Mateus Lopes <mateus1@gmail.com>, 2018 # Adriel Kotviski <kotviski@gmail.com>, 2018 # falexandresilva <falexandresilva@gmail.com>, 2018 -# grazziano <gra.negocia@gmail.com>, 2018 # André Augusto Firmino Cordeiro <a.cordeito@gmail.com>, 2018 +# Rodrigo de Almeida Sottomaior Macedo <rmsolucoeseminformatic4@gmail.com>, 2018 +# Martin Trigaux, 2018 # Clemilton Clementino <clemylton@hotmail.com>, 2018 +# Mateus Lopes <mateus1@gmail.com>, 2018 +# grazziano <gra.negocia@gmail.com>, 2018 # guisantos23 <guisantos23@yahoo.com.br>, 2018 # Silmar <pinheirosilmar@gmail.com>, 2018 +# Emanuel Martins <emanuel.breno@gmail.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" -"PO-Revision-Date: 2018-10-08 06:49+0000\n" -"Last-Translator: Silmar <pinheirosilmar@gmail.com>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:18+0000\n" +"Last-Translator: Emanuel Martins <emanuel.breno@gmail.com>, 2018\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/odoo/teams/41243/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2157,7 +2159,7 @@ msgstr "Usuários" #. module: gamification #: selection:gamification.challenge,category:0 msgid "Website / Forum" -msgstr "" +msgstr "Site/fórum" #. module: gamification #: selection:gamification.challenge,period:0 diff --git a/addons/google_calendar/i18n/nb.po b/addons/google_calendar/i18n/nb.po index 0674a9f0bac..5acd98178d1 100644 --- a/addons/google_calendar/i18n/nb.po +++ b/addons/google_calendar/i18n/nb.po @@ -4,13 +4,15 @@ # # Translators: # Martin Trigaux, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: Martin Trigaux, 2018\n" +"PO-Revision-Date: 2018-08-24 09:18+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -100,7 +102,7 @@ msgstr "Client_key" #. module: google_calendar #: model:ir.model,name:google_calendar.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: google_calendar #. openerp-web diff --git a/addons/google_drive/i18n/nb.po b/addons/google_drive/i18n/nb.po index 76874bf9619..58092997abc 100644 --- a/addons/google_drive/i18n/nb.po +++ b/addons/google_drive/i18n/nb.po @@ -3,15 +3,17 @@ # * google_drive # # Translators: -# Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Martin Trigaux, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" -"PO-Revision-Date: 2018-10-08 06:49+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:18+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -76,7 +78,7 @@ msgstr "" #. module: google_drive #: model:ir.model,name:google_drive.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: google_drive #: model:ir.model.fields,field_description:google_drive.field_google_drive_config__create_uid diff --git a/addons/google_spreadsheet/i18n/nb.po b/addons/google_spreadsheet/i18n/nb.po index 52fb6872dda..398c1463bd0 100644 --- a/addons/google_spreadsheet/i18n/nb.po +++ b/addons/google_spreadsheet/i18n/nb.po @@ -4,13 +4,15 @@ # # Translators: # Martin Trigaux, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: Martin Trigaux, 2018\n" +"PO-Revision-Date: 2018-08-24 09:18+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,7 +30,7 @@ msgstr "Legg til i Google regneark" #. module: google_spreadsheet #: model:ir.model,name:google_spreadsheet.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: google_spreadsheet #: model:ir.model,name:google_spreadsheet.model_google_drive_config diff --git a/addons/hr/i18n/cs.po b/addons/hr/i18n/cs.po index 8a4b793a25f..fc7cddbbe28 100644 --- a/addons/hr/i18n/cs.po +++ b/addons/hr/i18n/cs.po @@ -202,7 +202,7 @@ msgstr "Archivováno" #: model:ir.model.fields,field_description:hr.field_hr_employee__message_attachment_count #: model:ir.model.fields,field_description:hr.field_hr_job__message_attachment_count msgid "Attachment Count" -msgstr "" +msgstr "Počet příloh" #. module: hr #: selection:mail.alias,alias_contact:0 @@ -1473,6 +1473,8 @@ msgid "" "The user will have access to the human resources configuration as well as " "statistic reports." msgstr "" +"Uživatel bude mít přístup k konfiguraci lidských zdrojů, stejně jako " +"statistické přehledy." #. module: hr #: model:ir.model.fields,help:hr.field_hr_employee__image diff --git a/addons/hr/i18n/nb.po b/addons/hr/i18n/nb.po index f606e8a5e3d..23075154a81 100644 --- a/addons/hr/i18n/nb.po +++ b/addons/hr/i18n/nb.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:48+0000\n" -"PO-Revision-Date: 2018-10-08 06:48+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:18+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -337,7 +339,7 @@ msgstr "Fullstendig navn" #. module: hr #: model:ir.model,name:hr.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: hr #: model:ir.ui.menu,name:hr.menu_human_resources_configuration diff --git a/addons/hr_attendance/i18n/nb.po b/addons/hr_attendance/i18n/nb.po index 93da517cdab..2f3181489c0 100644 --- a/addons/hr_attendance/i18n/nb.po +++ b/addons/hr_attendance/i18n/nb.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:18+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -233,7 +235,7 @@ msgstr "Firmalogo" #. module: hr_attendance #: model:ir.model,name:hr_attendance.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: hr_attendance #: model:ir.ui.menu,name:hr_attendance.menu_hr_attendance_settings diff --git a/addons/hr_attendance/i18n/pt_BR.po b/addons/hr_attendance/i18n/pt_BR.po index d0158b96ad7..ee85c068748 100644 --- a/addons/hr_attendance/i18n/pt_BR.po +++ b/addons/hr_attendance/i18n/pt_BR.po @@ -12,13 +12,15 @@ # André Augusto Firmino Cordeiro <a.cordeito@gmail.com>, 2018 # Marcos Abreu <marcoos.abreu@gmail.com>, 2018 # Silmar <pinheirosilmar@gmail.com>, 2018 +# Emanuel Martins <emanuel.breno@gmail.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: Silmar <pinheirosilmar@gmail.com>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:18+0000\n" +"Last-Translator: Emanuel Martins <emanuel.breno@gmail.com>, 2018\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/odoo/teams/41243/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -714,7 +716,7 @@ msgstr "Bem vindo ao" #: code:addons/hr_attendance/static/src/xml/attendance.xml:71 #, python-format msgid "Welcome!" -msgstr "" +msgstr "Bem vindo!" #. module: hr_attendance #: model:ir.model.fields,field_description:hr_attendance.field_hr_attendance__worked_hours diff --git a/addons/hr_contract/i18n/cs.po b/addons/hr_contract/i18n/cs.po index b5a3b04c83b..ad1ae2ef6f7 100644 --- a/addons/hr_contract/i18n/cs.po +++ b/addons/hr_contract/i18n/cs.po @@ -72,7 +72,7 @@ msgstr "Archivováno" #. module: hr_contract #: model:ir.model.fields,field_description:hr_contract.field_hr_contract__message_attachment_count msgid "Attachment Count" -msgstr "" +msgstr "Počet příloh" #. module: hr_contract #: selection:hr.contract,state:0 diff --git a/addons/hr_contract/i18n/nb.po b/addons/hr_contract/i18n/nb.po index 1c203b051d3..0db97af7123 100644 --- a/addons/hr_contract/i18n/nb.po +++ b/addons/hr_contract/i18n/nb.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-18 09:49+0000\n" -"PO-Revision-Date: 2018-09-18 09:49+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:18+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -206,7 +208,7 @@ msgstr "Visningsnavn" #. module: hr_contract #: model_terms:ir.ui.view,arch_db:hr_contract.hr_contract_view_kanban msgid "Dropdown menu" -msgstr "" +msgstr "Nedtrekksmeny" #. module: hr_contract #: model_terms:ir.ui.view,arch_db:hr_contract.hr_contract_view_kanban diff --git a/addons/hr_expense/i18n/cs.po b/addons/hr_expense/i18n/cs.po index b27ed9fd9bd..704a50e21c8 100644 --- a/addons/hr_expense/i18n/cs.po +++ b/addons/hr_expense/i18n/cs.po @@ -231,7 +231,7 @@ msgstr "" #: model:ir.model.fields,field_description:hr_expense.field_hr_expense__message_attachment_count #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet__message_attachment_count msgid "Attachment Count" -msgstr "" +msgstr "Počet příloh" #. module: hr_expense #: model:ir.model.fields,field_description:hr_expense.field_hr_expense_sheet__bank_journal_id diff --git a/addons/hr_expense/i18n/nb.po b/addons/hr_expense/i18n/nb.po index 611e3c6204e..4b4d40e64e9 100644 --- a/addons/hr_expense/i18n/nb.po +++ b/addons/hr_expense/i18n/nb.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:48+0000\n" -"PO-Revision-Date: 2018-10-08 06:48+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:18+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -279,7 +281,7 @@ msgstr "Firma denne journalen angår" #. module: hr_expense #: model:ir.model,name:hr_expense.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: hr_expense #: model:ir.ui.menu,name:hr_expense.menu_hr_expense_configuration diff --git a/addons/hr_expense/i18n/zh_CN.po b/addons/hr_expense/i18n/zh_CN.po index f80df695d0a..76a926e200a 100644 --- a/addons/hr_expense/i18n/zh_CN.po +++ b/addons/hr_expense/i18n/zh_CN.po @@ -3,9 +3,10 @@ # * hr_expense # # Translators: +# Martin Trigaux, 2018 # ChinaMaker <liuct@chinamaker.net>, 2018 # Jackie Zhang <jzh@odoo.com>, 2018 -# Martin Trigaux, 2018 +# Joshua Jan <popkar77@gmail.com>, 2018 # bower Guo <124358678@qq.com>, 2018 # p too <totopo@163.com>, 2018 # inspur qiuguodong <qiuguodong@inspur.com>, 2018 @@ -1607,4 +1608,4 @@ msgstr "千米" #: code:addons/hr_expense/models/hr_expense.py:159 #, python-format msgid "or send receipts by email to %s." -msgstr "或者通过电子邮件向 % 发送收据。" +msgstr "或者通过电子邮件向 %s 发送收据。" diff --git a/addons/hr_holidays/i18n/cs.po b/addons/hr_holidays/i18n/cs.po index 2bcf896bae6..0907e9f1095 100644 --- a/addons/hr_holidays/i18n/cs.po +++ b/addons/hr_holidays/i18n/cs.po @@ -687,7 +687,7 @@ msgstr "" #: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__message_attachment_count #: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__message_attachment_count msgid "Attachment Count" -msgstr "" +msgstr "Počet příloh" #. module: hr_holidays #: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__accrual_limit diff --git a/addons/hr_holidays/i18n/nb.po b/addons/hr_holidays/i18n/nb.po index 505b17584c2..a78b88457bd 100644 --- a/addons/hr_holidays/i18n/nb.po +++ b/addons/hr_holidays/i18n/nb.po @@ -3,16 +3,18 @@ # * hr_holidays # # Translators: -# Martin Trigaux, 2018 # Jan Pedro Tumusok <jpt@eyenetworks.no>, 2018 +# Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" -"PO-Revision-Date: 2018-10-08 06:49+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:19+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -978,7 +980,7 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:hr_holidays.hr_leave_allocation_view_kanban #: model_terms:ir.ui.view,arch_db:hr_holidays.hr_leave_view_kanban msgid "Dropdown menu" -msgstr "" +msgstr "Nedtrekksmeny" #. module: hr_holidays #: model_terms:ir.ui.view,arch_db:hr_holidays.hr_leave_allocation_view_form diff --git a/addons/hr_holidays/i18n/vi.po b/addons/hr_holidays/i18n/vi.po index 2d7d9d721e9..0f834cc76a3 100644 --- a/addons/hr_holidays/i18n/vi.po +++ b/addons/hr_holidays/i18n/vi.po @@ -761,7 +761,7 @@ msgstr "Lịch" #: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__can_approve #: model:ir.model.fields,field_description:hr_holidays.field_hr_leave_allocation__can_approve msgid "Can Approve" -msgstr "" +msgstr "Có thể phê duyệt" #. module: hr_holidays #: model:ir.model.fields,field_description:hr_holidays.field_hr_leave__can_reset diff --git a/addons/hr_holidays/models/hr_leave.py b/addons/hr_holidays/models/hr_leave.py index 3adb808df6a..c76b0b832ed 100644 --- a/addons/hr_holidays/models/hr_leave.py +++ b/addons/hr_holidays/models/hr_leave.py @@ -360,7 +360,8 @@ class HolidaysRequest(models.Model): def _compute_number_of_hours_display(self): for holiday in self: calendar = holiday.employee_id.resource_calendar_id or self.env.user.company_id.resource_calendar_id - holiday.number_of_hours_display = holiday.number_of_days * (calendar.hours_per_day or HOURS_PER_DAY) + number_of_hours = calendar.get_work_hours_count(self.date_from, self.date_to) + holiday.number_of_hours_display = number_of_hours or (holiday.number_of_days * HOURS_PER_DAY) @api.multi @api.depends('state', 'employee_id', 'department_id') diff --git a/addons/hr_payroll/i18n/nb.po b/addons/hr_payroll/i18n/nb.po index 507691b3f75..ff501e292a3 100644 --- a/addons/hr_payroll/i18n/nb.po +++ b/addons/hr_payroll/i18n/nb.po @@ -4,13 +4,15 @@ # # Translators: # Martin Trigaux, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:48+0000\n" -"PO-Revision-Date: 2018-10-08 06:48+0000\n" -"Last-Translator: Martin Trigaux, 2018\n" +"PO-Revision-Date: 2018-08-24 09:19+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -376,7 +378,7 @@ msgstr "Vilkår" #. module: hr_payroll #: model:ir.model,name:hr_payroll.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: hr_payroll #: model:ir.ui.menu,name:hr_payroll.menu_hr_payroll_configuration diff --git a/addons/hr_recruitment/i18n/cs.po b/addons/hr_recruitment/i18n/cs.po index d5f94b158b0..ead6456bba8 100644 --- a/addons/hr_recruitment/i18n/cs.po +++ b/addons/hr_recruitment/i18n/cs.po @@ -489,7 +489,7 @@ msgstr "Přiřazeno" #. module: hr_recruitment #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant__message_attachment_count msgid "Attachment Count" -msgstr "" +msgstr "Počet příloh" #. module: hr_recruitment #: model:ir.model.fields,field_description:hr_recruitment.field_hr_applicant__attachment_ids diff --git a/addons/hr_recruitment/i18n/nb.po b/addons/hr_recruitment/i18n/nb.po index 6f2f4616968..e6397738f18 100644 --- a/addons/hr_recruitment/i18n/nb.po +++ b/addons/hr_recruitment/i18n/nb.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:19+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -576,7 +578,7 @@ msgstr "Firma" #. module: hr_recruitment #: model:ir.model,name:hr_recruitment.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: hr_recruitment #: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_configuration @@ -799,7 +801,7 @@ msgstr "" #. module: hr_recruitment #: model_terms:ir.ui.view,arch_db:hr_recruitment.hr_kanban_view_applicant msgid "Dropdown menu" -msgstr "" +msgstr "Nedtrekksmeny" #. module: hr_recruitment #: model_terms:ir.ui.view,arch_db:hr_recruitment.view_hr_job_kanban diff --git a/addons/hr_timesheet/i18n/nb.po b/addons/hr_timesheet/i18n/nb.po index 8d5539bf74d..da6e4855442 100644 --- a/addons/hr_timesheet/i18n/nb.po +++ b/addons/hr_timesheet/i18n/nb.po @@ -3,15 +3,17 @@ # * hr_timesheet # # Translators: -# Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Martin Trigaux, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:19+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -155,7 +157,7 @@ msgstr "Beregnet ved sum av oppgaver fullført." #. module: hr_timesheet #: model:ir.model,name:hr_timesheet.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: hr_timesheet #: model:ir.ui.menu,name:hr_timesheet.hr_timesheet_menu_configuration @@ -234,7 +236,7 @@ msgstr "Grupper etter" #. module: hr_timesheet #: model:ir.model,name:hr_timesheet.model_ir_http msgid "HTTP Routing" -msgstr "" +msgstr "HTTP-ruting" #. module: hr_timesheet #: model:ir.model.fields,field_description:hr_timesheet.field_project_task__effective_hours diff --git a/addons/http_routing/i18n/nb.po b/addons/http_routing/i18n/nb.po index 8c435c2f822..001468f71b9 100644 --- a/addons/http_routing/i18n/nb.po +++ b/addons/http_routing/i18n/nb.po @@ -4,13 +4,15 @@ # # Translators: # Martin Trigaux, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:18+0000\n" -"PO-Revision-Date: 2018-09-21 13:18+0000\n" -"Last-Translator: Martin Trigaux, 2018\n" +"PO-Revision-Date: 2018-08-24 09:19+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +23,7 @@ msgstr "" #. module: http_routing #: model:ir.model,name:http_routing.model_ir_http msgid "HTTP Routing" -msgstr "" +msgstr "HTTP-ruting" #. module: http_routing #: model:ir.model,name:http_routing.model_ir_ui_view diff --git a/addons/im_livechat/i18n/cs.po b/addons/im_livechat/i18n/cs.po index 23ef27cd3f5..34fa66c1ede 100644 --- a/addons/im_livechat/i18n/cs.po +++ b/addons/im_livechat/i18n/cs.po @@ -109,7 +109,7 @@ msgstr "" #. module: im_livechat #: model:ir.model,name:im_livechat.model_ir_autovacuum msgid "Automatic Vacuum" -msgstr "" +msgstr "Automatické vysávání" #. module: im_livechat #: model_terms:ir.ui.view,arch_db:im_livechat.mail_channel_view_form diff --git a/addons/im_livechat/i18n/zh_CN.po b/addons/im_livechat/i18n/zh_CN.po index db01ce30a6f..53ea7ba4461 100644 --- a/addons/im_livechat/i18n/zh_CN.po +++ b/addons/im_livechat/i18n/zh_CN.po @@ -12,6 +12,7 @@ # inspur qiuguodong <qiuguodong@inspur.com>, 2018 # snow wang <147156565@qq.com>, 2018 # Jeffery CHEN Fan <jeffery9@gmail.com>, 2018 +# jian liu <lj1989419@gmail.com>, 2018 # msgid "" msgstr "" @@ -19,7 +20,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:18+0000\n" "PO-Revision-Date: 2018-08-24 09:19+0000\n" -"Last-Translator: Jeffery CHEN Fan <jeffery9@gmail.com>, 2018\n" +"Last-Translator: jian liu <lj1989419@gmail.com>, 2018\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -371,6 +372,7 @@ msgid "" "module. Then go to Website > Configuration > Settings and select the " "Website Live Chat Channel you want to add on your website." msgstr "" +"为网站建立Odoo CMS，请安装website_livechat模块。然后点击网站>配置>设置,在你的网站上选择您想要添加的即时聊天频道。" #. module: im_livechat #: model:ir.model.fields,help:im_livechat.field_im_livechat_channel_rule__sequence diff --git a/addons/im_livechat_mail_bot/i18n/nb.po b/addons/im_livechat_mail_bot/i18n/nb.po index 84a9b8c875c..f3c6360859b 100644 --- a/addons/im_livechat_mail_bot/i18n/nb.po +++ b/addons/im_livechat_mail_bot/i18n/nb.po @@ -4,13 +4,15 @@ # # Translators: # Martin Trigaux, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-02 10:05+0000\n" -"PO-Revision-Date: 2018-10-02 10:05+0000\n" -"Last-Translator: Martin Trigaux, 2018\n" +"PO-Revision-Date: 2018-08-24 09:20+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +23,7 @@ msgstr "" #. module: im_livechat_mail_bot #: selection:res.users,odoobot_state:0 msgid "Disabled" -msgstr "" +msgstr "Deaktivert" #. module: im_livechat_mail_bot #: code:addons/im_livechat_mail_bot/models/mail_bot.py:18 diff --git a/addons/im_support/i18n/nb.po b/addons/im_support/i18n/nb.po index 33c53bacb97..a1f805f93be 100644 --- a/addons/im_support/i18n/nb.po +++ b/addons/im_support/i18n/nb.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:20+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,7 +31,7 @@ msgstr "" #. module: im_support #: model:ir.model,name:im_support.model_ir_http msgid "HTTP Routing" -msgstr "" +msgstr "HTTP-ruting" #. module: im_support #: model_terms:ir.ui.view,arch_db:im_support.support_qunit_suite diff --git a/addons/l10n_be/data/account_pcmn_belgium_data.xml b/addons/l10n_be/data/account_pcmn_belgium_data.xml index 46cb04d8da8..6a6d107fa4c 100644 --- a/addons/l10n_be/data/account_pcmn_belgium_data.xml +++ b/addons/l10n_be/data/account_pcmn_belgium_data.xml @@ -558,6 +558,7 @@ <record id="a4512" model="account.account.template"> <field name="name">Compte courant administration T.V.A.</field> <field name="code">4512</field> + <field name="reconcile" eval="True"/> <field name="user_type_id" ref="account.data_account_type_current_liabilities"/> <field name="chart_template_id" ref="l10nbe_chart_template"/> </record> diff --git a/addons/lunch/i18n/pt_BR.po b/addons/lunch/i18n/pt_BR.po index 0d5aeaeb9ca..539b1ec2e8e 100644 --- a/addons/lunch/i18n/pt_BR.po +++ b/addons/lunch/i18n/pt_BR.po @@ -13,6 +13,7 @@ # André Augusto Firmino Cordeiro <a.cordeito@gmail.com>, 2018 # guisantos23 <guisantos23@yahoo.com.br>, 2018 # Marcelo Costa <marcelo@comdesk.com.br>, 2018 +# Rafael H L Moretti <rafael.moretti@gmail.com>, 2018 # msgid "" msgstr "" @@ -20,7 +21,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:18+0000\n" "PO-Revision-Date: 2018-08-24 09:20+0000\n" -"Last-Translator: Marcelo Costa <marcelo@comdesk.com.br>, 2018\n" +"Last-Translator: Rafael H L Moretti <rafael.moretti@gmail.com>, 2018\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/odoo/teams/41243/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -621,7 +622,7 @@ msgstr "" #. module: lunch #: model:ir.actions.server,name:lunch.action_server_lunch_archive_product msgid "Lunch: Archive/Restore products" -msgstr "" +msgstr "Almoço: Arquivar/Restaurar produtos" #. module: lunch #: model:ir.actions.server,name:lunch.lunch_order_line_action_cancel diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml index 9553cc5b69e..05e61a912dd 100644 --- a/addons/mail/data/mail_data.xml +++ b/addons/mail/data/mail_data.xml @@ -169,7 +169,7 @@ <td align="center" style="min-width: 590px;"> <table border="0" cellpadding="0" cellspacing="0" width="100%" style="background-color: white; padding: 0; border-collapse:separate;"> <tr><td valign="middle"> - <span style="font-size: 10px;">Your <t t-esc="'%s' % model_description or 'document'"/></span><br/> + <span style="font-size: 10px;">Your <t t-esc="model_description or 'document'"/></span><br/> <span style="font-size: 20px; font-weight: bold;"> <t t-esc="message.record_name and message.record_name.replace('/','-') or ''"/> </span> @@ -233,11 +233,11 @@ <t t-set="is_online" t-value="access_action and access_action['type'] == 'ir.actions.act_url'"/> <t t-set="access_url" t-value="is_online and record._get_share_url(redirect=True, signup_partner=True) or ''"/> <t t-set="access_name"> - View <t t-esc="record._description.lower()"/> + View <t t-esc="model_description or 'document'"/> </t> <table border="0" cellpadding="0" cellspacing="0" width="100%" style="background-color: white; padding: 0; border-collapse:separate;"> <tr><td valign="middle"> - <span style="font-size: 10px;">Your <t t-esc="'%s' % model_description or 'document'"/></span><br/> + <span style="font-size: 10px;">Your <t t-esc="model_description or 'document'"/></span><br/> <span style="font-size: 20px; font-weight: bold;"> <t t-esc="message.record_name"/> </span> @@ -301,11 +301,11 @@ <template id="message_user_assigned"> <p style="margin: 0px;"> <span>Dear <t t-esc="object.user_id.sudo().name"/>,</span><br /> - <span style="margin-top: 8px;">You have been assigned to the <t t-esc="object._description.lower()"/> <t t-esc="object.display_name"/>.</span> + <span style="margin-top: 8px;">You have been assigned to the <t t-esc="model_description or 'document'"/> <t t-esc="object.display_name"/>.</span> </p> <p style="margin-top: 24px; margin-bottom: 16px;"> <a t-att-href="'/mail/view?model=%s&res_id=%s' % (object._name, object.id)" style="background-color:#875A7B; padding: 10px; text-decoration: none; color: #fff; border-radius: 5px;"> - View <t t-esc="object._description.lower()"/> + View <t t-esc="model_description or 'document'"/> </a> </p> </template> diff --git a/addons/mail/i18n/cs.po b/addons/mail/i18n/cs.po index 92a815ef29d..a9cd7a68cbe 100644 --- a/addons/mail/i18n/cs.po +++ b/addons/mail/i18n/cs.po @@ -43,7 +43,7 @@ msgstr "%d Zprávy" #: code:addons/mail/static/src/js/activity.js:89 #, python-format msgid "%d days overdue" -msgstr "" +msgstr "%d dnů po splatnosti" #. module: mail #: code:addons/mail/models/mail_template.py:249 @@ -129,7 +129,7 @@ msgstr "0 budoucích" #: code:addons/mail/static/src/xml/systray.xml:95 #, python-format msgid "0 Late" -msgstr "" +msgstr "0 Pozdě" #. module: mail #. openerp-web @@ -357,14 +357,14 @@ msgstr "Přijmout" #: code:addons/mail/static/src/xml/discuss.xml:185 #, python-format msgid "Accept selected messages" -msgstr "" +msgstr "Přijmout vybrané zprávy" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/thread.xml:412 #, python-format msgid "Accept |" -msgstr "" +msgstr "Přijmout |" #. module: mail #: selection:mail.compose.message,moderation_status:0 @@ -393,7 +393,7 @@ msgstr "Akce k provedení" #. module: mail #: model:ir.model,name:mail.model_ir_actions_act_window_view msgid "Action Window View" -msgstr "" +msgstr "Zobrazení okna akcí" #. module: mail #: model:ir.model.fields,help:mail.field_mail_message_subtype__default @@ -446,7 +446,7 @@ msgstr "Činnost" #. module: mail #: model:ir.model,name:mail.model_mail_activity_mixin msgid "Activity Mixin" -msgstr "" +msgstr "Aktivita Mixin" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_activity_mixin__activity_state @@ -470,14 +470,14 @@ msgstr "Typy aktivit" #. module: mail #: model:ir.model.fields,field_description:mail.field_ir_actions_server__activity_user_type msgid "Activity User Type" -msgstr "" +msgstr "Typ uživatelské aktivity" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/activity.xml:37 #, python-format msgid "Activity type" -msgstr "" +msgstr "Typ aktivity" #. module: mail #. openerp-web @@ -497,7 +497,7 @@ msgstr "Přidat kanály" #. module: mail #: model_terms:ir.ui.view,arch_db:mail.mail_blacklist_view_form msgid "Add Email Blacklist" -msgstr "" +msgstr "Přidat email na Blacklist" #. module: mail #. openerp-web @@ -521,7 +521,7 @@ msgstr "" #: model:ir.model.fields,field_description:mail.field_mail_mail__add_sign #: model:ir.model.fields,field_description:mail.field_mail_message__add_sign msgid "Add Sign" -msgstr "" +msgstr "Přidat podpis" #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview__user_signature @@ -553,19 +553,19 @@ msgstr "Přidejte soukromý kanál" #. module: mail #: model_terms:ir.actions.act_window,help:mail.mail_blacklist_action msgid "Add an email address in the blacklist" -msgstr "" +msgstr "Přidat e-mailovou adresu do černé listiny " #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/composer.xml:15 #, python-format msgid "Add attachment" -msgstr "" +msgstr "Přidat přílohu" #. module: mail #: model_terms:ir.ui.view,arch_db:mail.mail_wizard_invite_form msgid "Add channels to notify..." -msgstr "" +msgstr "Přidat kanály k oznámení ..." #. module: mail #: model_terms:ir.ui.view,arch_db:mail.email_compose_message_wizard_form @@ -578,7 +578,7 @@ msgstr "Přidat kontakt pro upozornění..." #: code:addons/mail/static/src/xml/thread.xml:418 #, python-format msgid "Add this email address to white list of people" -msgstr "" +msgstr "Přidat tuto e-mailovou adresu na bílý seznam osob" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message__partner_ids @@ -605,7 +605,7 @@ msgstr "Po" #: code:addons/mail/static/src/xml/followers.xml:26 #, python-format msgid "Alarm menu" -msgstr "" +msgstr "Nabídka výstrahy" #. module: mail #: selection:mail.activity.type,decoration_type:0 @@ -674,12 +674,12 @@ msgstr "Vše" #: code:addons/mail/static/src/xml/thread.xml:46 #, python-format msgid "All pages: " -msgstr "" +msgstr "Všechny stránky: " #. module: mail #: model_terms:ir.ui.view,arch_db:mail.mail_moderation_view_search msgid "Allowed Emails" -msgstr "" +msgstr "Povolené e-maily" #. module: mail #: selection:ir.model.fields,track_visibility:0 @@ -696,14 +696,14 @@ msgstr "Vždy povolit" #: code:addons/mail/static/src/xml/thread.xml:418 #, python-format msgid "Always Allow |" -msgstr "" +msgstr "Vždy povolit |" #. module: mail #. openerp-web #: code:addons/mail/static/src/js/models/mail_failure.js:80 #, python-format msgid "An error occured when sending an email" -msgstr "" +msgstr "Při odesílání e-mailu došlo k chybě" #. module: mail #. openerp-web @@ -784,7 +784,7 @@ msgstr "Příloha" #: model:ir.model.fields,field_description:mail.field_mail_thread__message_attachment_count #: model:ir.model.fields,field_description:mail.field_res_partner__message_attachment_count msgid "Attachment Count" -msgstr "" +msgstr "Počet příloh" #. module: mail #. openerp-web @@ -867,12 +867,12 @@ msgstr "Automatické vymazání" #: model:ir.model.fields,field_description:mail.field_mail_activity__force_next #: model:ir.model.fields,field_description:mail.field_mail_activity_type__force_next msgid "Auto Schedule Next Activity" -msgstr "" +msgstr "Automatické naplánování další aktivity" #. module: mail #: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Auto Subscribe Groups" -msgstr "" +msgstr "Automatický odběr skupin" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel__group_ids @@ -882,17 +882,17 @@ msgstr "Automatický odběr" #. module: mail #: model_terms:ir.ui.view,arch_db:mail.view_mail_message_subtype_form msgid "Auto subscription" -msgstr "" +msgstr "Automatický odběr" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_activity__automated msgid "Automated activity" -msgstr "" +msgstr "Automatizovaná činnost" #. module: mail #: model:ir.model,name:mail.model_ir_autovacuum msgid "Automatic Vacuum" -msgstr "" +msgstr "Automatické vysávání" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel__moderation_notify @@ -912,36 +912,36 @@ msgstr "Avatar" #: code:addons/mail/static/src/xml/thread.xml:420 #, python-format msgid "Ban" -msgstr "" +msgstr "Ban (zákaz)" #. module: mail #: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Ban List" -msgstr "" +msgstr "Seznam banů (zákazů)" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/thread.xml:420 #, python-format msgid "Ban this email address" -msgstr "" +msgstr "Zakázat tuto e-mailovou adresu" #. module: mail #: model_terms:ir.ui.view,arch_db:mail.mail_moderation_view_search msgid "Banned Emails" -msgstr "" +msgstr "Zakázané e-maily" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/followers.xml:90 #, python-format msgid "Be careful with channels following internal notifications" -msgstr "" +msgstr "Buďte opatrní s kanály sledující interní upozornění" #. module: mail #: model_terms:ir.ui.view,arch_db:mail.mail_notification_paynow msgid "Best regards," -msgstr "" +msgstr "S pozdravem," #. module: mail #: model:ir.actions.act_window,name:mail.mail_blacklist_action @@ -954,7 +954,7 @@ msgstr "Černá listina" #. module: mail #: model_terms:ir.ui.view,arch_db:mail.mail_blacklist_view_tree msgid "Blacklist Date" -msgstr "" +msgstr "Datum Blacklistu" #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview__body_html @@ -1009,7 +1009,7 @@ msgstr "Zrušit e-mail" #. module: mail #: model_terms:ir.ui.view,arch_db:mail.mail_resend_cancel_view_form msgid "Cancel notification in failure" -msgstr "" +msgstr "Zrušit oznámení v případě selhání" #. module: mail #. openerp-web @@ -1050,6 +1050,8 @@ msgstr "" #: model:ir.model.fields,help:mail.field_mail_activity_type__category msgid "Categories may trigger specific behavior like opening calendar view" msgstr "" +"Kategorie mohou vyvolat určité chování, například otevření zobrazení " +"kalendáře" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_activity__activity_category @@ -1073,7 +1075,7 @@ msgstr "Změnit" #: model:ir.model.fields,help:mail.field_mail_activity__activity_decoration #: model:ir.model.fields,help:mail.field_mail_activity_type__decoration_type msgid "Change the background color of the related activities of this type." -msgstr "" +msgstr "Změnit barvu pozadí souvisejících aktivit tohoto typu." #. module: mail #. openerp-web @@ -1283,7 +1285,7 @@ msgstr "Gratulujeme, vaše schránka je prázdná!" #. module: mail #: selection:mail.notification,failure_type:0 msgid "Connection failed (outgoing mail server problem)" -msgstr "" +msgstr "Připojení se nezdařilo (problém s odesílajícím poštovním serverem)" #. module: mail #: model:ir.model,name:mail.model_res_partner @@ -1318,7 +1320,7 @@ msgstr "" #: code:addons/mail/static/src/xml/systray.xml:9 #, python-format msgid "Conversations" -msgstr "" +msgstr "Konverzace" #. module: mail #: model:ir.model.fields,help:mail.field_res_partner__message_bounce @@ -1335,7 +1337,7 @@ msgstr "" #. module: mail #: selection:ir.actions.server,state:0 msgid "Create Next Activity" -msgstr "" +msgstr "Vytvořtit další aktivitu" #. module: mail #: code:addons/mail/models/mail_thread.py:400 @@ -1433,7 +1435,7 @@ msgstr "" #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel__is_moderator msgid "Current user is a moderator of the channel" -msgstr "" +msgstr "Současný uživatel je moderátorem kanálu" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message__date @@ -1482,7 +1484,7 @@ msgstr "Výchozí" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_activity_type__default_next_type_id msgid "Default Next Activity" -msgstr "" +msgstr "Výchozí další aktivita" #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview__null_value @@ -1515,7 +1517,7 @@ msgstr "" #. module: mail #: model_terms:ir.actions.act_window,help:mail.mail_shortcode_action msgid "Define a new chat shortcode" -msgstr "" +msgstr "Definovat nový zkrácený kód chatu" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_activity_type__delay_from @@ -1543,7 +1545,7 @@ msgstr "Smazat emaily" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message__auto_delete_message msgid "Delete Message Copy" -msgstr "" +msgstr "Odstranit kopii zprávy" #. module: mail #: model:ir.model.fields,help:mail.field_mail_compose_message__auto_delete @@ -1603,7 +1605,7 @@ msgstr "" #. module: mail #: model:ir.actions.act_window,name:mail.mail_resend_cancel_action msgid "Discard mail delivery failures" -msgstr "" +msgstr "Zrušit selhání doručení pošty" #. module: mail #. openerp-web @@ -1840,7 +1842,7 @@ msgstr "" #. module: mail #: model_terms:ir.ui.view,arch_db:mail.mail_blacklist_view_tree msgid "Email Blacklist" -msgstr "" +msgstr "Email Blacklist" #. module: mail #: model_terms:ir.ui.view,arch_db:mail.email_template_form @@ -1885,7 +1887,7 @@ msgstr "Emailové vlákno" #. module: mail #: sql_constraint:mail.blacklist:0 msgid "Email address already exists!" -msgstr "" +msgstr "Emailová adresa již existuje!" #. module: mail #: model:ir.model.fields,help:mail.field_res_users__alias_id @@ -1904,16 +1906,18 @@ msgid "" "Email address of the sender. This field is set when no matching partner is " "found and replaces the author_id field in the chatter." msgstr "" +"E-mailová adresa odesílatele. Toto pole je nastaveno, pokud nebyl nalezen " +"žádný odpovídající partner a nahrazuje pole autor_id v chatu." #. module: mail #: selection:mail.notification,failure_type:0 msgid "Email address rejected by destination" -msgstr "" +msgstr "E-mailová adresa byla zamítnuta podle cíle" #. module: mail #: model_terms:ir.ui.view,arch_db:mail.email_compose_message_wizard_form msgid "Email address to redirect replies..." -msgstr "" +msgstr "E-mailová adresa pro přesměrování odpovědí ..." #. module: mail #: model_terms:ir.actions.act_window,help:mail.mail_blacklist_action @@ -1921,6 +1925,8 @@ msgid "" "Email addresses that are blacklisted means that the recipient won't receive " "any mass mailing anymore." msgstr "" +"E-mailové adresy, které jsou na černé listině, znamenají, že příjemce již " +"nebude přijímat žádné hromadné poštovní zásilky." #. module: mail #: model:ir.model,name:mail.model_mail_compose_message @@ -1955,7 +1961,7 @@ msgstr "" #. module: mail #: model_terms:ir.ui.view,arch_db:mail.mail_resend_cancel_view_form msgid "Envelope Example" -msgstr "" +msgstr "Příklad obálky" #. module: mail #. openerp-web @@ -1978,6 +1984,8 @@ msgid "" "Error without exception. Probably due do sending an email without computed " "recipients." msgstr "" +"Chyba bez výjimky. Pravděpodobně kvůli odeslání e-mailu bez vypočtených " +"příjemců." #. module: mail #: sql_constraint:mail.followers:0 @@ -3492,7 +3500,7 @@ msgstr "" #: code:addons/mail/static/src/xml/discuss.xml:181 #, python-format msgid "New Message" -msgstr "" +msgstr "Nová zpráva" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_tracking_value__new_value_char @@ -4645,7 +4653,7 @@ msgstr "" #. module: mail #: selection:mail.channel,public:0 msgid "Selected group of users" -msgstr "" +msgstr "Vybraná skupina uživatelů" #. module: mail #. openerp-web @@ -5627,7 +5635,7 @@ msgstr "" #. module: mail #: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Who can follow the group's activities?" -msgstr "" +msgstr "Kdo může sledovat aktivity skupiny?" #. module: mail #. openerp-web diff --git a/addons/mail/i18n/it.po b/addons/mail/i18n/it.po index 65bc64c0722..28ac325cb7f 100644 --- a/addons/mail/i18n/it.po +++ b/addons/mail/i18n/it.po @@ -3,7 +3,6 @@ # * mail # # Translators: -# p_amoruso <p.amoruso@elvenstudio.it>, 2018 # Marius Marolla <mariusmarolla@entersys.it>, 2018 # Leonardo Donelli <learts92@gmail.com>, 2018 # Sebastiano Pistore <SebastianoPistore.info@protonmail.ch>, 2018 @@ -12,7 +11,6 @@ # Cesare Cugnasco <cesare.cugnasco@gmail.com>, 2018 # Christian <chris@effeci.info>, 2018 # Fabio Genovese <ing.fabiogenovese@gmail.com>, 2018 -# Sergio Zanchetta <primes2h@gmail.com>, 2018 # Lorenzo Battistini <lorenzo.battistini@agilebg.com>, 2018 # Giacomo Grasso <giacomo.grasso.82@gmail.com>, 2018 # Giovanni Perteghella <giovanni@perteghella.org>, 2018 @@ -27,6 +25,7 @@ # Léonie Bouchat <lbo@odoo.com>, 2018 # Simone Bernini <simone@aperturelabs.it>, 2018 # efraimbiffi <eab@odoo.com>, 2018 +# Sergio Zanchetta <primes2h@gmail.com>, 2018 # msgid "" msgstr "" @@ -34,7 +33,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" "PO-Revision-Date: 2018-08-24 09:20+0000\n" -"Last-Translator: efraimbiffi <eab@odoo.com>, 2018\n" +"Last-Translator: Sergio Zanchetta <primes2h@gmail.com>, 2018\n" "Language-Team: Italian (https://www.transifex.com/odoo/teams/41243/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -468,7 +467,7 @@ msgstr "Azione Da Fare" #. module: mail #: model:ir.model,name:mail.model_ir_actions_act_window_view msgid "Action Window View" -msgstr "" +msgstr "Vista finestra azione" #. module: mail #: model:ir.model.fields,help:mail.field_mail_message_subtype__default @@ -567,7 +566,7 @@ msgstr "Aggiungi" #: model:ir.model.fields,field_description:mail.field_ir_actions_server__channel_ids #, python-format msgid "Add Channels" -msgstr "Aggiungi Canali" +msgstr "Canali da aggiungere" #. module: mail #: model_terms:ir.ui.view,arch_db:mail.mail_blacklist_view_form @@ -1414,7 +1413,7 @@ msgstr "Crea %s" #. module: mail #: selection:ir.actions.server,state:0 msgid "Create Next Activity" -msgstr "Crea un'attività" +msgstr "Creare attività successiva" #. module: mail #: code:addons/mail/models/mail_thread.py:400 @@ -1946,17 +1945,17 @@ msgstr "Email Status" #. module: mail #: model:ir.model.fields,field_description:mail.field_ir_actions_server__template_id msgid "Email Template" -msgstr "Template Email" +msgstr "Modello email" #. module: mail #: model:ir.model,name:mail.model_email_template_preview msgid "Email Template Preview" -msgstr "Anteprima Template email" +msgstr "Anteprima modello email" #. module: mail #: model:ir.model,name:mail.model_mail_template msgid "Email Templates" -msgstr "Modelli di Email" +msgstr "Modelli email" #. module: mail #: model:ir.model,name:mail.model_mail_thread @@ -2384,12 +2383,12 @@ msgstr "" #. module: mail #: selection:res.users,notification_type:0 msgid "Handle by Emails" -msgstr "Gestisci per Email" +msgstr "Gestire con email" #. module: mail #: selection:res.users,notification_type:0 msgid "Handle in Odoo" -msgstr "Gestisci in Odoo" +msgstr "Gestire in Odoo" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_resend_message__has_cancel @@ -3125,7 +3124,7 @@ msgstr "" #: model:ir.cron,cron_name:mail.ir_cron_mail_scheduler_action #: model:ir.cron,name:mail.ir_cron_mail_scheduler_action msgid "Mail: Email Queue Manager" -msgstr "Mail: gestione mail in coda" +msgstr "Email: gestore coda email" #. module: mail #: model:ir.actions.server,name:mail.ir_cron_mail_notify_channel_moderators_ir_actions_server @@ -3814,7 +3813,7 @@ msgstr "Notifica" #. module: mail #: model:ir.model.fields,field_description:mail.field_res_users__notification_type msgid "Notification Management" -msgstr "Gestione Notifiche" +msgstr "Gestione notifiche" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel__moderation_notify_msg @@ -4821,7 +4820,7 @@ msgstr "Invia di nuovo" #: selection:ir.actions.server,state:0 #: model:ir.model.fields,field_description:mail.field_mail_wizard_invite__send_mail msgid "Send Email" -msgstr "Invia Email" +msgstr "Inviare email" #. module: mail #: code:addons/mail/models/mail_template.py:265 diff --git a/addons/mail/i18n/ja.po b/addons/mail/i18n/ja.po index aa8196f0512..1ec078ff85d 100644 --- a/addons/mail/i18n/ja.po +++ b/addons/mail/i18n/ja.po @@ -4206,7 +4206,7 @@ msgstr "プレビュー:" #: code:addons/mail/static/src/xml/thread.xml:92 #, python-format msgid "Previous" -msgstr "" +msgstr "前" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_activity__previous_activity_type_id diff --git a/addons/mail/i18n/mail.pot b/addons/mail/i18n/mail.pot index 80b1399e139..c6b2c731738 100644 --- a/addons/mail/i18n/mail.pot +++ b/addons/mail/i18n/mail.pot @@ -5441,6 +5441,12 @@ msgid "You cannot delete those groups, as the Whole Company group is required by msgstr "" #. module: mail +#: code:addons/mail/models/mail_thread.py:2358 +#, python-format +msgid "You have been assigned to %s" +msgstr "" + +#. module: mail #: model_terms:ir.ui.view,arch_db:mail.message_user_assigned msgid "You have been assigned to the" msgstr "" diff --git a/addons/mail/i18n/nb.po b/addons/mail/i18n/nb.po index cd6136b6643..8c037adcd72 100644 --- a/addons/mail/i18n/nb.po +++ b/addons/mail/i18n/nb.po @@ -5,6 +5,7 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 # msgid "" msgstr "" @@ -12,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" "PO-Revision-Date: 2018-08-24 09:20+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1258,7 +1259,7 @@ msgstr "Skrivemodus" #. module: mail #: model:ir.model,name:mail.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: mail #: model_terms:ir.ui.view,arch_db:mail.res_config_settings_view_form @@ -2817,7 +2818,7 @@ msgstr "Forsinkede aktiviteter" #: model:ir.model.fields,field_description:mail.field_mail_mail__layout #: model:ir.model.fields,field_description:mail.field_mail_message__layout msgid "Layout" -msgstr "" +msgstr "Layout" #. module: mail #: model_terms:ir.ui.view,arch_db:mail.mail_channel_view_kanban @@ -4729,7 +4730,8 @@ msgstr "Sender meldinger som epost" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:397 +#: code:addons/mail/static/src/xml/thread.xml:390 +#: model_terms:ir.ui.view,arch_db:mail.message_notification_email #: model_terms:ir.ui.view,arch_db:mail.view_mail_search #: selection:mail.mail,state:0 selection:mail.notification,email_status:0 #, python-format @@ -5798,14 +5800,14 @@ msgstr "Malen din må definere email_from" #: code:addons/mail/static/src/xml/thread.xml:68 #, python-format msgid "Zoom In" -msgstr "" +msgstr "Zoom inn" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/thread.xml:70 #, python-format msgid "Zoom Out" -msgstr "" +msgstr "Zoom ut" #. module: mail #: selection:mail.activity.type,delay_from:0 @@ -5836,6 +5838,7 @@ msgstr "styremøter" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/activity.xml:43 +#: model_terms:ir.ui.view,arch_db:mail.message_notification_email #: model_terms:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "by" diff --git a/addons/mail/i18n/nl.po b/addons/mail/i18n/nl.po index b336900b6c2..07c2f1ebe8c 100644 --- a/addons/mail/i18n/nl.po +++ b/addons/mail/i18n/nl.po @@ -4180,7 +4180,7 @@ msgstr "Relatie met aanvullende informatie voor e-mail opnieuw verzenden" #: model:ir.model.fields,field_description:mail.field_mail_mail__needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_message__needaction_partner_ids msgid "Partners with Need Action" -msgstr "Relaties met Nodige Actie" +msgstr "Relaties met benodigde actie" #. module: mail #: selection:mail.compose.message,moderation_status:0 diff --git a/addons/mail/i18n/pt_BR.po b/addons/mail/i18n/pt_BR.po index c3cf930f640..201605ddfcd 100644 --- a/addons/mail/i18n/pt_BR.po +++ b/addons/mail/i18n/pt_BR.po @@ -22,6 +22,7 @@ # Yannick Belot <yannickbh@gmail.com>, 2018 # Marcel Savegnago <marcel.savegnago@gmail.com>, 2018 # Marcelo Costa <marcelo@comdesk.com.br>, 2018 +# Rafael H L Moretti <rafael.moretti@gmail.com>, 2018 # msgid "" msgstr "" @@ -29,7 +30,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" "PO-Revision-Date: 2018-08-24 09:20+0000\n" -"Last-Translator: Marcelo Costa <marcelo@comdesk.com.br>, 2018\n" +"Last-Translator: Rafael H L Moretti <rafael.moretti@gmail.com>, 2018\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/odoo/teams/41243/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -574,7 +575,7 @@ msgstr "" #: code:addons/mail/static/src/xml/discuss.xml:71 #, python-format msgid "Add a private channel" -msgstr "" +msgstr "Adicionar um canal privado" #. module: mail #: model_terms:ir.actions.act_window,help:mail.mail_blacklist_action @@ -1950,6 +1951,8 @@ msgid "" "Email addresses that are blacklisted means that the recipient won't receive " "any mass mailing anymore." msgstr "" +"Endereços de e-mail na lista negra significa que o destinatário não irá mais" +" receber nenhuma correspondência em massa." #. module: mail #: model:ir.model,name:mail.model_mail_compose_message @@ -5573,7 +5576,7 @@ msgstr "" #: code:addons/mail/static/src/xml/thread_window.xml:11 #, python-format msgid "User name" -msgstr "" +msgstr "Nome de usuário" #. module: mail #: model:ir.model,name:mail.model_res_users diff --git a/addons/mail/models/mail_activity.py b/addons/mail/models/mail_activity.py index b925f59b1be..893b6ea78af 100644 --- a/addons/mail/models/mail_activity.py +++ b/addons/mail/models/mail_activity.py @@ -332,7 +332,7 @@ class MailActivity(models.Model): def action_notify(self): body_template = self.env.ref('mail.message_activity_assigned') for activity in self: - model_description = self.env[activity.res_model]._description.lower() + model_description = self.env['ir.model']._get(activity.res_model).display_name body = body_template.render( dict(activity=activity, model_description=model_description), engine='ir.qweb', diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py index 20163ea15f3..a27a8464c9c 100644 --- a/addons/mail/models/mail_thread.py +++ b/addons/mail/models/mail_thread.py @@ -2340,18 +2340,20 @@ class MailThread(models.AbstractModel): view = self.env['ir.ui.view'].browse(self.env['ir.model.data'].xmlid_to_res_id(template)) for record in self: + model_description = self.env['ir.model']._get(record._name).display_name values = { 'object': record, + 'model_description': model_description, } assignation_msg = view.render(values, engine='ir.qweb', minimal_qcontext=True) assignation_msg = self.env['mail.thread']._replace_local_links(assignation_msg) record.message_notify( - subject='You have been assigned to %s' % record.display_name, + subject=_('You have been assigned to %s') % record.display_name, body=assignation_msg, partner_ids=[(4, pid) for pid in partner_ids], record_name=record.display_name, notif_layout='mail.mail_notification_light', - model_description=record._description.lower() + model_description=model_description, ) @api.multi diff --git a/addons/mail/models/res_partner.py b/addons/mail/models/res_partner.py index 32a2f4014bd..7ce819f799d 100644 --- a/addons/mail/models/res_partner.py +++ b/addons/mail/models/res_partner.py @@ -52,8 +52,16 @@ class Partner(models.Model): else: website_url = False + # Retrieve the language in which the template was rendered, in order to render the custom + # layout in the same language. + lang = self.env.context.get('lang') + if {'default_template_id', 'default_model', 'default_res_id'} <= self.env.context.keys(): + template = self.env['mail.template'].browse(self.env.context['default_template_id']) + if template and template.lang: + lang = template._render_template(template.lang, self.env.context['default_model'], self.env.context['default_res_id']) + if not model_description and message.model: - model_description = self.env['ir.model']._get(message.model).display_name + model_description = self.env['ir.model'].with_context(lang=lang)._get(message.model).display_name tracking = [] for tracking_value in self.env['mail.tracking.value'].sudo().search([('mail_message_id', '=', message.id)]): @@ -74,6 +82,7 @@ class Partner(models.Model): 'tracking_values': tracking, 'is_discussion': is_discussion, 'subtype': message.subtype_id, + 'lang': lang, } @api.model @@ -95,15 +104,14 @@ class Partner(models.Model): if not rdata: return True + base_template_ctx = self._notify_prepare_template_context(message, record, model_description=model_description) template_xmlid = message.layout if message.layout else 'mail.message_notification_email' try: - base_template = self.env.ref(template_xmlid, raise_if_not_found=True) + base_template = self.env.ref(template_xmlid, raise_if_not_found=True).with_context(lang=base_template_ctx['lang']) except ValueError: _logger.warning('QWeb template %s not found when sending notification emails. Sending without layouting.' % (template_xmlid)) base_template = False - base_template_ctx = self._notify_prepare_template_context(message, record, model_description=model_description) - # prepare notification mail values base_mail_values = { 'mail_message_id': message.id, diff --git a/addons/mail/static/src/js/composers/chatter_composer.js b/addons/mail/static/src/js/composers/chatter_composer.js index cda91eab205..777467e6eb8 100644 --- a/addons/mail/static/src/js/composers/chatter_composer.js +++ b/addons/mail/static/src/js/composers/chatter_composer.js @@ -3,6 +3,7 @@ odoo.define('mail.composer.Chatter', function (require) { var BasicComposer = require('mail.composer.Basic'); var mailUtils = require('mail.utils'); +var session = require('web.session'); var core = require('web.core'); var viewDialogs = require('web.view_dialogs'); @@ -195,7 +196,7 @@ var ChatterComposer = BasicComposer.extend({ message = _.extend(message, { subtype: 'mail.mt_comment', message_type: 'comment', - context: self.context, + context: _.defaults({}, self.context, session.user_context), }); // Subtype diff --git a/addons/mail/static/tests/chatter_tests.js b/addons/mail/static/tests/chatter_tests.js index ac9f715be5d..30225bd041a 100644 --- a/addons/mail/static/tests/chatter_tests.js +++ b/addons/mail/static/tests/chatter_tests.js @@ -1464,6 +1464,55 @@ QUnit.test('chatter: Attachment viewer', function (assert) { form.destroy(); }); +QUnit.test('chatter: keep context when sending a message', function(assert) { + assert.expect(1); + var form = createView({ + View: FormView, + model: 'partner', + data: this.data, + services: this.services, + arch: '<form string="Partners">' + + '<sheet>' + + '<field name="foo"/>' + + '</sheet>' + + '<div class="oe_chatter">' + + '<field name="message_ids" widget="mail_thread"/>' + + '</div>' + + '</form>', + res_id: 2, + session: { + user_context: {lang: 'en_US'}, + }, + mockRPC: function (route, args) { + if (args.method === 'message_get_suggested_recipients') { + return $.when({2: []}); + } + if (args.method === 'message_post') { + assert.deepEqual(args.kwargs.context, { + default_model: "partner", + default_res_id: 2, + lang: "en_US", + mail_post_autofollow: true, + }, + "the context is incorrect"); + return $.when(57923); + } + if (args.method === 'message_format') { + return $.when([{ + author_id: [42, "Me"], + model: 'partner', + }]); + } + return this._super(route, args); + }, + }); + + testUtils.dom.click(form.$('.o_chatter_button_new_message')); + testUtils.fields.editInput(form.$('.oe_chatter .o_composer_text_field:first()'), 'Pouet'); + testUtils.dom.click(form.$('.oe_chatter .o_composer_button_send')); + form.destroy(); +}); + QUnit.test('form activity widget: read RPCs', function (assert) { // Records of model 'mail.activity' may be updated in business flows (e.g. // the date of a 'Meeting' activity is updated when the associated meeting diff --git a/addons/mail/wizard/email_template_preview.py b/addons/mail/wizard/email_template_preview.py index 89808b0b6d1..eb02b082b4e 100644 --- a/addons/mail/wizard/email_template_preview.py +++ b/addons/mail/wizard/email_template_preview.py @@ -34,6 +34,7 @@ class TemplatePreview(models.TransientModel): res_id = fields.Selection(_get_records, 'Sample Document') partner_ids = fields.Many2many('res.partner', string='Recipients') + attachment_ids = fields.Many2many(string='Attachments', store=False) @api.onchange('res_id') @api.multi diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py index c2ef637d299..46ec87060cf 100644 --- a/addons/mail/wizard/mail_compose_message.py +++ b/addons/mail/wizard/mail_compose_message.py @@ -198,6 +198,13 @@ class MailComposer(models.TransientModel): """ Process the wizard content and proceed with sending the related email(s), rendering any template patterns on the fly if needed. """ notif_layout = self._context.get('custom_layout') + # Several custom layouts make use of the model description at rendering, e.g. in the + # 'View <document>' button. Some models are used for different business concepts, such as + # 'purchase.order' which is used for a RFQ and and PO. To avoid confusion, we must use a + # different wording depending on the state of the object. + # Therefore, we can set the description in the context from the beginning to avoid falling + # back on the regular display_name retrieved in '_notify_prepare_template_context'. + model_description = self._context.get('model_description') for wizard in self: # Duplicate attachments linked to the email.template. # Indeed, basic mail.compose.message wizard duplicates attachments in mass @@ -252,6 +259,7 @@ class MailComposer(models.TransientModel): notif_layout=notif_layout, add_sign=not bool(wizard.template_id), mail_auto_delete=wizard.template_id.auto_delete if wizard.template_id else False, + model_description=model_description, **mail_values) if ActiveModel._name == 'mail.thread' and wizard.model: post_params['model'] = wizard.model diff --git a/addons/mail_bot/i18n/nb.po b/addons/mail_bot/i18n/nb.po index 8fae401d063..e4ebe7aae36 100644 --- a/addons/mail_bot/i18n/nb.po +++ b/addons/mail_bot/i18n/nb.po @@ -4,13 +4,15 @@ # # Translators: # Martin Trigaux, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-02 10:05+0000\n" -"PO-Revision-Date: 2018-10-02 10:05+0000\n" -"Last-Translator: Martin Trigaux, 2018\n" +"PO-Revision-Date: 2018-08-24 09:20+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,7 +36,7 @@ msgstr "Kontakt" #. module: mail_bot #: selection:res.users,odoobot_state:0 msgid "Disabled" -msgstr "" +msgstr "Deaktivert" #. module: mail_bot #: model:ir.model,name:mail_bot.model_mail_channel @@ -69,7 +71,7 @@ msgstr "" #. module: mail_bot #: model:ir.model,name:mail_bot.model_ir_http msgid "HTTP Routing" -msgstr "" +msgstr "HTTP-ruting" #. module: mail_bot #: code:addons/mail_bot/models/mail_channel.py:38 diff --git a/addons/maintenance/i18n/cs.po b/addons/maintenance/i18n/cs.po index e0e3761c4df..9998d19a285 100644 --- a/addons/maintenance/i18n/cs.po +++ b/addons/maintenance/i18n/cs.po @@ -3,7 +3,6 @@ # * maintenance # # Translators: -# Martin Trigaux, 2018 # Michal Zábrodský <zabry23@gmail.com>, 2018 # Jaroslav Helemik Nemec <nemec@helemik.cz>, 2018 # Jakub Lohnisky <jakub@lepremier.cz>, 2018 @@ -11,14 +10,16 @@ # Martin N <nedbalm@gmail.com>, 2018 # Jan Horzinka <jan.horzinka@centrum.cz>, 2018 # Michal Veselý <michal@veselyberanek.net>, 2018 -# J. Podhorecky <j.podhorecky@volny.cz>, 2018 +# Martin Trigaux, 2018 +# trendspotter <j.podhorecky@volny.cz>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" -"PO-Revision-Date: 2018-10-08 06:49+0000\n" -"Last-Translator: J. Podhorecky <j.podhorecky@volny.cz>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:20+0000\n" +"Last-Translator: trendspotter <j.podhorecky@volny.cz>, 2018\n" "Language-Team: Czech (https://www.transifex.com/odoo/teams/41243/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -223,7 +224,7 @@ msgstr "" #: model:ir.model.fields,field_description:maintenance.field_maintenance_equipment_category__message_attachment_count #: model:ir.model.fields,field_description:maintenance.field_maintenance_request__message_attachment_count msgid "Attachment Count" -msgstr "" +msgstr "Počet příloh" #. module: maintenance #: model_terms:ir.ui.view,arch_db:maintenance.hr_equipment_view_search diff --git a/addons/maintenance/i18n/nb.po b/addons/maintenance/i18n/nb.po index d54ce4316c5..2c4cbbc0447 100644 --- a/addons/maintenance/i18n/nb.po +++ b/addons/maintenance/i18n/nb.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" -"PO-Revision-Date: 2018-10-08 06:49+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:20+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -403,7 +405,7 @@ msgstr "Fullført" #: model_terms:ir.ui.view,arch_db:maintenance.hr_equipment_request_view_kanban #: model_terms:ir.ui.view,arch_db:maintenance.hr_equipment_view_kanban msgid "Dropdown menu" -msgstr "" +msgstr "Nedtrekksmeny" #. module: maintenance #: model:ir.model.fields,field_description:maintenance.field_maintenance_request__duration diff --git a/addons/mass_mailing/i18n/ar.po b/addons/mass_mailing/i18n/ar.po index 0af356534ee..65784e40892 100644 --- a/addons/mass_mailing/i18n/ar.po +++ b/addons/mass_mailing/i18n/ar.po @@ -22,6 +22,7 @@ # Shaima Safar <shaima.safar@open-inside.com>, 2018 # Ali Alrehawi <alrehawi@hotmail.com>, 2018 # Mustafa Rawi <mustafa@cubexco.com>, 2018 +# Khalid Alshashai <kalshashai@gmail.com>, 2018 # msgid "" msgstr "" @@ -29,7 +30,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" "PO-Revision-Date: 2018-08-24 09:20+0000\n" -"Last-Translator: Mustafa Rawi <mustafa@cubexco.com>, 2018\n" +"Last-Translator: Khalid Alshashai <kalshashai@gmail.com>, 2018\n" "Language-Team: Arabic (https://www.transifex.com/odoo/teams/41243/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -107,7 +108,7 @@ msgstr "" #. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.s_mail_block_event msgid "21 Jul" -msgstr "" +msgstr "21 يوليو" #. module: mass_mailing #: model_terms:mail.mass_mailing.list,popup_content:mass_mailing.mass_mail_list_1 @@ -155,17 +156,17 @@ msgstr "" #. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.s_mail_block_steps msgid "<small>Step 1:</small>" -msgstr "" +msgstr "الخطوة 1:" #. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.s_mail_block_steps msgid "<small>Step 2:</small>" -msgstr "" +msgstr "<small>الخطوة 2:</small>" #. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.s_mail_block_steps msgid "<small>Step 3:</small>" -msgstr "" +msgstr "<small>الخطوة 3:</small>" #. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.s_mail_block_comparison_table @@ -245,7 +246,7 @@ msgstr "" #. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.s_mail_block_event msgid "ALL DAY" -msgstr "" +msgstr "طوال اليوم" #. module: mass_mailing #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact__message_needaction diff --git a/addons/mass_mailing/i18n/cs.po b/addons/mass_mailing/i18n/cs.po index 0a2a854594a..49d9bf1efc0 100644 --- a/addons/mass_mailing/i18n/cs.po +++ b/addons/mass_mailing/i18n/cs.po @@ -3,20 +3,21 @@ # * mass_mailing # # Translators: -# Martin Trigaux, 2018 # Jakub Lohnisky <jakub@lepremier.cz>, 2018 # Ladislav Tomm <tomm@helemik.cz>, 2018 # Jan Horzinka <jan.horzinka@centrum.cz>, 2018 # Michal Veselý <michal@veselyberanek.net>, 2018 -# J. Podhorecky <j.podhorecky@volny.cz>, 2018 # Jaroslav Helemik Nemec <nemec@helemik.cz>, 2018 +# Martin Trigaux, 2018 +# trendspotter <j.podhorecky@volny.cz>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" -"PO-Revision-Date: 2018-10-08 06:49+0000\n" -"Last-Translator: Jaroslav Helemik Nemec <nemec@helemik.cz>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:20+0000\n" +"Last-Translator: trendspotter <j.podhorecky@volny.cz>, 2018\n" "Language-Team: Czech (https://www.transifex.com/odoo/teams/41243/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -234,7 +235,7 @@ msgstr "" #. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.s_mail_block_event msgid "ALL DAY" -msgstr "" +msgstr "CELÝ DEN" #. module: mass_mailing #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact__message_needaction @@ -331,7 +332,7 @@ msgstr "Připojit soubor" #. module: mass_mailing #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact__message_attachment_count msgid "Attachment Count" -msgstr "" +msgstr "Počet příloh" #. module: mass_mailing #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing__attachment_ids @@ -2408,7 +2409,7 @@ msgstr "" #. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.s_mail_block_discount2 msgid "and save $20 on your next order!" -msgstr "" +msgstr "a ušetříte 20 dolarů na další objednávku!" #. module: mass_mailing #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign__campaign_id diff --git a/addons/mass_mailing/i18n/nb.po b/addons/mass_mailing/i18n/nb.po index e17c49ae355..e7e89625727 100644 --- a/addons/mass_mailing/i18n/nb.po +++ b/addons/mass_mailing/i18n/nb.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" -"PO-Revision-Date: 2018-10-08 06:49+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:20+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -498,7 +500,7 @@ msgstr "Firmanavn" #. module: mass_mailing #: model:ir.model,name:mass_mailing.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: mass_mailing #: model:ir.ui.menu,name:mass_mailing.mass_mailing_configuration @@ -766,7 +768,7 @@ msgstr "Utkast" #: model_terms:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_kanban #: model_terms:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_list_kanban msgid "Dropdown menu" -msgstr "" +msgstr "Nedtrekksmeny" #. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_campaign_form diff --git a/addons/mass_mailing/i18n/pt_BR.po b/addons/mass_mailing/i18n/pt_BR.po index 95396b5fecf..4cfc6d55417 100644 --- a/addons/mass_mailing/i18n/pt_BR.po +++ b/addons/mass_mailing/i18n/pt_BR.po @@ -17,6 +17,7 @@ # Mateus Lopes <mateus1@gmail.com>, 2018 # Marcel Savegnago <marcel.savegnago@gmail.com>, 2018 # Marcelo Costa <marcelo@comdesk.com.br>, 2018 +# Rafael H L Moretti <rafael.moretti@gmail.com>, 2018 # msgid "" msgstr "" @@ -24,7 +25,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" "PO-Revision-Date: 2018-08-24 09:20+0000\n" -"Last-Translator: Marcelo Costa <marcelo@comdesk.com.br>, 2018\n" +"Last-Translator: Rafael H L Moretti <rafael.moretti@gmail.com>, 2018\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/odoo/teams/41243/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -574,7 +575,7 @@ msgstr "Criar um contato em seu catálogo de endereços" #: model_terms:ir.actions.act_window,help:mass_mailing.action_view_mass_mailings #: model_terms:ir.actions.act_window,help:mass_mailing.action_view_mass_mailings_from_campaign msgid "Create a new mailing" -msgstr "" +msgstr "Criar uma nova correspondência" #. module: mass_mailing #: model_terms:ir.actions.act_window,help:mass_mailing.action_view_mass_mailing_campaigns @@ -1498,6 +1499,8 @@ msgid "" "No need of importing your mailing lists, you can easily\n" " send emails to any contact saved in other Odoo apps." msgstr "" +"Não precisa importar suas listas de correspondências, você pode facilmente\n" +" enviar e-mails para qualquer contato gravado em outros apps Odoo." #. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.s_mail_block_comparison_table @@ -1971,7 +1974,7 @@ msgstr "Nome da Fonte" #. module: mass_mailing #: model:ir.model.fields,field_description:mass_mailing.field_res_config_settings__mass_mailing_outgoing_mail_server msgid "Specific Mail Server" -msgstr "" +msgstr "Servidor de E-mail Específico" #. module: mass_mailing #: selection:mail.mass_mailing,reply_to_mode:0 @@ -2233,12 +2236,12 @@ msgstr "" #. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.s_mail_block_discount2 msgid "Use This Promo Code BEFORE 1st of August" -msgstr "" +msgstr "Use este código promocional ANTES de 1 de agosto" #. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.res_config_settings_view_form msgid "Use a specific mail server for mailings" -msgstr "" +msgstr "Usar um servidor de e-mail específico" #. module: mass_mailing #: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing__mail_server_id @@ -2249,6 +2252,9 @@ msgid "" "outgoing mail server available (based on their sequencing) as it does for " "normal mails." msgstr "" +"Usar um servidor de e-mail específico. Ou então o Odoo utiliza o primeiro " +"servidor de saída de e-mail disponível (baseado na sequência deles) como " +"ocorre para correspondências normais." #. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.s_mail_block_discount2 diff --git a/addons/mass_mailing/i18n/tr.po b/addons/mass_mailing/i18n/tr.po index dcde75cc186..ce8455cf6e4 100644 --- a/addons/mass_mailing/i18n/tr.po +++ b/addons/mass_mailing/i18n/tr.po @@ -3,28 +3,29 @@ # * mass_mailing # # Translators: -# Ediz Duman <neps1192@gmail.com>, 2018 -# Ayhan KIZILTAN <akiziltan76@hotmail.com>, 2018 -# Martin Trigaux, 2018 +# Güven YILMAZ <guvenyilmaz@outlook.com.tr>, 2018 +# Ramiz Deniz Öner <deniz@denizoner.com>, 2018 # Levent Karakaş <levent@mektup.at>, 2018 -# Murat Kaplan <muratk@projetgrup.com>, 2018 # Ahmet Altinisik <aaltinisik@altinkaya.com.tr>, 2018 # Saban Yildiz <sabany@projetgrup.com>, 2018 -# Güven YILMAZ <guvenyilmaz@outlook.com.tr>, 2018 -# Ramiz Deniz Öner <deniz@denizoner.com>, 2018 -# Gökhan Erdoğdu <gokhan.erdogdu@mechsoft.com.tr>, 2018 -# Umur Akın <umura@projetgrup.com>, 2018 # Mehmet Demirel <mdemirell@gmail.com>, 2018 +# Gökhan Erdoğdu <gokhan.erdogdu@mechsoft.com.tr>, 2018 # İlknur Püskül <ilknurpuskull@gmail.com>, 2018 # Metin Akın <aknmetin@gmail.com>, 2018 +# Ayhan KIZILTAN <akiziltan76@hotmail.com>, 2018 +# Ediz Duman <neps1192@gmail.com>, 2018 +# Martin Trigaux, 2018 +# Murat Kaplan <muratk@projetgrup.com>, 2018 # Buket Şeker <buket_skr@hotmail.com>, 2018 +# Umur Akın <umura@projetgrup.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" -"PO-Revision-Date: 2018-10-08 06:49+0000\n" -"Last-Translator: Buket Şeker <buket_skr@hotmail.com>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:20+0000\n" +"Last-Translator: Umur Akın <umura@projetgrup.com>, 2018\n" "Language-Team: Turkish (https://www.transifex.com/odoo/teams/41243/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -230,12 +231,12 @@ msgstr "Kısa bir açıklama" #. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.s_mail_block_text_image msgid "A unique value" -msgstr "" +msgstr "Benzersiz bir değer" #. module: mass_mailing #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing__contact_ab_pc msgid "A/B Testing percentage" -msgstr "" +msgstr "A/B Test yüzdesi" #. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.s_mail_block_event @@ -261,7 +262,7 @@ msgstr "Yeni bir etiket ekle" #. module: mass_mailing #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign__unique_ab_testing msgid "Allow A/B Testing" -msgstr "" +msgstr "A/B Testine izin ver" #. module: mass_mailing #: model:ir.model.fields,help:mass_mailing.field_res_config_settings__show_blacklist_buttons @@ -306,12 +307,12 @@ msgstr "" #. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.s_mail_block_footer_tag_line msgid "Apps That Help You Grow Your Business" -msgstr "" +msgstr "İşinizi Büyütmenize Yardımcı Olan Uygulamalar" #. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.s_mail_block_title_sub msgid "Apps That Help You Grow Your Business!" -msgstr "" +msgstr "İşinizi Büyütmenize Yardımcı Olan Uygulamalar!" #. module: mass_mailing #: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_list_merge__archive_src_lists @@ -342,12 +343,12 @@ msgstr "Ekler" #. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.s_mail_block_comparison_table msgid "Basic features" -msgstr "" +msgstr "Temel özellikler" #. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.s_mail_block_comparison_table msgid "Basic management" -msgstr "" +msgstr "Temel yönetim" #. module: mass_mailing #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact__is_blacklisted @@ -384,7 +385,7 @@ msgstr "Karşılıksız çıktı" #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing__bounced_ratio #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign__bounced_ratio msgid "Bounced Ratio" -msgstr "" +msgstr "Geri Dönme Oranı" #. module: mass_mailing #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing__campaign_id @@ -434,7 +435,7 @@ msgstr "Sitili Değiştir" #. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.s_mail_block_title_sub msgid "Check this out!" -msgstr "" +msgstr "Şuna bak!" #. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.s_mail_block_steps @@ -535,7 +536,7 @@ msgstr "" #: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_contact__message_bounce #: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_list_contact_rel__message_bounce msgid "Counter of the number of bounced emails for this contact." -msgstr "" +msgstr "Bu kişi için geri dönen e-posta sayısı." #. module: mass_mailing #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact__country_id @@ -715,7 +716,7 @@ msgstr "Teslim Edilen" #. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.s_mail_block_title_text msgid "Demo Signature" -msgstr "" +msgstr "Demo İmza" #. module: mass_mailing #: model:mail.mass_mailing.stage,name:mass_mailing.campaign_stage_2 @@ -833,7 +834,7 @@ msgstr "İyi eğlenceler!" #. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.s_mail_block_title_text msgid "Enjoy," -msgstr "" +msgstr "Keyfini Çıkarın" #. module: mass_mailing #: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics__exception @@ -851,7 +852,7 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:mass_mailing.mail_mass_mailing_list_contact_view_search #: model_terms:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_contact_search msgid "Exclude Bounced" -msgstr "" +msgstr "Geri dönenler hariç" #. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.mail_mass_mailing_list_contact_view_search @@ -895,7 +896,7 @@ msgstr "" #: model:mail.mass_mailing,name:mass_mailing.mass_mail_1 #: model:utm.source,name:mass_mailing.mass_mail_1_utm_source msgid "First Newsletter" -msgstr "" +msgstr "İlk Bülten" #. module: mass_mailing #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_contact__message_follower_ids @@ -963,6 +964,9 @@ msgid "" "related mail_mail can be deleted separately from its statistics. However the" " ID is needed for several action and controllers." msgstr "" +"İlgili mail_mail kimlik kodu. Bu alan bir tamsayı alanıdır, çünkü ilgili " +"mail_mail kendi istatistiklerinden ayrı olarak silinebilir. Ancak kimliği, " +"birkaç eylem ve denetleyicileri için gereklidir." #. module: mass_mailing #: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_contact__message_unread @@ -981,6 +985,10 @@ msgid "" " lets you send different mailings to randomly selected recipients and test " "the effectiveness of the mailings, without causing duplicate messages." msgstr "" +"İşaretlenirse, e-mailler, alıcılara tüm kampanya için yalnızca bir kez " +"postalanır. Bu, rastgele seçilen alıcılara farklı posta gönderebilmenizi ve " +"tekrarlı iletilere neden olmadan postaların etkililiğini test etmenizi " +"sağlar." #. module: mass_mailing #: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_contact__message_has_error @@ -1035,7 +1043,7 @@ msgstr "" #. module: mass_mailing #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing__keep_archives msgid "Keep Archives" -msgstr "" +msgstr "Arşivleri Koruyun" #. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.s_mail_block_title_text @@ -1096,7 +1104,7 @@ msgstr "Son Güncelleme" #. module: mass_mailing #: model:ir.model.fields,help:mass_mailing.field_mail_mail_statistics__state_update msgid "Last state update of the mail" -msgstr "" +msgstr "Mailin son güncellemesi" #. module: mass_mailing #: model:ir.model,name:mass_mailing.model_link_tracker @@ -1111,7 +1119,7 @@ msgstr "" #. module: mass_mailing #: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics__links_click_ids msgid "Links click" -msgstr "" +msgstr "Link Tıklamaları" #. module: mass_mailing #: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics__mail_mail_id @@ -1219,7 +1227,7 @@ msgstr "" #. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_links_tree msgid "Mailing Statistics of Clicks" -msgstr "" +msgstr "Tıklama İstatistiklerinin Postalanması" #. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.unsubscribe @@ -1266,7 +1274,7 @@ msgstr "Toplu Postalama Kampanyalarını Yönetme" #. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.res_config_settings_view_form msgid "Manage campaigns of mass emails with process stages" -msgstr "" +msgstr "İşlem aşamaları ile toplu e-posta kampanyalarını yönetin" #. module: mass_mailing #: model:mail.mass_mailing.tag,name:mass_mailing.mass_mail_tag_1 @@ -1375,7 +1383,7 @@ msgstr "Toplu Postalama Etiketi" #: model:ir.cron,cron_name:mass_mailing.ir_cron_mass_mailing_queue #: model:ir.cron,name:mass_mailing.ir_cron_mass_mailing_queue msgid "Mass Mailing: Process queue" -msgstr "" +msgstr "Toplu E-Posta: İşlem düzeni" #. module: mass_mailing #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign__mass_mailing_ids @@ -1470,7 +1478,7 @@ msgstr "İsim" #. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_contact_search msgid "Name / Email" -msgstr "" +msgstr "İsim / E-Posta" #. module: mass_mailing #: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_list_merge__new_list_name @@ -1528,7 +1536,7 @@ msgstr "" #. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_contact_kanban msgid "Number of bounced email." -msgstr "" +msgstr "Geri dönen e-posta sayısı" #. module: mass_mailing #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing_campaign__clicks_ratio @@ -1574,7 +1582,7 @@ msgstr "Odoo" #: model_terms:mail.mass_mailing.list,popup_content:mass_mailing.mass_mail_list_1 #: model_terms:mail.mass_mailing.list,popup_content:mass_mailing.mass_mail_list_2 msgid "Odoo Presents" -msgstr "" +msgstr "Odoo Sunar" #. module: mass_mailing #: model_terms:ir.actions.act_window,help:mass_mailing.action_view_mass_mailing_contacts @@ -1645,7 +1653,7 @@ msgstr "Giden Postalar" #. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.s_mail_block_comparison_table msgid "PRO" -msgstr "" +msgstr "PRO" #. module: mass_mailing #: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing__contact_ab_pc @@ -1711,17 +1719,17 @@ msgstr "Alıcı model" #. module: mass_mailing #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing__mailing_model_name msgid "Recipients Model Name" -msgstr "" +msgstr "Alıcı Model Adı" #. module: mass_mailing #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing__mailing_model_real msgid "Recipients Real Model" -msgstr "" +msgstr "Alıcıların Gerçek Modeli" #. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.s_mail_block_discount1 msgid "Redeem Discount!" -msgstr "" +msgstr "İndirimden Yararlanın!" #. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.s_mail_block_event @@ -1736,7 +1744,7 @@ msgstr "İlişkili Posta(lar)" #. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.view_mail_mass_mailing_campaign_form msgid "Related Mailings" -msgstr "" +msgstr "İlişkili Postalar" #. module: mass_mailing #: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics__replied @@ -1822,7 +1830,7 @@ msgstr "Planlama" #: model:ir.model.fields,field_description:mass_mailing.field_mail_mass_mailing__schedule_date #: model:ir.model.fields,field_description:mass_mailing.field_mass_mailing_schedule_date__schedule_date msgid "Schedule in the Future" -msgstr "" +msgstr "Gelecek Programı" #. module: mass_mailing #: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics__scheduled @@ -1991,7 +1999,7 @@ msgstr "Durum" #. module: mass_mailing #: model:ir.model.fields,field_description:mass_mailing.field_mail_mail_statistics__state_update msgid "State Update" -msgstr "" +msgstr "Durum Güncellemesi" #. module: mass_mailing #: model:ir.model.fields,field_description:mass_mailing.field_mail_mail__statistics_ids @@ -2058,7 +2066,7 @@ msgstr "Test Edilmiş" #. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.s_mail_block_title_text msgid "Thank you for joining us!" -msgstr "" +msgstr "Bize katıldığınız için teşekkürler!" #. module: mass_mailing #. openerp-web @@ -2070,7 +2078,7 @@ msgstr "" #. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.s_mail_block_paragraph msgid "That way, Odoo evolves much faster than any other solution." -msgstr "" +msgstr "Odoo bu yolla, diğer çözümlere göre daha hızlı gelişir." #. module: mass_mailing #: model:ir.model.fields,help:mass_mailing.field_mail_mass_mailing_list_contact_rel__opt_out @@ -2090,6 +2098,8 @@ msgid "" "The open source model of Odoo has allowed us to leverage thousands of developers and\n" " business experts to build hundreds of apps in just a few years." msgstr "" +"Odoo'nun açık kaynak modeli, binlerce geliştiriciye ve iş uzmanına sadece " +"birkaç yıl içinde yüzlerce uygulama oluşturmak için kullanmamıza izin verdi." #. module: mass_mailing #: model_terms:ir.ui.view,arch_db:mass_mailing.s_mail_block_text_image @@ -2098,6 +2108,8 @@ msgid "" "developers and business experts to build hundreds of apps in just a few " "years." msgstr "" +"Odoo'nun açık kaynak modeli, binlerce geliştiriciye ve iş uzmanına sadece " +"birkaç yıl içinde yüzlerce uygulama oluşturmak için kullanmamıza izin verdi." #. module: mass_mailing #: code:addons/mass_mailing/models/mass_mailing.py:624 diff --git a/addons/membership/i18n/it.po b/addons/membership/i18n/it.po index ea2d5291027..f47f4dba0be 100644 --- a/addons/membership/i18n/it.po +++ b/addons/membership/i18n/it.po @@ -5,7 +5,6 @@ # Translators: # Sergio Zanchetta <primes2h@gmail.com>, 2018 # Francesco Garganese <francesco.garganese@aeromnia.aero>, 2018 -# Martin Trigaux, 2018 # Cesare Cugnasco <cesare.cugnasco@gmail.com>, 2018 # Giacomo Grasso <giacomo.grasso.82@gmail.com>, 2018 # Luca Tralli, 2018 @@ -13,13 +12,16 @@ # Paolo Valier, 2018 # Alessandro Forte <a.forte1010@gmail.com>, 2018 # Manuela Feliciani <mfeliciani@alice.it>, 2018 +# Martin Trigaux, 2018 +# mymage <stefano.consolaro@mymage.it>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: Manuela Feliciani <mfeliciani@alice.it>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:21+0000\n" +"Last-Translator: mymage <stefano.consolaro@mymage.it>, 2018\n" "Language-Team: Italian (https://www.transifex.com/odoo/teams/41243/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -363,6 +365,13 @@ msgid "" "-Invoiced Member: A member whose invoice has been created.\n" "-Paid Member: A member who has paid the membership amount." msgstr "" +"Indica lo stato dell'iscrizione.\n" +"-Non richiesta: un socio che non ha richiesto nessuna iscrizione.\n" +"-Cancellata: un socio che ha cancellato la sua iscrizione.\n" +"-Scaduta: un socio la cui iscrizione è scaduta.\n" +"-Da fatturare: un socio che ha richiesto l'iscrizione e la cui fattura deve essere creata.\n" +"-Fatturata: un socio la cui fattura è stata creata.\n" +"-Pagata: un socio che ha pagato la quota di iscrizione." #. module: membership #: model:ir.model.fields,field_description:membership.field_membership_membership_line__date @@ -514,7 +523,7 @@ msgstr "Prodotti Iscrizione" #: model:ir.cron,cron_name:membership.ir_cron_update_membership #: model:ir.cron,name:membership.ir_cron_update_membership msgid "Membership: update memberships" -msgstr "" +msgstr "Iscrizione: aggiorna iscrizione" #. module: membership #: model_terms:ir.ui.view,arch_db:membership.view_partner_form diff --git a/addons/mrp/i18n/cs.po b/addons/mrp/i18n/cs.po index 60c6b2b5a89..114b9b6f67f 100644 --- a/addons/mrp/i18n/cs.po +++ b/addons/mrp/i18n/cs.po @@ -12,7 +12,7 @@ # Ladislav Tomm <tomm@helemik.cz>, 2018 # Adam Kettner <cetnerix@gmail.com>, 2018 # Martin Trigaux, 2018 -# J. Podhorecky <j.podhorecky@volny.cz>, 2018 +# trendspotter <j.podhorecky@volny.cz>, 2018 # msgid "" msgstr "" @@ -20,7 +20,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-24 09:34+0000\n" "PO-Revision-Date: 2018-08-24 09:21+0000\n" -"Last-Translator: J. Podhorecky <j.podhorecky@volny.cz>, 2018\n" +"Last-Translator: trendspotter <j.podhorecky@volny.cz>, 2018\n" "Language-Team: Czech (https://www.transifex.com/odoo/teams/41243/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -395,7 +395,7 @@ msgstr "Archivováno" #: model:ir.model.fields,field_description:mrp.field_mrp_unbuild__message_attachment_count #: model:ir.model.fields,field_description:mrp.field_mrp_workorder__message_attachment_count msgid "Attachment Count" -msgstr "" +msgstr "Počet příloh" #. module: mrp #: model:ir.model.fields,field_description:mrp.field_mrp_document__local_url @@ -3375,7 +3375,7 @@ msgstr "" #. module: mrp #: model:ir.model.fields,help:mrp.field_mrp_document__res_model msgid "The database object this attachment will be attached to." -msgstr "" +msgstr "Databáze, jíž bude tato příloha připojena." #. module: mrp #: model:ir.model.fields,help:mrp.field_mrp_production__routing_id diff --git a/addons/mrp/i18n/nb.po b/addons/mrp/i18n/nb.po index dd6a307082d..f338fa30525 100644 --- a/addons/mrp/i18n/nb.po +++ b/addons/mrp/i18n/nb.po @@ -4,15 +4,17 @@ # # Translators: # Martin Trigaux, 2018 -# Jorunn D. Newth, 2018 # Viktor Basso <viktor@voit.no>, 2018 +# Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-24 09:34+0000\n" -"PO-Revision-Date: 2018-10-24 09:34+0000\n" -"Last-Translator: Viktor Basso <viktor@voit.no>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:21+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -750,7 +752,7 @@ msgstr "" #. module: mrp #: model:ir.model,name:mrp.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: mrp #: model:ir.ui.menu,name:mrp.menu_mrp_configuration diff --git a/addons/mrp/models/stock_picking.py b/addons/mrp/models/stock_picking.py index b0a23ebd4b2..bac9093f454 100644 --- a/addons/mrp/models/stock_picking.py +++ b/addons/mrp/models/stock_picking.py @@ -34,3 +34,24 @@ class StockPickingType(models.Model): def get_mrp_stock_picking_action_picking_type(self): return self._get_action('mrp.mrp_production_action_picking_deshboard') + +class StockPicking(models.Model): + _inherit = 'stock.picking' + + def _less_quantities_than_expected_add_documents(self, moves, documents): + documents = super(StockPicking, self)._less_quantities_than_expected_add_documents(moves, documents) + + def _keys_in_sorted(move): + """ sort by picking and the responsible for the product the + move. + """ + return (move.raw_material_production_id.id, move.product_id.responsible_id.id) + + def _keys_in_groupby(move): + """ group by picking and the responsible for the product the + move. + """ + return (move.raw_material_production_id, move.product_id.responsible_id) + + production_documents = self._log_activity_get_documents(moves, 'move_dest_ids', 'DOWN', _keys_in_sorted, _keys_in_groupby) + return {**documents, **production_documents} diff --git a/addons/mrp/wizard/change_production_qty.py b/addons/mrp/wizard/change_production_qty.py index b92616c9a50..6cda5d64f9b 100644 --- a/addons/mrp/wizard/change_production_qty.py +++ b/addons/mrp/wizard/change_production_qty.py @@ -53,6 +53,7 @@ class ChangeProductionQty(models.TransientModel): factor = production.product_uom_id._compute_quantity(production.product_qty - qty_produced, production.bom_id.product_uom_id) / production.bom_id.product_qty boms, lines = production.bom_id.explode(production.product_id, factor, picking_type=production.bom_id.picking_type_id) documents = {} + done_quantities = {move: move.quantity_done for move in production.move_raw_ids} for line, line_data in lines: move, old_qty, new_qty = production._update_raw_move(line, line_data) iterate_key = production._get_document_iterate_key(move) @@ -72,6 +73,9 @@ class ChangeProductionQty(models.TransientModel): production._log_downside_manufactured_quantity(finished_moves_modification) moves = production.move_raw_ids.filtered(lambda x: x.state not in ('done', 'cancel')) moves._action_assign() + for move in production.move_raw_ids: + if move.quantity_done != done_quantities[move]: + move._set_quantity_done(done_quantities[move]) for wo in production.workorder_ids: operation = wo.operation_id if operation_bom_qty.get(operation.id): diff --git a/addons/note/i18n/cs.po b/addons/note/i18n/cs.po index be52e3b78b5..61af96c766e 100644 --- a/addons/note/i18n/cs.po +++ b/addons/note/i18n/cs.po @@ -4,18 +4,19 @@ # # Translators: # Martin Trigaux, 2018 -# Jaroslav Helemik Nemec <nemec@helemik.cz>, 2018 # Jakub Lohnisky <jakub@lepremier.cz>, 2018 # Jan Horzinka <jan.horzinka@centrum.cz>, 2018 # Michal Veselý <michal@veselyberanek.net>, 2018 -# J. Podhorecky <j.podhorecky@volny.cz>, 2018 +# Jaroslav Helemik Nemec <nemec@helemik.cz>, 2018 +# trendspotter <j.podhorecky@volny.cz>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: J. Podhorecky <j.podhorecky@volny.cz>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:21+0000\n" +"Last-Translator: trendspotter <j.podhorecky@volny.cz>, 2018\n" "Language-Team: Czech (https://www.transifex.com/odoo/teams/41243/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -86,7 +87,7 @@ msgstr "Archivovat" #. module: note #: model:ir.model.fields,field_description:note.field_note_note__message_attachment_count msgid "Attachment Count" -msgstr "" +msgstr "Počet příloh" #. module: note #: model_terms:ir.ui.view,arch_db:note.view_note_note_filter @@ -97,6 +98,8 @@ msgstr "" #: model:ir.model.fields,help:note.field_mail_activity_type__category msgid "Categories may trigger specific behavior like opening calendar view" msgstr "" +"Kategorie mohou vyvolat určité chování, například otevření zobrazení " +"kalendáře" #. module: note #: model:ir.model.fields,field_description:note.field_mail_activity_type__category diff --git a/addons/note/i18n/nb.po b/addons/note/i18n/nb.po index e35c584ff1c..14371628afe 100644 --- a/addons/note/i18n/nb.po +++ b/addons/note/i18n/nb.po @@ -3,15 +3,17 @@ # * note # # Translators: -# Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Martin Trigaux, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:21+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -151,7 +153,7 @@ msgstr "Visningsnavn" #. module: note #: model_terms:ir.ui.view,arch_db:note.view_note_note_kanban msgid "Dropdown menu" -msgstr "" +msgstr "Nedtrekksmeny" #. module: note #: model:ir.model.fields,field_description:note.field_note_stage__fold diff --git a/addons/pad/i18n/nb.po b/addons/pad/i18n/nb.po index 310d432ba66..7b5e8500edc 100644 --- a/addons/pad/i18n/nb.po +++ b/addons/pad/i18n/nb.po @@ -4,13 +4,15 @@ # # Translators: # Martin Trigaux, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: Martin Trigaux, 2018\n" +"PO-Revision-Date: 2018-08-24 09:21+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,7 +33,7 @@ msgstr "Firmaer" #. module: pad #: model:ir.model,name:pad.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: pad #: model:ir.model.fields,field_description:pad.field_pad_common__display_name diff --git a/addons/partner_autocomplete/i18n/nb.po b/addons/partner_autocomplete/i18n/nb.po index bb956a486d3..f3d4bed2f1f 100644 --- a/addons/partner_autocomplete/i18n/nb.po +++ b/addons/partner_autocomplete/i18n/nb.po @@ -4,13 +4,15 @@ # # Translators: # Martin Trigaux, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-02 10:06+0000\n" -"PO-Revision-Date: 2018-10-02 10:06+0000\n" -"Last-Translator: Martin Trigaux, 2018\n" +"PO-Revision-Date: 2018-09-21 14:23+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -136,7 +138,7 @@ msgstr "" #. module: partner_autocomplete #: model:ir.model,name:partner_autocomplete.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: partner_autocomplete #: model:ir.model,name:partner_autocomplete.model_res_partner diff --git a/addons/partner_autocomplete/i18n/pt_BR.po b/addons/partner_autocomplete/i18n/pt_BR.po index 879098b8661..bc2357af552 100644 --- a/addons/partner_autocomplete/i18n/pt_BR.po +++ b/addons/partner_autocomplete/i18n/pt_BR.po @@ -9,13 +9,15 @@ # grazziano <gra.negocia@gmail.com>, 2018 # André Augusto Firmino Cordeiro <a.cordeito@gmail.com>, 2018 # Silmar <pinheirosilmar@gmail.com>, 2018 +# Rafael H L Moretti <rafael.moretti@gmail.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-02 10:06+0000\n" -"PO-Revision-Date: 2018-10-02 10:06+0000\n" -"Last-Translator: Silmar <pinheirosilmar@gmail.com>, 2018\n" +"PO-Revision-Date: 2018-09-21 14:23+0000\n" +"Last-Translator: Rafael H L Moretti <rafael.moretti@gmail.com>, 2018\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/odoo/teams/41243/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -120,7 +122,7 @@ msgstr "" #. module: partner_autocomplete #: model:ir.model.fields,field_description:partner_autocomplete.field_res_partner__additional_info msgid "Additional info" -msgstr "" +msgstr "Informação adicional" #. module: partner_autocomplete #: model_terms:ir.ui.view,arch_db:partner_autocomplete.res_config_settings_view_form diff --git a/addons/payment/i18n/cs.po b/addons/payment/i18n/cs.po index 5cb32f0c34d..5ff07bdef66 100644 --- a/addons/payment/i18n/cs.po +++ b/addons/payment/i18n/cs.po @@ -3,18 +3,19 @@ # * payment # # Translators: -# Martin Trigaux, 2018 # Adam Kettner <cetnerix@gmail.com>, 2018 # Jan Horzinka <jan.horzinka@centrum.cz>, 2018 # Michal Veselý <michal@veselyberanek.net>, 2018 -# J. Podhorecky <j.podhorecky@volny.cz>, 2018 +# Martin Trigaux, 2018 +# trendspotter <j.podhorecky@volny.cz>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: J. Podhorecky <j.podhorecky@volny.cz>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:21+0000\n" +"Last-Translator: trendspotter <j.podhorecky@volny.cz>, 2018\n" "Language-Team: Czech (https://www.transifex.com/odoo/teams/41243/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -953,7 +954,7 @@ msgstr "Spravujte způsoby platby" #. module: payment #: model_terms:ir.ui.view,arch_db:payment.pay_meth_link msgid "Manage your payment methods" -msgstr "" +msgstr "Spravujte své platební metody" #. module: payment #: selection:res.company,payment_onboarding_payment_method:0 diff --git a/addons/payment/i18n/it.po b/addons/payment/i18n/it.po index b9455f0ce0b..c2ab5ec89a6 100644 --- a/addons/payment/i18n/it.po +++ b/addons/payment/i18n/it.po @@ -241,13 +241,13 @@ msgstr "" #: code:addons/payment/models/account_invoice.py:72 #, python-format msgid "A journal must be specified of the acquirer %s." -msgstr "Deve essere specificato un registro per il servizio %s." +msgstr "Deve essere specificato un registro per il sistema %s." #. module: payment #: code:addons/payment/models/account_invoice.py:65 #, python-format msgid "A payment acquirer is required to create a transaction." -msgstr "Per creare una transazione è necessario un servizio di pagamento." +msgstr "Per creare una transazione è necessario un sistema di pagamento." #. module: payment #: code:addons/payment/models/account_payment.py:55 @@ -305,7 +305,7 @@ msgstr "Numero conto" #: model:ir.model.fields,field_description:payment.field_payment_transaction__acquirer_id #: model_terms:ir.ui.view,arch_db:payment.acquirer_kanban msgid "Acquirer" -msgstr "Servizio" +msgstr "Sistema" #. module: payment #: model:ir.model.fields,field_description:payment.field_payment_token__acquirer_id @@ -315,22 +315,22 @@ msgstr "" #. module: payment #: model:ir.model.fields,field_description:payment.field_payment_token__acquirer_ref msgid "Acquirer Ref." -msgstr "Rif. servizio" +msgstr "Rif. sistema" #. module: payment #: model:ir.model.fields,field_description:payment.field_payment_transaction__acquirer_reference msgid "Acquirer Reference" -msgstr "Riferimento servizio" +msgstr "Riferimento sistema" #. module: payment #: model:ir.model.fields,field_description:payment.field_payment_icon__acquirer_ids msgid "Acquirers" -msgstr "Servizi" +msgstr "Sistemi" #. module: payment #: model_terms:ir.ui.view,arch_db:payment.payment_icon_form_view msgid "Acquirers list" -msgstr "Elenco servizi" +msgstr "Elenco sistemi" #. module: payment #: model_terms:ir.ui.view,arch_db:payment.acquirer_kanban @@ -607,7 +607,7 @@ msgstr "Nazione" #. module: payment #: model_terms:ir.actions.act_window,help:payment.action_payment_acquirer msgid "Create a new payment acquirer" -msgstr "Crea un nuovo servizio di pagamento" +msgstr "Crea un nuovo sistema di pagamento" #. module: payment #: model_terms:ir.actions.act_window,help:payment.action_payment_transaction @@ -617,7 +617,7 @@ msgstr "" #. module: payment #: model_terms:ir.actions.act_window,help:payment.action_payment_icon msgid "Create a payment icon" -msgstr "" +msgstr "Crea una carta di pagamento" #. module: payment #: model_terms:ir.actions.act_window,help:payment.payment_token_action @@ -715,7 +715,7 @@ msgstr "Email" #. module: payment #: model:account.payment.method,name:payment.account_payment_method_electronic_in msgid "Electronic" -msgstr "" +msgstr "Elettronico" #. module: payment #: model:ir.model.fields,field_description:payment.field_payment_transaction__partner_email @@ -881,7 +881,7 @@ msgstr "" #: code:addons/payment/models/account_invoice.py:55 #, python-format msgid "Invalid token found! Token acquirer %s != %s" -msgstr "Rilevato token non valido. Token del servizio %s != %s" +msgstr "Rilevato token non valido. Token del sistema %s != %s" #. module: payment #: code:addons/payment/models/account_invoice.py:58 @@ -951,12 +951,12 @@ msgstr "" #. module: payment #: model:ir.model.fields,help:payment.field_payment_icon__acquirer_ids msgid "List of Acquirers supporting this payment icon." -msgstr "" +msgstr "Elenco di sistemi che supportano questa carta di pagamento." #. module: payment #: model:ir.model.fields,help:payment.field_payment_acquirer__website_published msgid "Make this payment acquirer available (Customer invoices, etc.)" -msgstr "" +msgstr "Rende disponibile questo sistema di pagamento (fatture cliente ecc.)" #. module: payment #: model_terms:ir.ui.view,arch_db:payment.pay_methods @@ -1084,7 +1084,7 @@ msgstr "Mai" #. module: payment #: model_terms:ir.ui.view,arch_db:payment.pay msgid "No payment acquirer found." -msgstr "Nessun servizio di pagamento trovato." +msgstr "Nessun sistema di pagamento trovato." #. module: payment #. openerp-web @@ -1238,14 +1238,14 @@ msgstr "Pagamento" #: model:ir.model,name:payment.model_payment_acquirer #: model_terms:ir.ui.view,arch_db:payment.acquirer_form msgid "Payment Acquirer" -msgstr "Servizio di pagamento" +msgstr "Sistema di pagamento" #. module: payment #: model:ir.actions.act_window,name:payment.action_payment_acquirer #: model:ir.ui.menu,name:payment.payment_acquirer_menu #: model_terms:ir.ui.view,arch_db:payment.acquirer_list msgid "Payment Acquirers" -msgstr "Servizi di pagamento" +msgstr "Sistemi di pagamento" #. module: payment #: model:ir.model.fields,field_description:payment.field_payment_acquirer__payment_flow @@ -1256,13 +1256,13 @@ msgstr "" #: model:ir.model,name:payment.model_payment_icon #: model_terms:ir.ui.view,arch_db:payment.payment_icon_form_view msgid "Payment Icon" -msgstr "" +msgstr "Carta di pagamento" #. module: payment #: model:ir.actions.act_window,name:payment.action_payment_icon #: model:ir.ui.menu,name:payment.payment_icon_menu msgid "Payment Icons" -msgstr "Icone di pagamento" +msgstr "Carte di pagamento" #. module: payment #: model:ir.model.fields,field_description:payment.field_payment_acquirer_onboarding_wizard__manual_post_msg @@ -1304,7 +1304,7 @@ msgstr "Token Pagamento" #: model:ir.model,name:payment.model_payment_transaction #: model:ir.model.fields,field_description:payment.field_account_payment__payment_transaction_id msgid "Payment Transaction" -msgstr "Transazione Pagamento" +msgstr "Transazione di pagamento" #. module: payment #: model:ir.actions.act_window,name:payment.action_payment_transaction @@ -1314,7 +1314,7 @@ msgstr "Transazione Pagamento" #: model_terms:ir.ui.view,arch_db:payment.transaction_form #: model_terms:ir.ui.view,arch_db:payment.transaction_list msgid "Payment Transactions" -msgstr "Transazioni di Pagamento" +msgstr "Transazioni di pagamento" #. module: payment #: model:ir.model,name:payment.model_payment_acquirer_onboarding_wizard @@ -1404,7 +1404,7 @@ msgstr "Telefono" #. module: payment #: model_terms:ir.ui.view,arch_db:payment.pay msgid "Please configure a payment acquirer." -msgstr "" +msgstr "Configurare un sistema di pagamento." #. module: payment #: code:addons/payment/wizards/payment_acquirer_onboarding_wizard.py:33 @@ -1646,7 +1646,7 @@ msgstr "Chiave segreta Stripe" #. module: payment #: model:ir.model.fields,field_description:payment.field_payment_acquirer__payment_icon_ids msgid "Supported Payment Icons" -msgstr "" +msgstr "Carte di pagamento supportate" #. module: payment #: model:ir.model.fields,help:payment.field_payment_acquirer__registration_view_template_id @@ -1724,6 +1724,8 @@ msgid "" "This field holds the image used for this payment icon, limited to " "1024x1024px" msgstr "" +"Questo campo contiene l'immagine usata per questa carta di pagamento, con " +"limite 1024x1024 px" #. module: payment #: model:ir.model.fields,help:payment.field_payment_acquirer__image diff --git a/addons/payment/i18n/ja.po b/addons/payment/i18n/ja.po index d46669fa896..b8b9c1b356f 100644 --- a/addons/payment/i18n/ja.po +++ b/addons/payment/i18n/ja.po @@ -3,19 +3,20 @@ # * payment # # Translators: +# SHIMIZU Taku <shimizu.taku@gmail.com>, 2018 # Martin Trigaux, 2018 -# Yoshi Tashiro <tashiro@roomsfor.hk>, 2018 +# Manami Hashi <manami@roomsfor.hk>, 2018 # 高木正勝 <masakatsu.takagi@pro-spire.co.jp>, 2018 # Norimichi Sugimoto <norimichi.sugimoto@tls-ltd.co.jp>, 2018 -# SHIMIZU Taku <shimizu.taku@gmail.com>, 2018 -# Manami Hashi <manami@roomsfor.hk>, 2018 +# Yoshi Tashiro <tashiro@roomsfor.hk>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: Manami Hashi <manami@roomsfor.hk>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:21+0000\n" +"Last-Translator: Yoshi Tashiro <tashiro@roomsfor.hk>, 2018\n" "Language-Team: Japanese (https://www.transifex.com/odoo/teams/41243/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1558,7 +1559,7 @@ msgstr "" #. module: payment #: model_terms:ir.ui.view,arch_db:payment.onboarding_payment_acquirer_step msgid "Set payments" -msgstr "" +msgstr "支払方法を設定" #. module: payment #: model:ir.model.fields,field_description:payment.field_payment_token__short_name diff --git a/addons/payment/i18n/nl.po b/addons/payment/i18n/nl.po index dc9d500da15..5cc7710b472 100644 --- a/addons/payment/i18n/nl.po +++ b/addons/payment/i18n/nl.po @@ -258,7 +258,7 @@ msgstr "Een token is vereist om een betaaltransactie uit te voeren." #: code:addons/payment/models/payment_acquirer.py:657 #, python-format msgid "A transaction %s with %s initiated using %s credit card." -msgstr "Een transactie %s met%s gestart door%s credit card." +msgstr "Een transactie %s met%s gestart door%s creditcard." #. module: payment #: code:addons/payment/models/payment_acquirer.py:663 @@ -1228,7 +1228,7 @@ msgstr "Betaal met een andere betalingsverwerker" #. module: payment #: selection:payment.acquirer.onboarding.wizard,payment_method:0 msgid "Pay with credit card (via Stripe)" -msgstr "Betaal met credit card (via Stripe)" +msgstr "Betaal met creditcard (via Stripe)" #. module: payment #: selection:res.company,payment_onboarding_payment_method:0 diff --git a/addons/payment/i18n/payment.pot b/addons/payment/i18n/payment.pot index ac2c3e24d9a..0e60dda3645 100644 --- a/addons/payment/i18n/payment.pot +++ b/addons/payment/i18n/payment.pot @@ -1821,6 +1821,12 @@ msgid "You can click here to be redirected to the confirmation page." msgstr "" #. module: payment +#: code:addons/payment/wizards/payment_acquirer_onboarding_wizard.py:135 +#, python-format +msgid "You have to set a journal for your payment acquirer %s." +msgstr "" + +#. module: payment #. openerp-web #: code:addons/payment/static/src/xml/payment_processing.xml:131 #, python-format diff --git a/addons/payment/models/payment_acquirer.py b/addons/payment/models/payment_acquirer.py index 90d9177ff58..9fa51724678 100644 --- a/addons/payment/models/payment_acquirer.py +++ b/addons/payment/models/payment_acquirer.py @@ -4,6 +4,7 @@ import hashlib import hmac import logging from datetime import datetime +from dateutil import relativedelta import pprint from odoo import api, exceptions, fields, models, _ @@ -783,9 +784,11 @@ class PaymentTransaction(models.Model): @api.multi def _cron_post_process_after_done(self): if not self: + ten_minutes_ago = datetime.now() - relativedelta.relativedelta(minutes=10) # we retrieve all the payment tx that need to be post processed self = self.search([('state', '=', 'done'), - ('is_processed', '=', False) + ('is_processed', '=', False), + ('date', '<=', ten_minutes_ago), ]) for tx in self: try: diff --git a/addons/payment/wizards/payment_acquirer_onboarding_wizard.py b/addons/payment/wizards/payment_acquirer_onboarding_wizard.py index ba7b6ea1c29..e30d43ae861 100644 --- a/addons/payment/wizards/payment_acquirer_onboarding_wizard.py +++ b/addons/payment/wizards/payment_acquirer_onboarding_wizard.py @@ -128,8 +128,11 @@ class PaymentWizard(models.TransientModel): manual_acquirer.website_published = True journal = manual_acquirer.journal_id - journal.name = self.journal_name - journal.bank_acc_number = self.acc_number + if journal: + journal.name = self.journal_name + journal.bank_acc_number = self.acc_number + else: + raise UserError(_("You have to set a journal for your payment acquirer %s." % (self.manual_name,))) # delete wizard data immediately to get rid of residual credentials self.unlink() diff --git a/addons/payment_authorize/i18n/it.po b/addons/payment_authorize/i18n/it.po index d5044b80c20..927841ae8d4 100644 --- a/addons/payment_authorize/i18n/it.po +++ b/addons/payment_authorize/i18n/it.po @@ -104,7 +104,7 @@ msgid "" "token has a valid acquirer reference." msgstr "" "Rilevato token non valido: profilo di Authorize.Net mancante. Controllare " -"che il token abbia un riferimento valido al servizio." +"che il token abbia un riferimento valido al sistema." #. module: payment_authorize #: selection:payment.acquirer,provider:0 @@ -124,7 +124,7 @@ msgstr "PayUmoney" #. module: payment_authorize #: model:ir.model,name:payment_authorize.model_payment_acquirer msgid "Payment Acquirer" -msgstr "Servizio di pagamento" +msgstr "Sistema di pagamento" #. module: payment_authorize #: model:ir.model,name:payment_authorize.model_payment_token diff --git a/addons/payment_buckaroo/i18n/it.po b/addons/payment_buckaroo/i18n/it.po index c857f0255d0..6b82f1f6d5b 100644 --- a/addons/payment_buckaroo/i18n/it.po +++ b/addons/payment_buckaroo/i18n/it.po @@ -90,7 +90,7 @@ msgstr "PayUmoney" #. module: payment_buckaroo #: model:ir.model,name:payment_buckaroo.model_payment_acquirer msgid "Payment Acquirer" -msgstr "Servizio di pagamento" +msgstr "Sistema di pagamento" #. module: payment_buckaroo #: model:ir.model,name:payment_buckaroo.model_payment_transaction diff --git a/addons/payment_ogone/i18n/it.po b/addons/payment_ogone/i18n/it.po index a2b5c5ccf11..9f43ce45236 100644 --- a/addons/payment_ogone/i18n/it.po +++ b/addons/payment_ogone/i18n/it.po @@ -145,7 +145,7 @@ msgstr "PayUmoney" #. module: payment_ogone #: model:ir.model,name:payment_ogone.model_payment_acquirer msgid "Payment Acquirer" -msgstr "Servizio di pagamento" +msgstr "Sistema di pagamento" #. module: payment_ogone #: model:ir.model,name:payment_ogone.model_payment_token diff --git a/addons/payment_paypal/i18n/it.po b/addons/payment_paypal/i18n/it.po index 80071725818..18a94ba28ca 100644 --- a/addons/payment_paypal/i18n/it.po +++ b/addons/payment_paypal/i18n/it.po @@ -81,7 +81,7 @@ msgstr "PayUmoney" #. module: payment_paypal #: model:ir.model,name:payment_paypal.model_payment_acquirer msgid "Payment Acquirer" -msgstr "Servizio di pagamento" +msgstr "Sistema di pagamento" #. module: payment_paypal #: model:ir.model.fields,help:payment_paypal.field_payment_acquirer__paypal_pdt_token diff --git a/addons/payment_payumoney/i18n/it.po b/addons/payment_payumoney/i18n/it.po index 1e18abecfd3..b876f65fc1a 100644 --- a/addons/payment_payumoney/i18n/it.po +++ b/addons/payment_payumoney/i18n/it.po @@ -3,7 +3,7 @@ # * payment_payumoney # # Translators: -# SebastianoPistore <SebastianoPistore.info@protonmail.ch>, 2018 +# Sebastiano Pistore <SebastianoPistore.info@protonmail.ch>, 2018 # Alessandro Forte <a.forte1010@gmail.com>, 2018 # Sergio Zanchetta <primes2h@gmail.com>, 2018 # @@ -94,7 +94,7 @@ msgstr "" #. module: payment_payumoney #: model:ir.model,name:payment_payumoney.model_payment_acquirer msgid "Payment Acquirer" -msgstr "Servizio di pagamento" +msgstr "Sistema di pagamento" #. module: payment_payumoney #: model:ir.model,name:payment_payumoney.model_payment_transaction diff --git a/addons/payment_sips/i18n/it.po b/addons/payment_sips/i18n/it.po index 15d8477ed69..3519476e020 100644 --- a/addons/payment_sips/i18n/it.po +++ b/addons/payment_sips/i18n/it.po @@ -3,7 +3,7 @@ # * payment_sips # # Translators: -# SebastianoPistore <SebastianoPistore.info@protonmail.ch>, 2018 +# Sebastiano Pistore <SebastianoPistore.info@protonmail.ch>, 2018 # Paolo Valier, 2018 # Alessandro Forte <a.forte1010@gmail.com>, 2018 # Sergio Zanchetta <primes2h@gmail.com>, 2018 @@ -59,7 +59,7 @@ msgstr "Valuta non gestita da Worldline" #: code:addons/payment_sips/models/payment.py:56 #, python-format msgid "Incorrect payment acquirer provider" -msgstr "Fornitore servizio di pagamento errato" +msgstr "Fornitore sistema di pagamento errato" #. module: payment_sips #: model:ir.model.fields,field_description:payment_sips.field_payment_acquirer__sips_version @@ -89,7 +89,7 @@ msgstr "PayUmoney" #. module: payment_sips #: model:ir.model,name:payment_sips.model_payment_acquirer msgid "Payment Acquirer" -msgstr "Servizio di pagamento" +msgstr "Sistema di pagamento" #. module: payment_sips #: model:ir.model,name:payment_sips.model_payment_transaction diff --git a/addons/payment_stripe/i18n/it.po b/addons/payment_stripe/i18n/it.po index 2fdb40cecd7..03c03315a7b 100644 --- a/addons/payment_stripe/i18n/it.po +++ b/addons/payment_stripe/i18n/it.po @@ -120,7 +120,7 @@ msgstr "PayUmoney" #. module: payment_stripe #: model:ir.model,name:payment_stripe.model_payment_acquirer msgid "Payment Acquirer" -msgstr "Servizio di pagamento" +msgstr "Sistema di pagamento" #. module: payment_stripe #: model:ir.model,name:payment_stripe.model_payment_token diff --git a/addons/payment_transfer/i18n/it.po b/addons/payment_transfer/i18n/it.po index 12aff24372c..98a82d1296f 100644 --- a/addons/payment_transfer/i18n/it.po +++ b/addons/payment_transfer/i18n/it.po @@ -3,7 +3,7 @@ # * payment_transfer # # Translators: -# SebastianoPistore <SebastianoPistore.info@protonmail.ch>, 2018 +# Sebastiano Pistore <SebastianoPistore.info@protonmail.ch>, 2018 # Paolo Valier, 2018 # Alessandro Forte <a.forte1010@gmail.com>, 2018 # Sergio Zanchetta <primes2h@gmail.com>, 2018 @@ -99,7 +99,7 @@ msgstr "PayUmoney" #. module: payment_transfer #: model:ir.model,name:payment_transfer.model_payment_acquirer msgid "Payment Acquirer" -msgstr "Servizio di pagamento" +msgstr "Sistema di pagamento" #. module: payment_transfer #: model:ir.model,name:payment_transfer.model_payment_transaction diff --git a/addons/point_of_sale/i18n/is.po b/addons/point_of_sale/i18n/is.po index 429da8f25f3..1488cd6e7d4 100644 --- a/addons/point_of_sale/i18n/is.po +++ b/addons/point_of_sale/i18n/is.po @@ -4428,12 +4428,12 @@ msgstr "Ónotuð" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config__use_existing_lots msgid "Use Existing Lots/Serial Numbers" -msgstr "" +msgstr "Nota tilbúin lotu/raðnúmer" #. module: point_of_sale #: model_terms:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Use a default specific tax regime" -msgstr "" +msgstr "Nota sjálfgefnar skattareglur" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config__use_pricelist @@ -4464,7 +4464,7 @@ msgstr "Notandi" #. module: point_of_sale #: model:ir.actions.report,name:point_of_sale.report_user_label msgid "User Labels" -msgstr "" +msgstr "Notandamerkingar" #. module: point_of_sale #. openerp-web @@ -4539,6 +4539,8 @@ msgid "" "accounting journal for all the orders not invoiced. Invoices are recorded in" " accounting separately." msgstr "" +"Við uppgjör keyrslu verður til færsla í eftirfarandi færslubók fyrir allar " +"óreikningsfærðar pantanir. Reikningar eru skráðir í bókhald sérstaklega." #. module: point_of_sale #: model:product.product,name:point_of_sale.whiteboard @@ -4586,6 +4588,8 @@ msgid "" "You cannot confirm all orders of this session, because they have not the 'paid' status.\n" "{reference} is in state {state}, total amount: {total}, paid: {paid}" msgstr "" +"Ekki er hægt að staðfesta allar pantanir í þessari keyrslu því þær hafa ekki stöðuna „greidd“.\n" +"{reference} hefur stöðuna {state}, samtals upphæð: {total}, greitt: {paid}" #. module: point_of_sale #: code:addons/point_of_sale/models/pos_session.py:152 @@ -4773,12 +4777,12 @@ msgstr "afslætti" #. module: point_of_sale #: model_terms:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "e.g. Company Address, Website" -msgstr "" +msgstr "t.d. heimilisfang fyrirtækis, vefsíða" #. module: point_of_sale #: model_terms:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "e.g. Return Policy, Thanks for shopping with us!" -msgstr "" +msgstr "t.d. skilareglur, Takk fyrir viðskiptin!" #. module: point_of_sale #. openerp-web diff --git a/addons/point_of_sale/i18n/nb.po b/addons/point_of_sale/i18n/nb.po index 26c670c3379..f62c40eefce 100644 --- a/addons/point_of_sale/i18n/nb.po +++ b/addons/point_of_sale/i18n/nb.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:48+0000\n" -"PO-Revision-Date: 2018-10-08 06:48+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:22+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -926,7 +928,7 @@ msgstr "Firma" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: point_of_sale #: model:ir.ui.menu,name:point_of_sale.menu_point_config_product @@ -1656,7 +1658,7 @@ msgstr "" #. module: point_of_sale #: model_terms:ir.ui.view,arch_db:point_of_sale.pos_config_view_form msgid "Header" -msgstr "" +msgstr "Topptekst" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_pos_config__is_header_or_footer diff --git a/addons/point_of_sale/i18n/nl.po b/addons/point_of_sale/i18n/nl.po index acb3a4df0d5..6347041227a 100644 --- a/addons/point_of_sale/i18n/nl.po +++ b/addons/point_of_sale/i18n/nl.po @@ -1091,12 +1091,12 @@ msgstr "Aangemaakt op" #. module: point_of_sale #: selection:barcode.rule,type:0 msgid "Credit Card" -msgstr "Credit Card" +msgstr "Creditcard" #. module: point_of_sale #: model_terms:ir.ui.view,arch_db:point_of_sale.res_config_settings_view_form msgid "Credit Card Reader" -msgstr "Credit Card lezer" +msgstr "Creditcard lezer" #. module: point_of_sale #: model_terms:ir.ui.view,arch_db:point_of_sale.res_config_settings_view_form diff --git a/addons/point_of_sale/i18n/uk.po b/addons/point_of_sale/i18n/uk.po index 3c1625c8032..a8aef58cdc8 100644 --- a/addons/point_of_sale/i18n/uk.po +++ b/addons/point_of_sale/i18n/uk.po @@ -3094,7 +3094,7 @@ msgstr "Категорії товару" #. module: point_of_sale #: model:ir.model.fields,field_description:point_of_sale.field_report_pos_order__product_qty msgid "Product Quantity" -msgstr "Кількість" +msgstr "Кількість товару" #. module: point_of_sale #: model:ir.model,name:point_of_sale.model_product_template diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js index d0855c6fe18..a1c1c11340c 100644 --- a/addons/point_of_sale/static/src/js/models.js +++ b/addons/point_of_sale/static/src/js/models.js @@ -1510,7 +1510,8 @@ exports.Orderline = Backbone.Model.extend({ return false; }else if(this.get_discount() > 0){ // we don't merge discounted orderlines return false; - }else if(price !== orderline.get_product().get_price(orderline.order.pricelist, this.get_quantity())){ + }else if(!utils.float_is_zero(price - orderline.get_product().get_price(orderline.order.pricelist, this.get_quantity()), + this.pos.currency.decimals)){ return false; }else if(this.product.tracking == 'lot') { return false; diff --git a/addons/portal/i18n/cs.po b/addons/portal/i18n/cs.po index 06d44273673..97c56d097eb 100644 --- a/addons/portal/i18n/cs.po +++ b/addons/portal/i18n/cs.po @@ -8,14 +8,15 @@ # Jaroslav Helemik Nemec <nemec@helemik.cz>, 2018 # Jan Horzinka <jan.horzinka@centrum.cz>, 2018 # Michal Veselý <michal@veselyberanek.net>, 2018 -# J. Podhorecky <j.podhorecky@volny.cz>, 2018 +# trendspotter <j.podhorecky@volny.cz>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:18+0000\n" -"PO-Revision-Date: 2018-09-21 13:18+0000\n" -"Last-Translator: J. Podhorecky <j.podhorecky@volny.cz>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:22+0000\n" +"Last-Translator: trendspotter <j.podhorecky@volny.cz>, 2018\n" "Language-Team: Czech (https://www.transifex.com/odoo/teams/41243/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,7 +29,7 @@ msgstr "" #: code:addons/portal/static/src/js/portal_sidebar.js:43 #, python-format msgid "%d days overdue" -msgstr "" +msgstr "%d dnů po splatnosti" #. module: portal #: model_terms:ir.ui.view,arch_db:portal.portal_show_sign_in diff --git a/addons/portal/i18n/ja.po b/addons/portal/i18n/ja.po index 5ee9f855964..6fd34da508d 100644 --- a/addons/portal/i18n/ja.po +++ b/addons/portal/i18n/ja.po @@ -5,16 +5,17 @@ # Translators: # SHIMIZU Taku <shimizu.taku@gmail.com>, 2018 # Martin Trigaux, 2018 -# Yoshi Tashiro <tashiro@roomsfor.hk>, 2018 # Manami Hashi <manami@roomsfor.hk>, 2018 # Norimichi Sugimoto <norimichi.sugimoto@tls-ltd.co.jp>, 2018 +# Yoshi Tashiro <tashiro@roomsfor.hk>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:18+0000\n" -"PO-Revision-Date: 2018-09-21 13:18+0000\n" -"Last-Translator: Norimichi Sugimoto <norimichi.sugimoto@tls-ltd.co.jp>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:22+0000\n" +"Last-Translator: Yoshi Tashiro <tashiro@roomsfor.hk>, 2018\n" "Language-Team: Japanese (https://www.transifex.com/odoo/teams/41243/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -491,7 +492,7 @@ msgstr "前へ" #: code:addons/portal/static/src/xml/portal_chatter.xml:84 #, python-format msgid "Previous" -msgstr "" +msgstr "前" #. module: portal #. openerp-web diff --git a/addons/portal/i18n/nb.po b/addons/portal/i18n/nb.po index 766cf0b8561..7db0beafc44 100644 --- a/addons/portal/i18n/nb.po +++ b/addons/portal/i18n/nb.po @@ -3,15 +3,17 @@ # * portal # # Translators: -# Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Martin Trigaux, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:18+0000\n" -"PO-Revision-Date: 2018-09-21 13:18+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:22+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -334,7 +336,7 @@ msgstr "" #. module: portal #: model:ir.model,name:portal.model_ir_http msgid "HTTP Routing" -msgstr "" +msgstr "HTTP-ruting" #. module: portal #: model_terms:ir.ui.view,arch_db:portal.portal_breadcrumbs diff --git a/addons/portal/i18n/portal.pot b/addons/portal/i18n/portal.pot index d3cb55891da..408b6e2d7d0 100644 --- a/addons/portal/i18n/portal.pot +++ b/addons/portal/i18n/portal.pot @@ -622,6 +622,12 @@ msgid "VAT Number" msgstr "" #. module: portal +#: code:addons/portal/models/portal_mixin.py:83 +#, python-format +msgid "View %s" +msgstr "" + +#. module: portal #: model:ir.model.fields,field_description:portal.field_account_analytic_account__website_message_ids #: model:ir.model.fields,field_description:portal.field_calendar_event__website_message_ids #: model:ir.model.fields,field_description:portal.field_mail_blacklist__website_message_ids diff --git a/addons/portal/models/portal_mixin.py b/addons/portal/models/portal_mixin.py index c90b0e81cf4..99d8f18a266 100644 --- a/addons/portal/models/portal_mixin.py +++ b/addons/portal/models/portal_mixin.py @@ -80,7 +80,7 @@ class PortalMixin(models.AbstractModel): 'has_button_access': False, 'button_access': { 'url': access_link, - 'title': ('View %s') % self.env['ir.model']._get(message.model).display_name, + 'title': _('View %s') % self.env['ir.model']._get(message.model).display_name, }, }) ] diff --git a/addons/pos_mercury/i18n/cs.po b/addons/pos_mercury/i18n/cs.po index 3b220508b5e..16220847af5 100644 --- a/addons/pos_mercury/i18n/cs.po +++ b/addons/pos_mercury/i18n/cs.po @@ -7,14 +7,15 @@ # Ladislav Tomm <tomm@helemik.cz>, 2018 # Jan Horzinka <jan.horzinka@centrum.cz>, 2018 # Michal Veselý <michal@veselyberanek.net>, 2018 -# J. Podhorecky <j.podhorecky@volny.cz>, 2018 +# trendspotter <j.podhorecky@volny.cz>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-02 10:04+0000\n" -"PO-Revision-Date: 2018-10-02 10:04+0000\n" -"Last-Translator: J. Podhorecky <j.podhorecky@volny.cz>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:23+0000\n" +"Last-Translator: trendspotter <j.podhorecky@volny.cz>, 2018\n" "Language-Team: Czech (https://www.transifex.com/odoo/teams/41243/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -66,7 +67,7 @@ msgstr "Zástupce" #. module: pos_mercury #: model:ir.model,name:pos_mercury.model_ir_autovacuum msgid "Automatic Vacuum" -msgstr "" +msgstr "Automatické vysávání" #. module: pos_mercury #: model:ir.model,name:pos_mercury.model_account_bank_statement_line diff --git a/addons/pos_mercury/i18n/nl.po b/addons/pos_mercury/i18n/nl.po index 6d362e8be26..8df1e621b32 100644 --- a/addons/pos_mercury/i18n/nl.po +++ b/addons/pos_mercury/i18n/nl.po @@ -152,7 +152,7 @@ msgstr "Aangemaakt op" #. module: pos_mercury #: selection:barcode.rule,type:0 msgid "Credit Card" -msgstr "Credit Card" +msgstr "Creditcard" #. module: pos_mercury #. openerp-web diff --git a/addons/pos_restaurant/i18n/is.po b/addons/pos_restaurant/i18n/is.po index cddacc2f7a2..55117b4186a 100644 --- a/addons/pos_restaurant/i18n/is.po +++ b/addons/pos_restaurant/i18n/is.po @@ -957,7 +957,7 @@ msgstr "" #: model:product.product,name:pos_restaurant.water #: model:product.template,name:pos_restaurant.water_product_template msgid "Water" -msgstr "" +msgstr "Vatn" #. module: pos_restaurant #: model_terms:pos.config,customer_facing_display_html:pos_restaurant.pos_config_restaurant diff --git a/addons/pos_restaurant/i18n/nb.po b/addons/pos_restaurant/i18n/nb.po index 926714d574f..689a9e5c6b7 100644 --- a/addons/pos_restaurant/i18n/nb.po +++ b/addons/pos_restaurant/i18n/nb.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:48+0000\n" -"PO-Revision-Date: 2018-10-08 06:48+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:23+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -547,7 +549,7 @@ msgstr "OK" #: code:addons/pos_restaurant/static/src/xml/floors.xml:151 #, python-format msgid "Orange" -msgstr "" +msgstr "Oransje" #. module: pos_restaurant #. openerp-web diff --git a/addons/product/i18n/cs.po b/addons/product/i18n/cs.po index b6fb2b3c650..ca133f6c642 100644 --- a/addons/product/i18n/cs.po +++ b/addons/product/i18n/cs.po @@ -10,8 +10,8 @@ # milda dvorak <milda.dvorak@optimal4.cz>, 2018 # Jaroslav Helemik Nemec <nemec@helemik.cz>, 2018 # Michal Veselý <michal@veselyberanek.net>, 2018 -# trendspotter <j.podhorecky@volny.cz>, 2018 # Martin Trigaux, 2018 +# trendspotter <j.podhorecky@volny.cz>, 2018 # msgid "" msgstr "" @@ -19,7 +19,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" "PO-Revision-Date: 2018-08-24 09:23+0000\n" -"Last-Translator: Martin Trigaux, 2018\n" +"Last-Translator: trendspotter <j.podhorecky@volny.cz>, 2018\n" "Language-Team: Czech (https://www.transifex.com/odoo/teams/41243/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -278,7 +278,7 @@ msgstr "" #: model:ir.model.fields,field_description:product.field_product_product__message_attachment_count #: model:ir.model.fields,field_description:product.field_product_template__message_attachment_count msgid "Attachment Count" -msgstr "" +msgstr "Počet příloh" #. module: product #: model:ir.model.fields,field_description:product.field_product_attribute__name diff --git a/addons/product/i18n/nb.po b/addons/product/i18n/nb.po index c915fbda721..f7c2d18adc7 100644 --- a/addons/product/i18n/nb.po +++ b/addons/product/i18n/nb.po @@ -5,6 +5,7 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 # msgid "" msgstr "" @@ -12,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" "PO-Revision-Date: 2018-08-24 09:23+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -476,7 +477,7 @@ msgstr "" #. module: product #: model:ir.model,name:product.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: product #: model_terms:ir.ui.view,arch_db:product.product_template_form_view @@ -1400,7 +1401,7 @@ msgstr "Underkategori av" #. module: product #: model:ir.model.fields,field_description:product.field_product_category__parent_path msgid "Parent Path" -msgstr "" +msgstr "Overordnet sti" #. module: product #: model:product.product,name:product.product_product_9 diff --git a/addons/project/controllers/portal.py b/addons/project/controllers/portal.py index 72636feea62..b1bcc286606 100644 --- a/addons/project/controllers/portal.py +++ b/addons/project/controllers/portal.py @@ -180,7 +180,7 @@ class CustomerPortal(CustomerPortal): # content according to pager and archive selected if groupby == 'project': order = "project_id, %s" % order # force sort on project first to group by project in view - tasks = request.env['project.task'].search(domain, order=order, limit=self._items_per_page, offset=pager['offset']) + tasks = request.env['project.task'].search(domain, order=order, limit=self._items_per_page, offset=(page - 1) * self._items_per_page) request.session['my_tasks_history'] = tasks.ids[:100] if groupby == 'project': grouped_tasks = [request.env['project.task'].concat(*g) for k, g in groupbyelem(tasks, itemgetter('project_id'))] diff --git a/addons/project/i18n/cs.po b/addons/project/i18n/cs.po index 2b6f73c367a..b2033c2f34c 100644 --- a/addons/project/i18n/cs.po +++ b/addons/project/i18n/cs.po @@ -3,21 +3,22 @@ # * project # # Translators: -# Martin Trigaux, 2018 # Jakub Lohnisky <jakub@lepremier.cz>, 2018 # Ladislav Tomm <tomm@helemik.cz>, 2018 -# Jan Horzinka <jan.horzinka@centrum.cz>, 2018 -# Michal Veselý <michal@veselyberanek.net>, 2018 -# J. Podhorecky <j.podhorecky@volny.cz>, 2018 # Chris <krystof.reklamy13@gmail.com>, 2018 # Jaroslav Helemik Nemec <nemec@helemik.cz>, 2018 +# Jan Horzinka <jan.horzinka@centrum.cz>, 2018 +# Michal Veselý <michal@veselyberanek.net>, 2018 +# Martin Trigaux, 2018 +# trendspotter <j.podhorecky@volny.cz>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:48+0000\n" -"PO-Revision-Date: 2018-10-08 06:48+0000\n" -"Last-Translator: Jaroslav Helemik Nemec <nemec@helemik.cz>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:23+0000\n" +"Last-Translator: trendspotter <j.podhorecky@volny.cz>, 2018\n" "Language-Team: Czech (https://www.transifex.com/odoo/teams/41243/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -454,7 +455,7 @@ msgstr "Příloha" #: model:ir.model.fields,field_description:project.field_project_project__message_attachment_count #: model:ir.model.fields,field_description:project.field_project_task__message_attachment_count msgid "Attachment Count" -msgstr "" +msgstr "Počet příloh" #. module: project #: model:ir.model.fields,help:project.field_project_task__attachment_ids diff --git a/addons/project/i18n/it.po b/addons/project/i18n/it.po index c27366cefd1..0d16dac1b59 100644 --- a/addons/project/i18n/it.po +++ b/addons/project/i18n/it.po @@ -22,8 +22,8 @@ # efraimbiffi <eab@odoo.com>, 2018 # Martin Trigaux, 2018 # Paolo Valier, 2018 -# Sergio Zanchetta <primes2h@gmail.com>, 2018 # Léonie Bouchat <lbo@odoo.com>, 2018 +# Sergio Zanchetta <primes2h@gmail.com>, 2018 # msgid "" msgstr "" @@ -31,7 +31,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:48+0000\n" "PO-Revision-Date: 2018-08-24 09:23+0000\n" -"Last-Translator: Léonie Bouchat <lbo@odoo.com>, 2018\n" +"Last-Translator: Sergio Zanchetta <primes2h@gmail.com>, 2018\n" "Language-Team: Italian (https://www.transifex.com/odoo/teams/41243/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2586,7 +2586,7 @@ msgstr "" #. module: project #: model:ir.model.fields,field_description:project.field_res_config_settings__module_hr_timesheet msgid "Task Logs" -msgstr "" +msgstr "Registri attività" #. module: project #: model:ir.filters,name:project.filter_task_report_task_pipe diff --git a/addons/project/i18n/nb.po b/addons/project/i18n/nb.po index 590d5848096..37867f02a33 100644 --- a/addons/project/i18n/nb.po +++ b/addons/project/i18n/nb.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:48+0000\n" -"PO-Revision-Date: 2018-10-08 06:48+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:23+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -660,7 +662,7 @@ msgstr "" #. module: project #: model:ir.model,name:project.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: project #: model:ir.ui.menu,name:project.menu_project_config @@ -966,7 +968,7 @@ msgstr "Utkast" #. module: project #: model_terms:ir.ui.view,arch_db:project.view_task_kanban msgid "Dropdown menu" -msgstr "" +msgstr "Nedtrekksmeny" #. module: project #: model_terms:ir.ui.view,arch_db:project.view_project_kanban diff --git a/addons/project/i18n/uk.po b/addons/project/i18n/uk.po index 42a2d197fce..a5078238cd4 100644 --- a/addons/project/i18n/uk.po +++ b/addons/project/i18n/uk.po @@ -445,14 +445,14 @@ msgid "" msgstr "" "На кожному етапі співробітники можуть заблокувати або зробити завдання/проблему готову до наступного етапу.\n" "Тут можна визначити мітки, які відображатимуться замість статусу\n" -"ярликів за умовчанням." +"ярликів за замовчуванням." #. module: project #. openerp-web #: code:addons/project/static/src/xml/project.xml:7 #, python-format msgid "Attachment" -msgstr "Вкладення" +msgstr "Прикріплення" #. module: project #: model:ir.model.fields,field_description:project.field_project_project__message_attachment_count @@ -463,13 +463,13 @@ msgstr "Підрахунок прикріплення" #. module: project #: model:ir.model.fields,help:project.field_project_task__attachment_ids msgid "Attachment that don't come from message." -msgstr "Додаток, що не походить від повідомлення." +msgstr "Прикріплення, що не походить від повідомлення." #. module: project #: code:addons/project/models/project.py:114 #, python-format msgid "Attachments" -msgstr "Долучення" +msgstr "Прикріпплення" #. module: project #: model:ir.model.fields,field_description:project.field_project_task_type__auto_validation_kanban_state @@ -764,7 +764,7 @@ msgstr "Дата створення" #. module: project #: model:ir.filters,name:project.filter_task_report_cumulative_flow msgid "Cumulative Flow" -msgstr "Сумарний потік" +msgstr "Сукупний процес" #. module: project #: model:ir.model.fields,field_description:project.field_project_project__currency_id @@ -811,7 +811,7 @@ msgstr "" #: model:ir.model.fields,help:project.field_project_project__access_url #: model:ir.model.fields,help:project.field_project_task__access_url msgid "Customer Portal URL" -msgstr "URL Порталу клієнта" +msgstr "URL порталу клієнта" #. module: project #: model:ir.actions.act_window,name:project.rating_rating_action_project_report @@ -878,7 +878,7 @@ msgid "" " solving a task or an issue." msgstr "" "Визначте кроки, які будуть використовуватися в проекті зі\n" -"створення завдання, аж до закриття завдання чи питання.\n" +"створення завдання, аж до закриття завдання чи проблеми.\n" "Ви будете використовувати ці етапи для відстеження прогресу\n" "вирішення задачі чи проблеми." @@ -1066,8 +1066,8 @@ msgid "" "Explanation text to help users using the star on tasks or issues in this " "stage." msgstr "" -"Текст пояснення, щоб допомогти користувачам, які використовують зірку, на " -"завдання чи проблеми на цьому етапі." +"Текст пояснення, щоб допомогти користувачам, які позначають зіркою завдання " +"чи проблеми на цьому етапі." #. module: project #: model_terms:ir.ui.view,arch_db:project.view_task_project_user_search @@ -1174,7 +1174,7 @@ msgstr "Дає порядок послідовності при відображ #. module: project #: selection:project.task,kanban_state:0 msgid "Green" -msgstr "Зелена" +msgstr "Зелений" #. module: project #: model:ir.model.fields,field_description:project.field_project_task_type__legend_done @@ -1409,8 +1409,8 @@ msgid "" "Tracker module is installed)." msgstr "" "Внутрішня електронна пошта, пов'язана з цим проектом. Вхідні електронні " -"листи автоматично синхронізуються із завданнями (або, якщо можливо, " -"проблеми, якщо модуль Відстеження проблемвстановлено)." +"листи автоматично синхронізуються із завданнями (або, можливі проблеми, якщо" +" встановлено модуль Відстеження проблем)." #. module: project #: model:ir.model.fields,field_description:project.field_project_project__message_is_follower @@ -1558,9 +1558,8 @@ msgid "" "Lets the company customize which Pad installation should be used to link to " "new pads (for example: http://etherpad.com/)." msgstr "" -"Дозволяє компанії налаштовувати, яке встановлення Блокноту слід " -"використовувати для посилання на нові блокноти (наприклад: " -"http://ietherpad.com/)." +"Дозволяє компанії налаштовувати, яке встановлення Pad слід використовувати " +"для посилання на нові pad (наприклад: http://ietherpad.com/)." #. module: project #. openerp-web @@ -1603,7 +1602,7 @@ msgstr "Основне прикріплення" #. module: project #: model:ir.model.fields,field_description:project.field_project_task__attachment_ids msgid "Main Attachments" -msgstr "Основні вкладення" +msgstr "Основні прикріплення" #. module: project #: model:res.groups,name:project.group_project_manager @@ -1726,7 +1725,7 @@ msgstr "Наступні дії" #. module: project #: model:ir.model.fields,field_description:project.field_project_task__activity_date_deadline msgid "Next Activity Deadline" -msgstr "Наступий дедлайн дії" +msgstr "Дедлайн наступної дії" #. module: project #: model:ir.model.fields,field_description:project.field_project_task__activity_summary @@ -1736,7 +1735,7 @@ msgstr "Підсумок наступної дії" #. module: project #: model:ir.model.fields,field_description:project.field_project_task__activity_type_id msgid "Next Activity Type" -msgstr "Наступний тип дії" +msgstr "Тип наступної дії" #. module: project #: code:addons/project/models/project.py:852 @@ -1807,7 +1806,7 @@ msgstr "Кількість робочих днів до закриття зав #. module: project #: model:ir.model.fields,field_description:project.field_project_project__doc_count msgid "Number of documents attached" -msgstr "Кількість долучених документів" +msgstr "Кількість прикріплених документів" #. module: project #: model:ir.model.fields,field_description:project.field_project_project__message_has_error_counter @@ -1879,7 +1878,7 @@ msgstr "" #. module: project #: model_terms:ir.actions.act_window,help:project.open_view_project_all msgid "Or" -msgstr "або" +msgstr "Або" #. module: project #: model_terms:ir.actions.act_window,help:project.open_view_project_all_config @@ -1899,7 +1898,7 @@ msgstr "Інші" #. module: project #: selection:project.task,activity_state:0 msgid "Overdue" -msgstr "Прострочено" +msgstr "Протерміновано" #. module: project #: model:ir.actions.act_window,name:project.action_view_task_overpassed_draft @@ -1914,8 +1913,8 @@ msgid "" "selection, when the task or issue is in that stage." msgstr "" "Перевизначити значення за замовчуванням, яке відображається для " -"заблокованого стану для вибору каналу, коли завдання або питання знаходяться" -" на цьому етапі." +"заблокованого стану для вибору канбану, коли завдання або питання " +"знаходяться на цьому етапі." #. module: project #: model:ir.model.fields,help:project.field_project_task__legend_done @@ -1925,8 +1924,8 @@ msgid "" "selection, when the task or issue is in that stage." msgstr "" "Перевизначити значення за замовчуванням, яке відображається для " -"заблокованого стану для вибору каналу, коли завдання або питання знаходяться" -" на цьому етапі." +"заблокованого стану для вибору канбану, коли завдання або проблема " +"знаходяться на цьому етапі." #. module: project #: model:ir.model.fields,help:project.field_project_task__legend_normal @@ -1936,7 +1935,7 @@ msgid "" "selection, when the task or issue is in that stage." msgstr "" "Перевизначити значення за замовчуванням, яке відображається для звичайного " -"стану для вибору канбану, коли завдання або питання знаходяться на цьому " +"стану для вибору канбану, коли завдання або проблема знаходяться на цьому " "етапі." #. module: project @@ -1959,7 +1958,7 @@ msgstr "Батьківська модель" #. module: project #: model:ir.model.fields,field_description:project.field_project_project__alias_parent_thread_id msgid "Parent Record Thread ID" -msgstr " ID запису батьківської теми" +msgstr "ID запису батьківської теми" #. module: project #: code:addons/project/models/project.py:919 @@ -2027,7 +2026,7 @@ msgstr "" #: model:ir.model.fields,field_description:project.field_project_project__access_url #: model:ir.model.fields,field_description:project.field_project_task__access_url msgid "Portal Access URL" -msgstr "URL Доступу до порталу" +msgstr "URL доступу до порталу" #. module: project #: model:ir.model.fields,field_description:project.field_project_task__priority @@ -2160,7 +2159,7 @@ msgstr "Шаблон листа оцінки" #. module: project #: model:ir.model.fields,field_description:project.field_project_project__rating_status_period msgid "Rating Frequency" -msgstr "Частота рейтингу" +msgstr "Частота оцінювання" #. module: project #: model:ir.model.fields,field_description:project.field_project_task__rating_last_feedback @@ -2175,7 +2174,7 @@ msgstr "Останнє зображення рейтингу" #. module: project #: model:ir.model.fields,field_description:project.field_project_task__rating_last_value msgid "Rating Last Value" -msgstr "Оцінювання останнього значення" +msgstr "Останнє значення рейтингу" #. module: project #: model:ir.model.fields,field_description:project.field_project_project__rating_request_deadline @@ -2384,7 +2383,7 @@ msgstr "Пошук в етапах" #: model:ir.model.fields,field_description:project.field_project_project__access_token #: model:ir.model.fields,field_description:project.field_project_task__access_token msgid "Security Token" -msgstr "Token безпеки" +msgstr "Токен безпеки" #. module: project #. openerp-web @@ -2403,7 +2402,7 @@ msgstr "Послідовність" #. module: project #: model_terms:ir.ui.view,arch_db:project.view_task_kanban msgid "Set Cover Image" -msgstr "Встановіть обкладинку" +msgstr "Встановити обкладинку" #. module: project #: model_terms:digest.tip,tip_description:project.digest_tip_project_0 @@ -2420,7 +2419,7 @@ msgstr "Встановити шаблон електронної пошти на #: code:addons/project/static/src/js/project.js:64 #, python-format msgid "Set a Cover Image" -msgstr "Встановіть обкладинку" +msgstr "Встановити обкладинку" #. module: project #: model:ir.actions.act_window,name:project.project_config_settings_action @@ -2506,7 +2505,7 @@ msgstr "Стадії" #. module: project #: model_terms:ir.ui.view,arch_db:project.view_task_search_form msgid "Starred" -msgstr "З зірочкою" +msgstr "Позначено зірочкою" #. module: project #: model:ir.model.fields,field_description:project.field_project_task_type__legend_priority @@ -2532,7 +2531,7 @@ msgid "" "Planned: Future activities." msgstr "" "Етап заснований на діях\n" -"Прострочений: термін виконання вже минув\n" +"Протерміновано: термін виконання вже минув\n" "Сьогодні: дата дії сьогодні\n" "Заплановано: майбутні дії." @@ -2597,7 +2596,7 @@ msgstr "" #. module: project #: model:ir.model.fields,field_description:project.field_project_project__tasks msgid "Task Activities" -msgstr "Дії по завдвнню" +msgstr "Дії по завданню" #. module: project #: model:mail.message.subtype,name:project.mt_project_task_blocked @@ -2756,7 +2755,7 @@ msgid "" "The name of the email alias, e.g. 'jobs' if you want to catch emails for " "<jobs@example.odoo.com>" msgstr "" -"Ім'я псевдоніма електронної пошти, наприклад, \"Робота\", якщо ви хочете " +"Ім'я псевдоніма електронної пошти, наприклад, 'jobs', якщо ви хочете " "отримувати повідомлення електронної пошти на <jobs@example.odoo.com>" #. module: project @@ -2990,7 +2989,7 @@ msgstr "Використовувати завдання як" #. module: project #: model_terms:ir.ui.view,arch_db:project.res_config_settings_view_form msgid "Use collaborative rich text pads on tasks" -msgstr "Використовуйте спільні багаті текстові поля для завдань" +msgstr "Використовуйте спільні текстові поля для завдань" #. module: project #. openerp-web @@ -3053,7 +3052,7 @@ msgstr "Ел. пошта підписників" #: model:ir.model.fields,field_description:project.field_project_project__website_message_ids #: model:ir.model.fields,field_description:project.field_project_task__website_message_ids msgid "Website Messages" -msgstr "Повідомлення з вебсайту" +msgstr "Повідомлення з веб-сайту" #. module: project #. openerp-web diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml index d5f1d244968..f70482f857c 100644 --- a/addons/project/views/project_views.xml +++ b/addons/project/views/project_views.xml @@ -525,7 +525,6 @@ <field name="stage_id" options='{"group_by_tooltip": {"description": "Stage Description", "legend_priority": "Use of stars"}}'/> <field name="user_id"/> <field name="user_email"/> - <field name="description"/> <field name="sequence"/> <field name="date_deadline"/> <field name="message_needaction_counter"/> diff --git a/addons/project_timesheet_holidays/i18n/nb.po b/addons/project_timesheet_holidays/i18n/nb.po index 0e2190578bc..09d0e2c00d6 100644 --- a/addons/project_timesheet_holidays/i18n/nb.po +++ b/addons/project_timesheet_holidays/i18n/nb.po @@ -4,13 +4,15 @@ # # Translators: # Martin Trigaux, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: Martin Trigaux, 2018\n" +"PO-Revision-Date: 2018-08-24 09:23+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -44,7 +46,7 @@ msgstr "Firmaer" #. module: project_timesheet_holidays #: model:ir.model,name:project_timesheet_holidays.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: project_timesheet_holidays #: model:ir.model.fields,help:project_timesheet_holidays.field_res_company__leave_timesheet_project_id diff --git a/addons/purchase/i18n/cs.po b/addons/purchase/i18n/cs.po index 8a9541e8b9e..57d0150cdac 100644 --- a/addons/purchase/i18n/cs.po +++ b/addons/purchase/i18n/cs.po @@ -308,7 +308,7 @@ msgstr "" #. module: purchase #: model:ir.model.fields,field_description:purchase.field_purchase_order__message_attachment_count msgid "Attachment Count" -msgstr "" +msgstr "Počet příloh" #. module: purchase #: model:ir.model.fields,field_description:purchase.field_account_invoice__vendor_bill_purchase_id diff --git a/addons/purchase/i18n/fi.po b/addons/purchase/i18n/fi.po index 379f5668a35..376f5af08c4 100644 --- a/addons/purchase/i18n/fi.po +++ b/addons/purchase/i18n/fi.po @@ -1460,12 +1460,12 @@ msgstr "Tarjouspyyntö" #. module: purchase #: model:mail.message.subtype,name:purchase.mt_rfq_approved msgid "RFQ Approved" -msgstr "Ostoehdotus hyväksytty" +msgstr "Tarjouspyyntö hyväksytty" #. module: purchase #: model:mail.message.subtype,name:purchase.mt_rfq_confirmed msgid "RFQ Confirmed" -msgstr "Ostoehdotus vahvistettu" +msgstr "Tarjouspyyntö vahvistettu" #. module: purchase #: model:mail.message.subtype,name:purchase.mt_rfq_done @@ -1475,12 +1475,12 @@ msgstr "Tarjouspyyntö valmis" #. module: purchase #: selection:purchase.order,state:0 selection:purchase.report,state:0 msgid "RFQ Sent" -msgstr "Ostoehdotus lähetetty" +msgstr "Tarjouspyyntö lähetetty" #. module: purchase #: model:mail.template,report_name:purchase.email_template_edi_purchase msgid "RFQ_${(object.name or '').replace('/','_')}" -msgstr "Ostoehdotus_${(object.name or '').replace('/','_')}" +msgstr "Tarjouspyyntö_${(object.name or '').replace('/','_')}" #. module: purchase #: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order @@ -1554,7 +1554,7 @@ msgstr "Raportointi" #: model:ir.actions.report,name:purchase.report_purchase_quotation #: model_terms:ir.ui.view,arch_db:purchase.report_purchasequotation_document msgid "Request for Quotation" -msgstr "Ostoehdotus" +msgstr "Tarjouspyyntö" #. module: purchase #: model_terms:ir.ui.view,arch_db:purchase.report_purchaseorder_document diff --git a/addons/purchase/i18n/nb.po b/addons/purchase/i18n/nb.po index 7b31790ebad..70cf1569bfa 100644 --- a/addons/purchase/i18n/nb.po +++ b/addons/purchase/i18n/nb.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:23+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -441,7 +443,7 @@ msgstr "Skriv epostmelding" #. module: purchase #: model:ir.model,name:purchase.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_purchase_config diff --git a/addons/purchase/i18n/purchase.pot b/addons/purchase/i18n/purchase.pot index 659b6bbbeca..a994f6a8a6f 100644 --- a/addons/purchase/i18n/purchase.pot +++ b/addons/purchase/i18n/purchase.pot @@ -1483,8 +1483,10 @@ msgid "Reporting" msgstr "" #. module: purchase +#: code:addons/purchase/models/purchase.py:276 #: model:ir.actions.report,name:purchase.report_purchase_quotation #: model_terms:ir.ui.view,arch_db:purchase.report_purchasequotation_document +#, python-format msgid "Request for Quotation" msgstr "" diff --git a/addons/purchase/i18n/uk.po b/addons/purchase/i18n/uk.po index 506b275796b..f12ffb596c0 100644 --- a/addons/purchase/i18n/uk.po +++ b/addons/purchase/i18n/uk.po @@ -40,12 +40,12 @@ msgstr "${object.company_id.name} Замовлення (Ref ${object.name or 'н #. module: purchase #: model_terms:ir.ui.view,arch_db:purchase.res_config_settings_view_form_purchase msgid "3-way matching" -msgstr "3 шляхи співставлення" +msgstr "Три шляхи співставлення" #. module: purchase #: model:ir.model.fields,field_description:purchase.field_res_config_settings__module_account_3way_match msgid "3-way matching: purchases, receptions and bills" -msgstr "3 шляхи співставлення: купівлі, прийоми та рахунки" +msgstr "Три шляхи співставлення: купівлі, прийоми та рахунки" #. module: purchase #: model:mail.template,body_html:purchase.email_template_edi_purchase_done @@ -129,7 +129,7 @@ msgstr "<strong>Сума</strong>" #. module: purchase #: model_terms:ir.ui.view,arch_db:purchase.report_purchaseorder_document msgid "<strong>Date Req.</strong>" -msgstr "<strong>Запл. дата</strong>" +msgstr "<strong>Дата запиту</strong>" #. module: purchase #: model_terms:ir.ui.view,arch_db:purchase.portal_my_purchase_order @@ -227,7 +227,7 @@ msgstr "" #. module: purchase #: model:res.groups,name:purchase.group_warning_purchase msgid "A warning can be set on a product or a customer (Purchase)" -msgstr "Застереження може бути встановлене для продукту або клієнта (Купівля)" +msgstr "Застереження може бути встановлене для товару або клієнта (Купівля)" #. module: purchase #: model:ir.model.fields,field_description:purchase.field_purchase_order__access_warning @@ -375,8 +375,8 @@ msgid "" msgstr "" "За замовчуванням ціни постачальників можна встановити вручну у формі деталей" " товару. Якщо ваші постачальники надають вам файли прайслиста, цей параметр " -"дозволяє вам легко імпортувати їх у систему з меню \"Купівлі> Ціни " -"постачальників\"." +"дозволяє вам легко імпортувати їх у систему з меню ‘Купівлі > Ціни " +"постачальників’." #. module: purchase #: model_terms:ir.ui.view,arch_db:purchase.purchase_order_calendar @@ -392,10 +392,10 @@ msgid "" "want a Call for Tenders to compare offers from several vendors." msgstr "" "Дзвінки на тендери використовуються, коли ви хочете створити запити для " -"комерційних пропозицій декільком постачальникам для певного набору товарів. " -"Ви можете налаштувати для кожного товару, якщо ви безпосередньо робите запит" -" на комерційну пропозицію одному продавцеві або якщо ви хочете, щоб " -"запрошення до участі в тендері порівнював пропозиції від кількох " +"комерційних пропозицій кільком постачальникам для певного набору товарів. Ви" +" можете налаштувати для кожного товару, якщо ви безпосередньо робите запит " +"на комерційну пропозицію одному продавцеві або якщо ви хочете, аби " +"запрошення до участі в тендері порівнювало пропозиції від кількох " "постачальників." #. module: purchase @@ -419,7 +419,7 @@ msgstr "" #: code:addons/purchase/models/purchase.py:509 #, python-format msgid "Cannot delete a purchase order line which is in state '%s'." -msgstr "Неможливо видалити замовлення на купівлю якщо воно в стані '%s'." +msgstr "Неможливо видалити замовлення на купівлю якщо воно у стані '%s'." #. module: purchase #: model:ir.model.fields,field_description:purchase.field_purchase_report__commercial_partner_id @@ -469,7 +469,7 @@ msgstr "Підтвердити замовлення" #. module: purchase #: selection:res.company,po_double_validation:0 msgid "Confirm purchase orders in one step" -msgstr "Підтвердити замовлення на купівлю за один крок" +msgstr "Підтвердити замовлення на купівлю в один крок" #. module: purchase #: selection:res.company,po_lock:0 @@ -545,7 +545,7 @@ msgstr "Валюта" #. module: purchase #: model:ir.model.fields,help:purchase.field_purchase_order__access_url msgid "Customer Portal URL" -msgstr "URL Порталу клієнта" +msgstr "URL порталу клієнта" #. module: purchase #: model:ir.model.fields,field_description:purchase.field_purchase_bill_union__date @@ -580,7 +580,7 @@ msgstr "Визначте свої умови ..." #. module: purchase #: selection:res.config.settings,default_purchase_method:0 msgid "Delivered quantities" -msgstr "По доставленій кількості" +msgstr "Доставлені кількості" #. module: purchase #: model:ir.model.fields,help:purchase.field_purchase_order__date_order @@ -623,7 +623,7 @@ msgstr "Сума подвійного затвердження" #. module: purchase #: selection:purchase.report,state:0 msgid "Draft RFQ" -msgstr "Чорновий ЗКП" +msgstr "Чорновий ЗНКП" #. module: purchase #: model:ir.model.fields,field_description:purchase.field_purchase_order__dest_address_id @@ -671,13 +671,13 @@ msgstr "Підписники (Партнери)" #. module: purchase #: model_terms:ir.ui.view,arch_db:purchase.view_purchase_order_filter msgid "Future Activities" -msgstr "Майбутня діяльність" +msgstr "Майбутні дії" #. module: purchase #: selection:res.company,po_double_validation:0 msgid "Get 2 levels of approvals to confirm a purchase order" msgstr "" -"Використовувати 2 рівні підтвердження, щоб затвердити замовлення на купівлю" +"Використовуйте 2 рівні підтвердження, щоби затвердити замовлення на купівлю" #. module: purchase #: model_terms:ir.ui.view,arch_db:purchase.res_config_settings_view_form_purchase @@ -730,8 +730,8 @@ msgid "" "If enabled, activates 3-way matching on vendor bills : the items must be " "received in order to pay the invoice." msgstr "" -"Якщо це ввімкнено, активізує 3-сторонню відповідність на рахунки " -"постачальника: елементи повинні бути отримані для оплати рахунку-фактури." +"Якщо це ввімкнено, активізує тристоронню відповідність на рахунки " +"постачальника: елементи повинні бути отримані для оплати рахунка-фактури." #. module: purchase #: code:addons/purchase/models/product.py:38 @@ -749,12 +749,12 @@ msgstr "Імпортувати прайслист постачальника" #, python-format msgid "In order to delete a purchase order, you must cancel it first." msgstr "" -"Щоб видалити замовлення на купівлю вам необхідно спочатку його скасувати" +"Щоби видалити замовлення на купівлю вам необхідно спочатку його скасувати" #. module: purchase #: model:ir.model.fields,field_description:purchase.field_purchase_order__incoterm_id msgid "Incoterm" -msgstr "Інкотермс" +msgstr "Інкотерм" #. module: purchase #: model:ir.model.fields,help:purchase.field_purchase_order__incoterm_id @@ -762,8 +762,8 @@ msgid "" "International Commercial Terms are a series of predefined commercial terms " "used in international transactions." msgstr "" -"Міжнародні комерційні умови, комплект міжнародних правил з тлумачення " -"найбільш широко використовуваних торгівельних термінів в галузі міжнародної " +"Міжнародні комерційні умови, комплект міжнародних правил із тлумачення " +"найбільш широко використаних торговельних термінів у галузі міжнародної " "торгівлі." #. module: purchase @@ -824,7 +824,7 @@ msgstr "Останні дії" #. module: purchase #: model:ir.model.fields,field_description:purchase.field_res_company__po_double_validation msgid "Levels of Approvals" -msgstr "Рівнів підтвердження" +msgstr "Рівні підтвердження" #. module: purchase #: model:ir.model.fields,field_description:purchase.field_res_config_settings__po_double_validation @@ -871,14 +871,14 @@ msgstr "" #. module: purchase #: model:res.groups,name:purchase.group_manage_vendor_price msgid "Manage Vendor Price" -msgstr "Керувати ціною постачальника" +msgstr "Керуйте ціною постачальника" #. module: purchase #: model_terms:ir.ui.view,arch_db:purchase.res_config_settings_view_form_purchase msgid "Manage your purchase agreements (call for tenders, blanket orders)" msgstr "" -"Керуйте своїми угодами про покупку (дзвінки на тендери, замовлення на " -"ковдру)" +"Керуйте своїми угодами про купівлю (дзвінки на тендери, довгострокові " +"замовлення)" #. module: purchase #: model:res.groups,name:purchase.group_purchase_manager @@ -905,7 +905,7 @@ msgid "" msgstr "" "Межа відхилення для терміну поставки постачальника. Коли система генерує " "замовлення на купівлю для товарів, що закуповуються, воно буде створено на " -"цю кількість днів раніше, щоб щоб впоратися з несподіваними затримками " +"цю кількість днів раніше, щоби впоратися з несподіваними затримками " "постачальників." #. module: purchase @@ -929,7 +929,7 @@ msgstr "Помилка доставлення повідомлення" #: model:ir.model.fields,field_description:purchase.field_res_partner__purchase_warn_msg #: model:ir.model.fields,field_description:purchase.field_res_users__purchase_warn_msg msgid "Message for Purchase Order" -msgstr "Повідомлення для замовлення закупівлі" +msgstr "Повідомлення для замовлення на купівлю" #. module: purchase #: model:ir.model.fields,field_description:purchase.field_product_product__purchase_line_warn_msg @@ -956,7 +956,7 @@ msgstr "Мінімальна сума, для якої необхідно роб #. module: purchase #: model:ir.filters,name:purchase.filter_purchase_order_monthly_purchases msgid "Monthly Purchases" -msgstr "Щомісячні купівлі" +msgstr "Щомісячні закупівлі" #. module: purchase #: model_terms:ir.ui.view,arch_db:purchase.view_purchase_order_filter @@ -988,7 +988,7 @@ msgstr "Найновіші" #. module: purchase #: model:ir.model.fields,field_description:purchase.field_purchase_order__activity_date_deadline msgid "Next Activity Deadline" -msgstr "Наступий дедлайн дії" +msgstr "Дедлайн наступної дії" #. module: purchase #: model:ir.model.fields,field_description:purchase.field_purchase_order__activity_summary @@ -998,7 +998,7 @@ msgstr "Підсумок наступної дії" #. module: purchase #: model:ir.model.fields,field_description:purchase.field_purchase_order__activity_type_id msgid "Next Activity Type" -msgstr "Наступний тип дії" +msgstr "Тип наступної дії" #. module: purchase #: selection:purchase.order,invoice_status:0 @@ -1022,8 +1022,8 @@ msgid "" "Non-stored related field to allow portal user to see the image of the " "product he has ordered" msgstr "" -"Дозволити непов'язане поле зберігання, щоб користувач порталу побачив " -"зображення товару, яке він замовив" +"Дозволити незбережене пов'язане поле, щоби користувач порталу побачив " +"зображення товару, який він замовив" #. module: purchase #: model_terms:ir.ui.view,arch_db:purchase.purchase_order_form @@ -1033,7 +1033,7 @@ msgstr "Примітки" #. module: purchase #: selection:purchase.order,invoice_status:0 msgid "Nothing to Bill" -msgstr "Немає нічого для рахунку" +msgstr "Немає нічого для виставлення рахунку" #. module: purchase #: model:ir.model.fields,field_description:purchase.field_purchase_order__message_needaction_counter @@ -1129,7 +1129,7 @@ msgstr "Інша інформація" #. module: purchase #: selection:purchase.order,activity_state:0 msgid "Overdue" -msgstr "Прострочено" +msgstr "Протерміновано" #. module: purchase #: model:mail.template,report_name:purchase.email_template_edi_purchase_done @@ -1159,7 +1159,7 @@ msgstr "Заплановано" #. module: purchase #: model:ir.model.fields,field_description:purchase.field_purchase_order__access_url msgid "Portal Access URL" -msgstr "URL Доступу до порталу" +msgstr "URL доступу до порталу" #. module: purchase #: model:ir.model.fields,field_description:purchase.field_product_category__property_account_creditor_price_difference_categ @@ -1171,12 +1171,12 @@ msgstr "Рахунок різниці в ціні" #. module: purchase #: model:ir.filters,name:purchase.filter_purchase_order_price_per_supplier msgid "Price Per Vendor" -msgstr "Ціна по постачальниках" +msgstr "Ціна на постачальника" #. module: purchase #: model_terms:ir.ui.view,arch_db:purchase.purchase_order_form msgid "Print RFQ" -msgstr "Надрукувати ЗКП" +msgstr "Надрукувати ЗНКП" #. module: purchase #: model:ir.model,name:purchase.model_product_product @@ -1208,7 +1208,7 @@ msgstr "Зображення товару" #. module: purchase #: model:ir.model.fields,field_description:purchase.field_purchase_report__unit_quantity msgid "Product Quantity" -msgstr "Кількість" +msgstr "Кількість товару" #. module: purchase #: model:ir.model,name:purchase.model_product_template @@ -1224,7 +1224,7 @@ msgstr "Тип товару" #. module: purchase #: model:ir.model.fields,field_description:purchase.field_purchase_order_line__product_uom msgid "Product Unit of Measure" -msgstr "Одиниця виміру товару" +msgstr "Одиниця вимірювання товару" #. module: purchase #: model:ir.actions.act_window,name:purchase.product_product_action @@ -1262,7 +1262,7 @@ msgstr "Купівля" #. module: purchase #: model:ir.model.fields,field_description:purchase.field_res_config_settings__module_purchase_requisition msgid "Purchase Agreements" -msgstr "Угоди про придбання" +msgstr "Угоди про купівлю" #. module: purchase #: model:ir.actions.act_window,name:purchase.action_purchase_order_report_all @@ -1276,10 +1276,9 @@ msgid "" "purchase history and performance. From this menu you can track your " "negotiation performance, the delivery performance of your vendors, etc." msgstr "" -"Аналіз закупівель дозволяє легко перевіряти та аналізувати історію та " -"динаміку закупівель вашої компанії. З цього розділу ви можете " -"відслідковувати продуктивність переговорів та узгоджень, продуктивність " -"доставки та інше" +"Аналіз купівель дозволяє легко перевіряти та аналізувати історію та динаміку" +" купівель вашої компанії. З цього розділу ви можете відслідковувати " +"продуктивність переговорів та узгоджень, продуктивність доставки та інше" #. module: purchase #: model:ir.model.fields,field_description:purchase.field_res_company__po_lead @@ -1402,7 +1401,7 @@ msgstr "Звіт купівлі" #: model_terms:ir.ui.view,arch_db:purchase.view_purchase_order_filter #: model_terms:ir.ui.view,arch_db:purchase.view_purchase_order_search msgid "Purchase Representative" -msgstr "" +msgstr "Представник закупівель" #. module: purchase #: model:ir.model.fields,field_description:purchase.field_res_config_settings__group_warning_purchase @@ -1412,7 +1411,7 @@ msgstr "" #. module: purchase #: model_terms:ir.ui.view,arch_db:purchase.view_purchase_order_filter msgid "Purchase orders that have been invoiced." -msgstr "Замовлення на купівлю, які повинні виставити рахунок." +msgstr "Замовлення на купівлю, на які потрібно виставити рахунок." #. module: purchase #: model_terms:ir.ui.view,arch_db:purchase.view_purchase_order_filter @@ -1422,7 +1421,7 @@ msgstr "Замовлення на купівлю, що містять рядки #. module: purchase #: model:ir.model.fields,field_description:purchase.field_purchase_report__negociation msgid "Purchase-Standard Price" -msgstr "Купівля-Звичайна ціна" +msgstr "Звичайна ціна купівлі" #. module: purchase #: model:ir.model.fields,field_description:purchase.field_product_product__purchased_product_qty @@ -1480,27 +1479,27 @@ msgstr "Комерційні пропозиції" #. module: purchase #: selection:purchase.order,state:0 msgid "RFQ" -msgstr "ЗКП" +msgstr "ЗНКП" #. module: purchase #: model:mail.message.subtype,name:purchase.mt_rfq_approved msgid "RFQ Approved" -msgstr "ЗКП затвердженно" +msgstr "ЗНКП затвердженно" #. module: purchase #: model:mail.message.subtype,name:purchase.mt_rfq_confirmed msgid "RFQ Confirmed" -msgstr "ЗКП підтвердженно" +msgstr "ЗНКП підтвердженно" #. module: purchase #: model:mail.message.subtype,name:purchase.mt_rfq_done msgid "RFQ Done" -msgstr "ЗКП виконано" +msgstr "ЗНКП виконано" #. module: purchase #: selection:purchase.order,state:0 selection:purchase.report,state:0 msgid "RFQ Sent" -msgstr "ЗКП відправлено" +msgstr "ЗНКП відправлено" #. module: purchase #: model:mail.template,report_name:purchase.email_template_edi_purchase @@ -1510,7 +1509,7 @@ msgstr "RFQ_${(object.name or '').replace('/','_')}" #. module: purchase #: model:ir.actions.act_window,name:purchase.act_res_partner_2_purchase_order msgid "RFQs and Purchases" -msgstr "ЗКП та купівлі" +msgstr "ЗНКП та купівлі" #. module: purchase #: model_terms:ir.ui.view,arch_db:purchase.purchase_order_form @@ -1553,7 +1552,7 @@ msgstr "" #. module: purchase #: model:ir.model.fields,field_description:purchase.field_purchase_report__product_uom msgid "Reference Unit of Measure" -msgstr "Основна одиниця виміру" +msgstr "Основна одиниця вимірювання" #. module: purchase #: model:ir.model.fields,help:purchase.field_purchase_order__origin @@ -1571,8 +1570,10 @@ msgid "" "matching when you receive the products as this reference is usually written " "on the delivery order sent by your vendor." msgstr "" -"Посилання на замовлення на продаж або пропозицію вашого постачальника. " -"Використовується для перевірки при отриманні товарів." +"Посилання на замовлення на продаж або пропозицію вашого постачальника. Він " +"використовується для виконання відповідності, коли ви отримуєте товари, " +"оскільки це посилання, як правило, написано в посиланні на доставку, " +"надісланої вашим постачальником." #. module: purchase #: model:ir.ui.menu,name:purchase.purchase_report @@ -1583,18 +1584,18 @@ msgstr "Звітність" #: model:ir.actions.report,name:purchase.report_purchase_quotation #: model_terms:ir.ui.view,arch_db:purchase.report_purchasequotation_document msgid "Request for Quotation" -msgstr "Запит комерційної пропозиції" +msgstr "Запит на комерційну пропозицію" #. module: purchase #: model_terms:ir.ui.view,arch_db:purchase.report_purchaseorder_document msgid "Request for Quotation #" -msgstr "Запит комерційної пропозиції №" +msgstr "Запит на комерційну пропозицію №" #. module: purchase #: model:ir.actions.act_window,name:purchase.purchase_rfq #: model:ir.ui.menu,name:purchase.menu_purchase_rfq msgid "Requests for Quotation" -msgstr "Запити комерційної пропозиції" +msgstr "Запити на комерційну пропозицію" #. module: purchase #: model:ir.model.fields,field_description:purchase.field_purchase_order__activity_user_id @@ -1626,7 +1627,7 @@ msgstr "Безпека часу проведення для купівель" #. module: purchase #: model:ir.model.fields,field_description:purchase.field_purchase_order__access_token msgid "Security Token" -msgstr "Token безпеки" +msgstr "Токен безпеки" #. module: purchase #: model_terms:ir.ui.view,arch_db:purchase.view_invoice_supplier_purchase_form @@ -1716,7 +1717,7 @@ msgid "" "Planned: Future activities." msgstr "" "Етап заснований на діях\n" -"Прострочений: термін виконання вже минув\n" +"Протерміновано: термін виконання вже минув\n" "Сьогодні: дата дії сьогодні\n" "Заплановано: майбутні дії." @@ -1767,7 +1768,7 @@ msgid "" " converted into a purchase order, you will be able to control the receipt\n" " of the products and the vendor bill." msgstr "" -"Запит комерційної пропозиції - це перший крок у процесі закупівлі. " +"Запит на комерційну пропозицію - це перший крок у процесі закупівлі. " "Перетворюючи його на замовлення на купівлю ви можете контролювати свої " "надходження товарів та рахунки постачальників." @@ -1786,8 +1787,8 @@ msgid "" "This account will be used to value price difference between purchase price " "and accounting cost." msgstr "" -"Цей рахунок буде використовуватись для обліку різниці між ціною в рахунку за" -" товар та ціною в замовленні на купівлю." +"Цей рахунок буде використано для обліку різниці між ціною в рахунку за товар" +" та ціною в замовленні на купівлю." #. module: purchase #: model_terms:ir.ui.view,arch_db:purchase.purchase_order_form @@ -1801,7 +1802,7 @@ msgid "" "This currency will be used, instead of the default one, for purchases from " "the current partner" msgstr "" -"Ця валюта буде використовуватись замість типової для закупівель у даного " +"Ця валюта буде використовуватися замість типової для закупівель у даного " "постачальника." #. module: purchase @@ -1897,12 +1898,12 @@ msgstr "Ціна одиниці" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_purchase_uom_categ_form_action msgid "Unit of Measure Categories" -msgstr "Категорії одиниць виміру" +msgstr "Категорії одиниці вимірювання" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_purchase_uom_form_action msgid "Units of Measure" -msgstr "Одиниці виміру" +msgstr "Одиниці вимірювання" #. module: purchase #: model_terms:ir.ui.view,arch_db:purchase.purchase_order_form @@ -1998,7 +1999,7 @@ msgstr "Прайс-листи постачальника" #. module: purchase #: model:ir.model.fields,field_description:purchase.field_purchase_order__partner_ref msgid "Vendor Reference" -msgstr "Посилання на постачальника" +msgstr "Посилання постачальника" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_procurement_management_supplier_name @@ -2060,7 +2061,7 @@ msgstr "Попередження" #. module: purchase #: model:ir.model.fields,field_description:purchase.field_purchase_order__website_message_ids msgid "Website Messages" -msgstr "Повідомлення з вебсайту" +msgstr "Повідомлення з веб-сайту" #. module: purchase #: model:ir.model.fields,help:purchase.field_purchase_order__website_message_ids @@ -2082,7 +2083,7 @@ msgstr "" msgid "You can find a vendor by its Name, TIN, Email or Internal Reference." msgstr "" "Ви можете знайти продавця за своїм ім'ям, TIN, електронною поштою або " -"внутрішньою довідкою." +"внутрішнім посиланням." #. module: purchase #: model_terms:ir.actions.act_window,help:purchase.product_product_action diff --git a/addons/purchase/models/purchase.py b/addons/purchase/models/purchase.py index ba442110b02..428cb56545a 100644 --- a/addons/purchase/models/purchase.py +++ b/addons/purchase/models/purchase.py @@ -264,6 +264,22 @@ class PurchaseOrder(models.Model): 'force_email': True, 'mark_rfq_as_sent': True, }) + + # In the case of a RFQ or a PO, we want the "View..." button in line with the state of the + # object. Therefore, we pass the model description in the context, in the language in which + # the template is rendered. + lang = self.env.context.get('lang') + if {'default_template_id', 'default_model', 'default_res_id'} <= ctx.keys(): + template = self.env['mail.template'].browse(ctx['default_template_id']) + if template and template.lang: + lang = template._render_template(template.lang, ctx['default_model'], ctx['default_res_id']) + + self = self.with_context(lang=lang) + if self.state in ['draft', 'sent']: + ctx['model_description'] = _('Request for Quotation') + else: + ctx['model_description'] = _('Purchase Order') + return { 'name': _('Compose Email'), 'type': 'ir.actions.act_window', diff --git a/addons/purchase/report/purchase_order_templates.xml b/addons/purchase/report/purchase_order_templates.xml index a475acce4ca..4418b15b0a6 100644 --- a/addons/purchase/report/purchase_order_templates.xml +++ b/addons/purchase/report/purchase_order_templates.xml @@ -26,22 +26,22 @@ <h2 t-if="o.state in ['purchase', 'done']">Purchase Order Confirmation #<span t-field="o.name"/></h2> <h2 t-if="o.state == 'cancel'">Cancelled Purchase Order #<span t-field="o.name"/></h2> - <div class="row mt32 mb32"> - <div t-if="o.name" class="col-3"> + <div id="informations" class="row mt32 mb32"> + <div t-if="o.name" class="col-3 bm-2"> <strong>Our Order Reference:</strong> - <p t-field="o.name"/> + <p t-field="o.name" class="m-0"/> </div> - <div t-if="o.partner_ref" class="col-3"> + <div t-if="o.partner_ref" class="col-3 bm-2"> <strong>Your Order Reference:</strong> - <p t-field="o.partner_ref"/> + <p t-field="o.partner_ref" class="m-0"/> </div> - <div t-if="o.date_order" class="col-3"> + <div t-if="o.date_order" class="col-3 bm-2"> <strong>Order Date:</strong> - <p t-field="o.date_order"/> + <p t-field="o.date_order" class="m-0"/> </div> </div> - <table class="table table-sm"> + <table class="table table-sm o_main_table"> <thead> <tr> <th><strong>Description</strong></th> @@ -78,7 +78,7 @@ </tbody> </table> - <div class="row justify-content-end"> + <div id="total" class="row justify-content-end"> <div class="col-4"> <table class="table table-sm"> <tr class="border-black"> @@ -95,7 +95,7 @@ t-options='{"widget": "monetary", "display_currency": o.currency_id}'/> </td> </tr> - <tr class="border-black"> + <tr class="border-black o_total"> <td><strong>Total</strong></td> <td class="text-right"> <span t-field="o.amount_total" diff --git a/addons/purchase_requisition/i18n/cs.po b/addons/purchase_requisition/i18n/cs.po index 98ca64dc2a0..4b4e7cd39de 100644 --- a/addons/purchase_requisition/i18n/cs.po +++ b/addons/purchase_requisition/i18n/cs.po @@ -9,7 +9,7 @@ # Michal Veselý <michal@veselyberanek.net>, 2018 # Martin Trigaux, 2018 # Ladislav Tomm <tomm@helemik.cz>, 2018 -# J. Podhorecky <j.podhorecky@volny.cz>, 2018 +# trendspotter <j.podhorecky@volny.cz>, 2018 # msgid "" msgstr "" @@ -17,7 +17,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" "PO-Revision-Date: 2018-08-24 09:24+0000\n" -"Last-Translator: J. Podhorecky <j.podhorecky@volny.cz>, 2018\n" +"Last-Translator: trendspotter <j.podhorecky@volny.cz>, 2018\n" "Language-Team: Czech (https://www.transifex.com/odoo/teams/41243/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -125,7 +125,7 @@ msgstr "Analytické značky" #. module: purchase_requisition #: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition__message_attachment_count msgid "Attachment Count" -msgstr "" +msgstr "Počet příloh" #. module: purchase_requisition #: selection:purchase.requisition,state:0 diff --git a/addons/purchase_requisition/i18n/fi.po b/addons/purchase_requisition/i18n/fi.po index d0e366f8b3e..4465d0c3cd8 100644 --- a/addons/purchase_requisition/i18n/fi.po +++ b/addons/purchase_requisition/i18n/fi.po @@ -615,7 +615,7 @@ msgstr "" #. module: purchase_requisition #: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition_to_so msgid "Request for Quotation" -msgstr "Ostoehdotus" +msgstr "Tarjouspyyntö" #. module: purchase_requisition #: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition_list diff --git a/addons/purchase_requisition/i18n/uk.po b/addons/purchase_requisition/i18n/uk.po index 128f514bc1d..f68fcdc2231 100644 --- a/addons/purchase_requisition/i18n/uk.po +++ b/addons/purchase_requisition/i18n/uk.po @@ -23,7 +23,7 @@ msgstr "" #. module: purchase_requisition #: model_terms:ir.ui.view,arch_db:purchase_requisition.report_purchaserequisitions msgid "<strong>Call for Tender Reference:</strong><br/>" -msgstr "<strong>Посилання тендера:</strong><br/>" +msgstr "<strong>Посилання на участь у тендері:</strong><br/>" #. module: purchase_requisition #: model_terms:ir.ui.view,arch_db:purchase_requisition.report_purchaserequisitions @@ -38,7 +38,7 @@ msgstr "<strong>Опис</strong>" #. module: purchase_requisition #: model_terms:ir.ui.view,arch_db:purchase_requisition.report_purchaserequisitions msgid "<strong>Product UoM</strong>" -msgstr "<strong>Од. виміру товару</strong>" +msgstr "<strong>Одиниця вимірювання товару</strong>" #. module: purchase_requisition #: model_terms:ir.ui.view,arch_db:purchase_requisition.report_purchaserequisitions @@ -78,7 +78,7 @@ msgstr "<strong>Постачальник </strong>" #. module: purchase_requisition #: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition__message_needaction msgid "Action Needed" -msgstr "Дія необхідна" +msgstr "Необхідна дія" #. module: purchase_requisition #: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition__date_end @@ -105,7 +105,7 @@ msgstr "Тип угоди" #. module: purchase_requisition #: model_terms:ir.ui.view,arch_db:purchase_requisition.res_config_settings_view_form msgid "Agreement Types" -msgstr "Типи погодження" +msgstr "Типи угоди" #. module: purchase_requisition #: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_line__account_analytic_id @@ -136,12 +136,12 @@ msgstr "Довгострокове замовлення" #. module: purchase_requisition #: model:ir.model.fields,field_description:purchase_requisition.field_product_supplierinfo__purchase_requisition_id msgid "Blanket order" -msgstr "" +msgstr "Довгострокові замовлення" #. module: purchase_requisition #: model:purchase.requisition.type,name:purchase_requisition.type_multi msgid "Call for Tender" -msgstr "" +msgstr "Тендер" #. module: purchase_requisition #: model:ir.actions.report,name:purchase_requisition.action_report_purchase_requisitions @@ -209,6 +209,10 @@ msgid "" " 'purchase_requisition' module is installed and this option is selected, the" " system will create a draft call for tender." msgstr "" +"Створіть чернетку замовлення на купівлю: на основі налаштування вашого " +"товару система створить чернетку замовлення на купівлю. Подайте заявку на " +"тендер: якщо встановлено модуль buy_requisition та вибрано цей параметр, " +"система створить проект заявки для участі у тендері." #. module: purchase_requisition #: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition__create_uid @@ -254,7 +258,7 @@ msgstr "Назва для відображення" #. module: purchase_requisition #: selection:purchase.requisition.type,line_copy:0 msgid "Do not create RfQ lines automatically" -msgstr "Не створюйте рядки RfQ автоматично" +msgstr "Не створюйте рядки ЗНКП автоматично" #. module: purchase_requisition #: model_terms:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_filter @@ -283,8 +287,8 @@ msgstr "Кінцева дата" msgid "" "Example of purchase agreements include call for tenders and blanket orders." msgstr "" -"Приклади договорів купівлі-продажу включають в себе конкурси та загальні " -"замовлення." +"Приклади договорів купівлі-продажу включають в себе тендери та довгострокові" +" замовлення." #. module: purchase_requisition #: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition__message_follower_ids @@ -308,8 +312,8 @@ msgid "" " (e.g. a year) and you order products within this agreement, benefiting\n" " from the negociated prices." msgstr "" -"Для загальних замовлень ви можете записати угоду на певний період " -"(наприклад, рік), а ви замовляєте товари в рамках цієї угоди, отримуючи " +"Для довгострокових замовлень ви можете записати угоду на певний період " +"(наприклад, рік), і ви замовляєте товари в рамках цієї угоди, отримуючи " "вигоду від узгоджених цін." #. module: purchase_requisition @@ -348,7 +352,7 @@ msgid "" " validate some and cancel others." msgstr "" "Під час проведення тендеру ви можете записати товари, які вам потрібно придбати\n" -"і генерувати створення RfQ для постачальників. Отримавши тендери\n" +"і генерувати створення ЗНКП для постачальників. Отримавши тендери\n" "ви зареєструвалися, їх можна переглянути та порівняти\n" "перевірити деякі та скасувати інші." @@ -411,7 +415,7 @@ msgstr "Декілька заявок" #. module: purchase_requisition #: model_terms:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_filter msgid "My Agreements" -msgstr "" +msgstr "Мої угоди" #. module: purchase_requisition #: model_terms:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_filter @@ -421,7 +425,7 @@ msgstr "Нові угоди" #. module: purchase_requisition #: model_terms:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_form msgid "New Quotation" -msgstr "Нова пропозиція" +msgstr "Нова комерційна пропозиція" #. module: purchase_requisition #: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition__message_needaction_counter @@ -467,7 +471,7 @@ msgstr "Тип операції" #. module: purchase_requisition #: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_line__qty_ordered msgid "Ordered Quantities" -msgstr "Замовлені величини" +msgstr "Замовлені кількості" #. module: purchase_requisition #: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition__ordering_date @@ -500,7 +504,7 @@ msgstr "Шаблон товару" #. module: purchase_requisition #: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_line__product_uom_id msgid "Product Unit of Measure" -msgstr "Одиниця виміру товару" +msgstr "Одиниця вимірювання товару" #. module: purchase_requisition #: model_terms:ir.ui.view,arch_db:purchase_requisition.report_purchaserequisitions @@ -559,29 +563,29 @@ msgstr "Замовлення на купівлю" #. module: purchase_requisition #: model_terms:ir.ui.view,arch_db:purchase_requisition.purchase_order_search_inherit msgid "Purchase Orders with requisition" -msgstr "Замовлення по тендеру" +msgstr "Замовлення на купівлю з реквізитами" #. module: purchase_requisition #: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition__user_id #: model_terms:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_filter msgid "Purchase Representative" -msgstr "" +msgstr "Представник закупівель" #. module: purchase_requisition #: model:ir.model,name:purchase_requisition.model_purchase_requisition msgid "Purchase Requisition" -msgstr "Пошук пропозицій" +msgstr "Пошук реквізитів" #. module: purchase_requisition #: model:ir.model,name:purchase_requisition.model_purchase_requisition_line #: model:ir.model.fields,field_description:purchase_requisition.field_product_supplierinfo__purchase_requisition_line_id msgid "Purchase Requisition Line" -msgstr "Рядок пошуку пропозицій" +msgstr "Рядок пошуку реквізитів" #. module: purchase_requisition #: model:ir.model,name:purchase_requisition.model_purchase_requisition_type msgid "Purchase Requisition Type" -msgstr "" +msgstr "Тип реквізитів купівлі" #. module: purchase_requisition #: model:ir.actions.act_window,name:purchase_requisition.act_res_partner_2_purchase_order @@ -593,7 +597,7 @@ msgstr "Замовлення на купівлю" #: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition__is_quantity_copy #: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_type__quantity_copy msgid "Quantities" -msgstr "Величини" +msgstr "Кількості" #. module: purchase_requisition #: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_line__product_qty @@ -603,7 +607,7 @@ msgstr "Кількість" #. module: purchase_requisition #: model_terms:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_form msgid "RFQs/Orders" -msgstr "RFQ/Замовлення" +msgstr "ЗНКП/Замовлення" #. module: purchase_requisition #: model_terms:ir.ui.view,arch_db:purchase_requisition.product_template_form_view_inherit @@ -613,7 +617,7 @@ msgstr "Дозамовлення" #. module: purchase_requisition #: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition_to_so msgid "Request for Quotation" -msgstr "Запит комерційної пропозиції" +msgstr "Запит на комерційну пропозицію" #. module: purchase_requisition #: model:ir.actions.act_window,name:purchase_requisition.action_purchase_requisition_list @@ -623,7 +627,7 @@ msgstr "Запит на комерційні пропозиції" #. module: purchase_requisition #: model_terms:ir.ui.view,arch_db:purchase_requisition.report_purchaserequisitions msgid "Requests for Quotation Details" -msgstr "Деталі запиту комерційної пропозиції" +msgstr "Деталі запиту на комерційну пропозицію" #. module: purchase_requisition #: model_terms:ir.ui.view,arch_db:purchase_requisition.purchase_order_search_inherit @@ -633,12 +637,12 @@ msgstr "Тендер" #. module: purchase_requisition #: model:ir.model.fields,field_description:purchase_requisition.field_stock_move__requisition_line_ids msgid "Requisition Line" -msgstr "" +msgstr "Рядок реквізитів" #. module: purchase_requisition #: model:ir.model.fields,field_description:purchase_requisition.field_stock_move__requistion_line_ids msgid "Requistion Line" -msgstr "" +msgstr "Рядок реквізитів" #. module: purchase_requisition #: model_terms:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_form @@ -658,12 +662,12 @@ msgstr "Шукати угоди про придбання" #. module: purchase_requisition #: selection:purchase.requisition.type,exclusive:0 msgid "Select multiple RFQ" -msgstr "Вибрати декілька ЗКП" +msgstr "Вибрати кілька ЗНКП" #. module: purchase_requisition #: selection:purchase.requisition.type,exclusive:0 msgid "Select only one RFQ (exclusive)" -msgstr "Вибрати тільки один ЗКП (виключно)" +msgstr "Вибрати тільки один ЗНКП (виключно)" #. module: purchase_requisition #: model:ir.model.fields,help:purchase_requisition.field_purchase_requisition_type__exclusive @@ -672,9 +676,9 @@ msgid "" "\n" " Select multiple RFQ: allows multiple purchase orders. On confirmation of a purchase order it does not cancel the remaining orders" msgstr "" -"Виберіть лише один RFQ (ексклюзивний): після підтвердження замовлення на придбання скасуйте решту замовлення на купівлю.\n" +"Виберіть лише один ЗНКП(ексклюзивний): після підтвердження замовлення на придбання скасуйте решту замовлення на купівлю.\n" "\n" -"Виберіть кілька запитів за замовленням: дозволяє кілька замовлень на покупку. При підтвердженні замовлення на купівлю він не скасовує залишкові замовлення" +"Виберіть кілька ЗНКП: дозволяє кілька замовлень на купівлю. При підтвердженні замовлення на купівлю він не скасовує залишкові замовлення" #. module: purchase_requisition #: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_type__sequence @@ -699,12 +703,12 @@ msgstr "Початковий документ" #. module: purchase_requisition #: model_terms:ir.actions.act_window,help:purchase_requisition.action_purchase_requisition msgid "Start a new purchase agreement" -msgstr "" +msgstr "Почніть нову угоду закупівель" #. module: purchase_requisition #: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition__state_blanket_order msgid "State Blanket Order" -msgstr "" +msgstr "Етап довгострокового замовлення" #. module: purchase_requisition #: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition__state @@ -725,7 +729,7 @@ msgstr "Складське правило" #. module: purchase_requisition #: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition_line__supplier_info_ids msgid "Supplier Info" -msgstr "" +msgstr "Інформація постачальника" #. module: purchase_requisition #: model:ir.model,name:purchase_requisition.model_product_supplierinfo @@ -750,6 +754,8 @@ msgid "" "There is already an open blanket order for this supplier. We suggest you to " "use to complete this open blanket order instead of creating a new one." msgstr "" +"Для цього постачальника вже є відкрите довгострокове замовлення. Ми радимо " +"вам скористатися ним, а не створювати нове." #. module: purchase_requisition #: model_terms:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_filter @@ -779,7 +785,7 @@ msgstr "Кількість непрочитаних повідомлень" #. module: purchase_requisition #: selection:purchase.requisition.type,line_copy:0 msgid "Use lines of agreement" -msgstr "Використовуйте рядки згоди" +msgstr "Використовуйте рядки угоди" #. module: purchase_requisition #: selection:purchase.requisition.type,quantity_copy:0 @@ -810,7 +816,7 @@ msgstr "Попередження для %s" #. module: purchase_requisition #: model:ir.model.fields,field_description:purchase_requisition.field_purchase_requisition__website_message_ids msgid "Website Messages" -msgstr "Повідомлення з вебсайту" +msgstr "Повідомлення з веб-сайту" #. module: purchase_requisition #: model:ir.model.fields,help:purchase_requisition.field_purchase_requisition__website_message_ids @@ -821,13 +827,13 @@ msgstr "Історія бесіди на сайті" #: code:addons/purchase_requisition/models/purchase_requisition.py:178 #, python-format msgid "You can only delete draft requisitions." -msgstr "" +msgstr "Ви можете видалити лише одну чернетку реквізитів." #. module: purchase_requisition #: code:addons/purchase_requisition/models/purchase_requisition.py:123 #, python-format msgid "You cannot confirm agreement '%s' because there is no product line." -msgstr "" +msgstr "Ви не можете підтвердити угоду '%s'тому що немає рядка товару." #. module: purchase_requisition #: code:addons/purchase_requisition/models/purchase_requisition.py:127 @@ -835,13 +841,13 @@ msgstr "" #: code:addons/purchase_requisition/models/purchase_requisition.py:228 #, python-format msgid "You cannot confirm the blanket order without price." -msgstr "" +msgstr "Ви не можете підтвердити довгострокове замовлення без ціни." #. module: purchase_requisition #: code:addons/purchase_requisition/models/purchase_requisition.py:129 #, python-format msgid "You cannot confirm the blanket order without quantity." -msgstr "" +msgstr "Ви не можете підтвердити довгострокове замовлення без кількості." #. module: purchase_requisition #: code:addons/purchase_requisition/models/purchase_requisition.py:156 @@ -850,8 +856,8 @@ msgid "" "You have to cancel or validate every RfQ before closing the purchase " "requisition." msgstr "" -"Ви повинні скасувати або підтвердити кожен RfQ перед тим, як закрити заявку " -"на купівлю." +"Ви повинні скасувати або підтвердити кожен ЗНКП перед тим, як закрити заявку" +" на купівлю." #. module: purchase_requisition #: model_terms:ir.ui.view,arch_db:purchase_requisition.view_purchase_requisition_form diff --git a/addons/purchase_requisition/models/purchase_requisition.py b/addons/purchase_requisition/models/purchase_requisition.py index ed2c4166b88..49fd7c9da88 100644 --- a/addons/purchase_requisition/models/purchase_requisition.py +++ b/addons/purchase_requisition/models/purchase_requisition.py @@ -207,7 +207,7 @@ class PurchaseRequisitionLine(models.Model): ('product_id', '=', vals.get('product_id')), ('name', '=', res.requisition_id.vendor_id.id), ]) - if not [s.requisition_id for s in supplier_infos]: + if not any([s.purchase_requisition_id for s in supplier_infos]): res.create_supplier_info() if vals['price_unit'] <= 0.0: raise UserError(_('You cannot confirm the blanket order without price.')) diff --git a/addons/purchase_requisition/tests/test_purchase_requisition.py b/addons/purchase_requisition/tests/test_purchase_requisition.py index b88a4af5cc9..453fd83bdc6 100644 --- a/addons/purchase_requisition/tests/test_purchase_requisition.py +++ b/addons/purchase_requisition/tests/test_purchase_requisition.py @@ -295,3 +295,49 @@ class TestPurchaseRequisition(common.TransactionCase): ]) order_line._onchange_quantity() self.assertEqual(order_line.price_unit, 50, 'The supplier info chosen should be the one without requisition id') + + def test_06_purchase_requisition(self): + """ Create a blanquet order for a product and a vendor already linked via + a supplier info""" + product = self.env['product.product'].create({ + 'name': 'test6', + }) + product2 = self.env['product.product'].create({ + 'name': 'test6', + }) + vendor = self.env['res.partner'].create({ + 'name': 'vendor6', + }) + supplier_info = self.env['product.supplierinfo'].create({ + 'product_id': product.id, + 'name': vendor.id, + }) + + # create a empty blanquet order + requisition_type = self.env['purchase.requisition.type'].create({ + 'name': 'Blanket test', + 'quantity_copy': 'none' + }) + line1 = (0, 0, { + 'product_id': product2.id, + 'product_uom_id': product2.uom_po_id.id, + 'price_unit': 41, + 'product_qty': 10, + }) + requisition_blanket = self.env['purchase.requisition'].create({ + 'line_ids': [line1], + 'type_id': requisition_type.id, + 'vendor_id': vendor.id, + }) + requisition_blanket.action_in_progress() + self.env['purchase.requisition.line'].create({ + 'product_id': product.id, + 'product_qty': 14.0, + 'requisition_id': requisition_blanket.id, + 'price_unit': 10, + }) + new_si = self.env['product.supplierinfo'].search([ + ('product_id', '=', product.id), + ('name', '=', vendor.id) + ]) - supplier_info + self.assertEqual(new_si.purchase_requisition_id, requisition_blanket, 'the blanket order is not linked to the supplier info') diff --git a/addons/purchase_stock/i18n/nb.po b/addons/purchase_stock/i18n/nb.po index 29f21e607a2..ca134fa15b7 100644 --- a/addons/purchase_stock/i18n/nb.po +++ b/addons/purchase_stock/i18n/nb.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jan Pedro Tumusok <jpt@eyenetworks.no>, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" -"Project-Id-Version: Odoo Server saas~11.5\n" +"Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: Jan Pedro Tumusok <jpt@eyenetworks.no>, 2018\n" +"POT-Creation-Date: 2018-10-24 09:34+0000\n" +"PO-Revision-Date: 2018-08-24 09:24+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,9 +32,11 @@ msgid "Action" msgstr "Handling" #. module: purchase_stock +#: code:addons/purchase_stock/models/stock.py:127 #: model_terms:ir.ui.view,arch_db:purchase_stock.purchase_report_stock_rule #: model:stock.location.route,name:purchase_stock.route_warehouse0_buy #: selection:stock.rule,action:0 +#, python-format msgid "Buy" msgstr "Kjøp" @@ -49,7 +53,7 @@ msgstr "" #. module: purchase_stock #: model:ir.model,name:purchase_stock.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: purchase_stock #: model:ir.model.fields,field_description:purchase_stock.field_stock_move__created_purchase_line_id diff --git a/addons/purchase_stock/i18n/uk.po b/addons/purchase_stock/i18n/uk.po index 20c2202077c..c2a7ad4b12d 100644 --- a/addons/purchase_stock/i18n/uk.po +++ b/addons/purchase_stock/i18n/uk.po @@ -62,7 +62,7 @@ msgstr "Створено рядок замовлення на купівлю" #. module: purchase_stock #: model:ir.model.fields,field_description:purchase_stock.field_purchase_order__picking_type_id msgid "Deliver To" -msgstr "Куди доставити" +msgstr "Доставити до" #. module: purchase_stock #: model:ir.model.fields,help:purchase_stock.field_product_template__route_ids @@ -86,7 +86,7 @@ msgstr "Переміщення вниз" #. module: purchase_stock #: model:ir.model.fields,field_description:purchase_stock.field_res_config_settings__module_stock_dropshipping msgid "Dropshipping" -msgstr "Пряма поставка" +msgstr "Дропшипінг" #. module: purchase_stock #: model_terms:ir.ui.view,arch_db:purchase_stock.exception_on_po @@ -111,7 +111,7 @@ msgstr "Вхідні поставки" #. module: purchase_stock #: model:ir.model.fields,field_description:purchase_stock.field_purchase_order__incoterm_id msgid "Incoterm" -msgstr "Інкотермс" +msgstr "Інкотерм" #. module: purchase_stock #: model:ir.model.fields,help:purchase_stock.field_purchase_order__incoterm_id @@ -119,8 +119,8 @@ msgid "" "International Commercial Terms are a series of predefined commercial terms " "used in international transactions." msgstr "" -"Міжнародні комерційні умови, комплект міжнародних правил з тлумачення " -"найбільш широко використовуваних торгівельних термінів в галузі міжнародної " +"Міжнародні комерційні умови - серія міжнародних правил з тлумачення найбільш" +" широко використовуваних торговельних термінів у галузі міжнародної " "торгівлі." #. module: purchase_stock @@ -173,7 +173,7 @@ msgstr "" #. module: purchase_stock #: model:ir.model,name:purchase_stock.model_stock_warehouse_orderpoint msgid "Minimum Inventory Rule" -msgstr "Правило мінімальних залишків" +msgstr "Правило мінімального запасу" #. module: purchase_stock #: model_terms:ir.ui.view,arch_db:purchase_stock.res_config_settings_view_form_stock @@ -297,7 +297,7 @@ msgstr "Складське переміщення " #. module: purchase_stock #: model_terms:ir.ui.view,arch_db:purchase_stock.purchase_order_line_view_form_inherit msgid "Stock Moves" -msgstr "Переміщення запасів" +msgstr "Складські переміщення" #. module: purchase_stock #: model:ir.model,name:purchase_stock.model_stock_rule @@ -353,7 +353,7 @@ msgstr "" #. module: purchase_stock #: model:ir.model.fields,help:purchase_stock.field_purchase_order__picking_type_id msgid "This will determine operation type of incoming shipment" -msgstr "Це визначатиме тип операції вхідної відправки" +msgstr "Це визначатиме тип операції вхідної доставки" #. module: purchase_stock #: model:ir.model,name:purchase_stock.model_stock_picking diff --git a/addons/purchase_stock/tests/test_purchase_order.py b/addons/purchase_stock/tests/test_purchase_order.py index cadbf25b420..60f91a9c196 100644 --- a/addons/purchase_stock/tests/test_purchase_order.py +++ b/addons/purchase_stock/tests/test_purchase_order.py @@ -121,7 +121,7 @@ class TestPurchaseOrder(AccountingTestCase): 'type': 'in_invoice', }) self.invoice.purchase_order_change() - self.invoice.invoice_validate() + self.invoice.action_invoice_open() self.assertEqual(self.po.order_line.mapped('qty_invoiced'), [5.0, 5.0], 'Purchase: all products should be invoiced"') # Check quantity received @@ -154,5 +154,5 @@ class TestPurchaseOrder(AccountingTestCase): self.invoice.purchase_order_change() self.invoice.invoice_line_ids[0].quantity = 2.0 self.invoice.invoice_line_ids[1].quantity = 2.0 - self.invoice.invoice_validate() + self.invoice.action_invoice_open() self.assertEqual(self.po.order_line.mapped('qty_invoiced'), [3.0, 3.0], 'Purchase: Billed quantity should be 3.0')
\ No newline at end of file diff --git a/addons/rating/i18n/uk.po b/addons/rating/i18n/uk.po index 984fd692420..a2061013e25 100644 --- a/addons/rating/i18n/uk.po +++ b/addons/rating/i18n/uk.po @@ -97,7 +97,7 @@ msgstr "Модель документу" #. module: rating #: model:ir.model,name:rating.model_mail_thread msgid "Email Thread" -msgstr "Ланцюжки повідомлень" +msgstr "Тема електронної пошти" #. module: rating #: model:ir.model.fields,help:rating.field_rating_rating__consumed @@ -175,7 +175,7 @@ msgstr "Модель наступного ресурсу" #. module: rating #: model_terms:ir.ui.view,arch_db:rating.rating_rating_view_search msgid "My Ratings" -msgstr "мої оцінки" +msgstr "Мої оцінювання" #. module: rating #: selection:rating.rating,rating_text:0 @@ -334,12 +334,12 @@ msgstr "Задоволений" #. module: rating #: model:ir.model.fields,field_description:rating.field_rating_rating__access_token msgid "Security Token" -msgstr "Token безпеки" +msgstr "Токен безпеки" #. module: rating #: model_terms:ir.ui.view,arch_db:rating.rating_external_page_submit msgid "Send Feedback" -msgstr "Відправити Feedback" +msgstr "Зворотній зв'язок" #. module: rating #: model_terms:ir.ui.view,arch_db:rating.rating_rating_view_form @@ -375,7 +375,7 @@ msgstr "Було би чудово, якщо ви би надали більше #. module: rating #: model_terms:ir.ui.view,arch_db:rating.rating_external_page_submit msgid "Your rating has been submitted." -msgstr "Ваша оцінювання було подане." +msgstr "Ваше оцінювання було подане." #. module: rating #: model_terms:ir.ui.view,arch_db:rating.rating_external_page_submit @@ -398,7 +398,7 @@ msgstr "дуже незадоволений" #: code:addons/rating/controllers/main.py:20 #, python-format msgid "not satisfied" -msgstr "не задоволений" +msgstr "незадоволений" #. module: rating #: model_terms:ir.ui.view,arch_db:rating.rating_rating_view_kanban diff --git a/addons/repair/i18n/cs.po b/addons/repair/i18n/cs.po index 02084a3acc9..aeac20bbfca 100644 --- a/addons/repair/i18n/cs.po +++ b/addons/repair/i18n/cs.po @@ -8,15 +8,16 @@ # Jakub Lohnisky <jakub@lepremier.cz>, 2018 # Jan Horzinka <jan.horzinka@centrum.cz>, 2018 # Michal Veselý <michal@veselyberanek.net>, 2018 -# J. Podhorecky <j.podhorecky@volny.cz>, 2018 # milda dvorak <milda.dvorak@optimal4.cz>, 2018 +# trendspotter <j.podhorecky@volny.cz>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:18+0000\n" -"PO-Revision-Date: 2018-09-21 13:18+0000\n" -"Last-Translator: milda dvorak <milda.dvorak@optimal4.cz>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:24+0000\n" +"Last-Translator: trendspotter <j.podhorecky@volny.cz>, 2018\n" "Language-Team: Czech (https://www.transifex.com/odoo/teams/41243/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -173,7 +174,7 @@ msgstr "Po opravě" #. module: repair #: model:ir.model.fields,field_description:repair.field_repair_order__message_attachment_count msgid "Attachment Count" -msgstr "" +msgstr "Počet příloh" #. module: repair #: selection:repair.order,invoice_method:0 diff --git a/addons/repair/i18n/uk.po b/addons/repair/i18n/uk.po index 78d639b8438..27b30bdc9c6 100644 --- a/addons/repair/i18n/uk.po +++ b/addons/repair/i18n/uk.po @@ -53,8 +53,8 @@ msgid "" msgstr "" "* Статус \"Чернетка\" використовується, коли користувач кодує нове та непідтверджене замовлення на ремонт.\n" "* Статус \"Підтверджено\" використовується, коли користувач підтверджує замовлення на ремонт.\n" -"* Статус \"Готово до відновлення\" використовується для початку ремонту, користувач може почати ремонт тільки після підтвердження замовлення на ремонт.\n" -"* Статус рахунка-фактури використовується для створення рахунку-фактури до чи після ремонту.\n" +"* Статус \"Готово до ремонту\" використовується для початку ремонту, користувач може почати ремонт тільки після підтвердження замовлення на ремонт.\n" +"* Статус \"Буде виставлено рахунок-фактуру\" використовується для створення рахунка-фактури до чи після ремонту.\n" "* Статус \"Готово\" встановлюється, коли ремонт завершено.\n" "* Статус \"Скасовано\" використовується, коли користувач скасовує замовлення на ремонт." @@ -141,7 +141,7 @@ msgstr "<strong>Гарантія:</strong>" #. module: repair #: model:ir.model.fields,field_description:repair.field_repair_order__message_needaction msgid "Action Needed" -msgstr "Дія необхідна" +msgstr "Необхідна дія" #. module: repair #: model:ir.model.fields,field_description:repair.field_repair_order__activity_ids @@ -166,7 +166,7 @@ msgstr "Додати внутрішні примітки..." #. module: repair #: model_terms:ir.ui.view,arch_db:repair.view_repair_order_form msgid "Add quotation notes..." -msgstr "Додати примітки пропозиції..." +msgstr "Додати примітки комерційної пропозиції..." #. module: repair #: selection:repair.order,invoice_method:0 @@ -379,7 +379,7 @@ msgstr "Підписники (Партнери)" #. module: repair #: model_terms:ir.ui.view,arch_db:repair.view_repair_order_form_filter msgid "Future Activities" -msgstr "Майбутня діяльність" +msgstr "Майбутні дії" #. module: repair #: model_terms:ir.ui.view,arch_db:repair.view_repair_order_form_filter @@ -389,7 +389,7 @@ msgstr "Групувати за" #. module: repair #: model:ir.model.fields,field_description:repair.field_repair_order_make_invoice__group msgid "Group by partner invoice address" -msgstr "Групувати за адресами партнерського рахунку-фактури" +msgstr "Групувати за адресами партнерського рахунка-фактури" #. module: repair #: model_terms:ir.ui.view,arch_db:repair.view_repair_order_form @@ -468,17 +468,17 @@ msgstr "Рядок рахунку" #. module: repair #: model:ir.model.fields,field_description:repair.field_repair_order__invoice_method msgid "Invoice Method" -msgstr "Метод рахнку-фактури" +msgstr "Метод рахнка-фактури" #. module: repair #: model_terms:ir.ui.view,arch_db:repair.report_repairorder msgid "Invoice address:" -msgstr "Адреса рахунку-фактури:" +msgstr "Адреса рахунка-фактури:" #. module: repair #: model_terms:ir.ui.view,arch_db:repair.report_repairorder msgid "Invoice and shipping address:" -msgstr "Адреса доставки та рахунку-фактури:" +msgstr "Адреса доставки та рахунка-фактури:" #. module: repair #: code:addons/repair/models/repair.py:385 @@ -584,7 +584,7 @@ msgstr "Мої дії" #. module: repair #: model:ir.model.fields,field_description:repair.field_repair_order__activity_date_deadline msgid "Next Activity Deadline" -msgstr "Наступий дедлайн дії" +msgstr "Дедлайн наступної дії" #. module: repair #: model:ir.model.fields,field_description:repair.field_repair_order__activity_summary @@ -594,12 +594,12 @@ msgstr "Підсумок наступної дії" #. module: repair #: model:ir.model.fields,field_description:repair.field_repair_order__activity_type_id msgid "Next Activity Type" -msgstr "Наступний тип дії" +msgstr "Тип наступної дії" #. module: repair #: selection:repair.order,invoice_method:0 msgid "No Invoice" -msgstr "Немає рахунку-фактури" +msgstr "Немає рахунка-фактури" #. module: repair #: code:addons/repair/models/repair.py:308 @@ -679,7 +679,7 @@ msgstr "Операції" #. module: repair #: selection:repair.order,activity_state:0 msgid "Overdue" -msgstr "Прострочено" +msgstr "Протерміновано" #. module: repair #: model_terms:ir.ui.view,arch_db:repair.view_repair_order_form_filter @@ -735,7 +735,7 @@ msgstr "Кількість" #: model:ir.model.fields,field_description:repair.field_repair_line__product_uom #: model:ir.model.fields,field_description:repair.field_repair_order__product_uom msgid "Product Unit of Measure" -msgstr "Одиниця виміру товару" +msgstr "Одиниця вимірювання товару" #. module: repair #: model:ir.model.fields,field_description:repair.field_repair_order__product_id @@ -745,7 +745,7 @@ msgstr "Товар для ремонту" #. module: repair #: model:ir.model.fields,help:repair.field_repair_order__lot_id msgid "Products repaired are all belonging to this lot" -msgstr "Ремонтні товари - всі, що належать до цієї партії" +msgstr "Відремонтовані товари - всі, що належать до цієї партії" #. module: repair #: model:ir.model.fields,field_description:repair.field_stock_warn_insufficient_qty_repair__quant_ids @@ -768,7 +768,7 @@ msgstr "Комерційна пропозиція" #. module: repair #: model:ir.actions.report,name:repair.action_report_repair_order msgid "Quotation / Order" -msgstr "Пропозиція / Замовлення" +msgstr "Комерційна пропозиція / Замовлення" #. module: repair #: model:ir.model.fields,field_description:repair.field_repair_order__quotation_notes @@ -831,7 +831,7 @@ msgstr "Замовлення на ремонт #:" #: model:ir.model.fields,field_description:repair.field_repair_fee__repair_id #: model:ir.model.fields,field_description:repair.field_repair_line__repair_id msgid "Repair Order Reference" -msgstr "Референс замовлення на ремонт" +msgstr "Посилання замовлення на ремонт" #. module: repair #: model:ir.actions.act_window,name:repair.action_repair_order_tree @@ -853,13 +853,13 @@ msgstr "Референс ремонту" #: code:addons/repair/models/repair.py:196 #, python-format msgid "Repair must be canceled in order to reset it to draft." -msgstr "Ремонт необхідно скасувати, щоб скинути його до чернетки." +msgstr "Ремонт необхідно скасувати, щоби скинути його до чернетки." #. module: repair #: code:addons/repair/models/repair.py:404 #, python-format msgid "Repair must be confirmed before starting reparation." -msgstr "Ремонт повинен бути підтверджений перед початком виправлення." +msgstr "Ремонт повинен бути підтверджений перед початком." #. module: repair #: code:addons/repair/models/repair.py:432 @@ -913,9 +913,10 @@ msgid "" "invoice before or after the repair is done respectively. 'No invoice' means " "you don't want to generate invoice for this repair order." msgstr "" -"Вибір «Перед ремонтом» або «Після ремонту» дозволить вам генерувати рахунок-" -"фактуру до або після ремонту відповідно. \"Без рахунку-фактури\" означає, що" -" ви не хочете створювати рахунок-фактуру для цього замовлення на ремонт." +"Вибір \"Перед ремонтом\" або \"Після ремонту\" дозволить вам генерувати " +"рахунок-фактуру до або після ремонту відповідно. \"Без рахунка-фактури\" " +"означає, що ви не хочете створювати рахунок-фактуру для цього замовлення на " +"ремонт." #. module: repair #: model_terms:ir.ui.view,arch_db:repair.view_repair_order_form @@ -964,7 +965,7 @@ msgid "" "Planned: Future activities." msgstr "" "Етап заснований на діях\n" -"Прострочений: термін виконання вже минув\n" +"Протермінований: термін виконання вже минув\n" "Сьогодні: дата дії сьогодні\n" "Заплановано: майбутні дії." @@ -995,7 +996,7 @@ msgstr "Податки" #. module: repair #: sql_constraint:repair.order:0 msgid "The name of the Repair Order must be unique!" -msgstr "Назва замовлення на ремонт повинна бути унікальна!" +msgstr "Назва замовлення на ремонт повинна бути унікальною!" #. module: repair #: code:addons/repair/models/repair.py:172 @@ -1079,7 +1080,7 @@ msgstr "Тип" #. module: repair #: selection:repair.order,state:0 msgid "Under Repair" -msgstr "Під ремонт" +msgstr "Під ремонтом" #. module: repair #: model:ir.model.fields,field_description:repair.field_repair_fee__price_unit @@ -1091,7 +1092,7 @@ msgstr "Ціна одиниці" #. module: repair #: model_terms:ir.ui.view,arch_db:repair.view_repair_order_form msgid "Unit of Measure" -msgstr "Одиниця виміру" +msgstr "Одиниця вимірювання" #. module: repair #: model:ir.model.fields,field_description:repair.field_repair_order__message_unread @@ -1111,7 +1112,7 @@ msgstr "Сума без податків" #. module: repair #: model_terms:ir.ui.view,arch_db:repair.view_repair_order_form msgid "Untaxed amount" -msgstr "Неоподаткована сума" +msgstr "Сума без податків" #. module: repair #: model:ir.model,name:repair.model_stock_warn_insufficient_qty_repair @@ -1133,7 +1134,7 @@ msgstr "Термін дії гарантії" #. module: repair #: model:ir.model.fields,field_description:repair.field_repair_order__website_message_ids msgid "Website Messages" -msgstr "Повідомлення з вебсайту" +msgstr "Повідомлення з веб-сайту" #. module: repair #: model:ir.model.fields,help:repair.field_repair_order__website_message_ids @@ -1153,7 +1154,7 @@ msgid "" "You have to select a pricelist in the Repair form !\n" " Please set one before choosing a product." msgstr "" -"Ви повинні вибрати прайс-лист у формі ремонту! \n" +"Ви повинні вибрати прайслист у формі ремонту! \n" "Будь-ласка, встановіть його перед вибором товару." #. module: repair diff --git a/addons/repair/report/repair_templates_repair_order.xml b/addons/repair/report/repair_templates_repair_order.xml index 59972c3c33f..1090b957ea2 100644 --- a/addons/repair/report/repair_templates_repair_order.xml +++ b/addons/repair/report/repair_templates_repair_order.xml @@ -33,28 +33,28 @@ <span t-field="o.name"/> </h2> - <div class="row mt32 mb32"> - <div t-if="o.product_id.name" class="col-3"> + <div id="informations" class="row mt32 mb32"> + <div t-if="o.product_id.name" class="col-3 bm-2"> <strong>Product to Repair:</strong> - <p t-field="o.product_id.name"/> + <p t-field="o.product_id.name" class="m-0"/> </div> - <div class="col-3" groups="stock.group_production_lot"> + <div class="col-3 bm-2" groups="stock.group_production_lot"> <strong>Lot/Serial Number:</strong> <t t-if="o.lot_id"> <span t-field="o.lot_id.name"/> </t> </div> - <div t-if="o.guarantee_limit" class="col-3"> + <div t-if="o.guarantee_limit" class="col-3 bm-2"> <strong>Warranty:</strong> - <p t-field="o.guarantee_limit"/> + <p t-field="o.guarantee_limit" class="m-0"/> </div> - <div class="col-3"> + <div class="col-3 bm-2"> <strong>Printing Date:</strong> - <p t-esc="datetime.datetime.now().strftime('%Y-%m-%d')" t-options="{'widget': 'date'}"/> + <p t-esc="datetime.datetime.now().strftime('%Y-%m-%d')" t-options="{'widget': 'date'}" class="m-0"/> </div> </div> - <table class="table table-sm"> + <table class="table table-sm o_main_table"> <thead> <tr> <th>Description</th> @@ -68,7 +68,7 @@ </thead> <tbody> <t t-if="o.operations"> - <tr><td colspan="5"><strong>Parts</strong></td></tr> + <tr class="bg-200 o_line_section"><td colspan="5"><strong>Parts</strong></td></tr> <tr t-foreach="o.operations" t-as="line"> <td> <p t-if="line.type == 'add'"><i>(Add)</i> <span t-field="line.name" /></p> @@ -85,14 +85,14 @@ <td class="text-center"> <span t-esc="','.join(map( lambda x: x.name, line.tax_id))"/> </td> - <td class="text-right"> + <td class="text-right o_price_total"> <span t-field="line.price_subtotal" t-options='{"widget": "monetary", "display_currency": o.pricelist_id.currency_id}'/> </td> </t> </tr> </t> <t t-if="o.fees_lines"> - <tr><td colspan="5"><strong>Operations</strong></td></tr> + <tr class="bg-200 o_line_section"><td colspan="5"><strong>Operations</strong></td></tr> <tr t-foreach="o.fees_lines" t-as="fees"> <td> <span t-field="fees.name"/> @@ -108,7 +108,7 @@ <td class="text-center"> <span t-esc="','.join(map( lambda x: x.name, fees.tax_id))"/> </td> - <td class="text-right"> + <td class="text-right o_price_total"> <span t-field="fees.price_subtotal" t-options='{"widget": "monetary", "display_currency": o.pricelist_id.currency_id}'/> </td> @@ -118,11 +118,11 @@ </tbody> </table> - <div class="row justify-content-end"> + <div id="total" class="row justify-content-end"> <div class="col-4"> <table class="table table-sm"> <t t-if="o.invoice_method !='none'"> - <tr class="border-black"> + <tr class="border-black o_subtotal"> <td><strong>Total Without Taxes</strong></td> <td class="text-right"> <span t-field="o.amount_untaxed" @@ -131,14 +131,14 @@ </tr> <tr> <td>Taxes</td> - <td class="text-right"> + <td class="text-right o_price_total"> <span t-field="o.amount_tax" t-options='{"widget": "monetary", "display_currency": o.pricelist_id.currency_id}'/> </td> </tr> - <tr class="border-black"> + <tr class="border-black o_total"> <td><strong>Total</strong></td> - <td class="text-right"> + <td class="text-right o_price_total"> <span t-field="o.amount_total" t-options='{"widget": "monetary", "display_currency": o.pricelist_id.currency_id}'/> </td> diff --git a/addons/resource/i18n/uk.po b/addons/resource/i18n/uk.po index 702504354c8..47b478e539f 100644 --- a/addons/resource/i18n/uk.po +++ b/addons/resource/i18n/uk.po @@ -117,8 +117,8 @@ msgid "" "Define working hours and time table that could be scheduled to your project " "members" msgstr "" -"Визначте робочі години та часові таблиці, які можуть бути заплановані для " -"ваших учасників проекту" +"Визначте робочі години та табелі, які можуть бути заплановані для ваших " +"учасників проекту" #. module: resource #: model:ir.model.fields,field_description:resource.field_resource_calendar__display_name @@ -178,7 +178,7 @@ msgstr "Години" #. module: resource #: selection:resource.resource,resource_type:0 msgid "Human" -msgstr "Людський" +msgstr "Кадри" #. module: resource #: model:ir.model.fields,field_description:resource.field_resource_calendar__id @@ -196,8 +196,8 @@ msgid "" "If empty, this is a generic holiday for the company. If a resource is set, " "the holiday/leave is only for this resource" msgstr "" -"Якщо порожньо, це загальний вихідний компанії. Якщо ресурс встановлено, " -"вихідний/відпустка призначається лише для цього ресурсу" +"Якщо порожньо, це загальний вихідний компанії. Якщо кадр встановлено, " +"вихідний/відпустка призначається лише для цього кадру" #. module: resource #: model:ir.model.fields,help:resource.field_resource_resource__active @@ -244,7 +244,7 @@ msgstr "Останнє оновлення" #. module: resource #: selection:resource.calendar.leaves,time_type:0 msgid "Leave" -msgstr "Покинути" +msgstr "Відпустка" #. module: resource #: model_terms:ir.ui.view,arch_db:resource.view_resource_calendar_leaves_search @@ -313,7 +313,7 @@ msgstr "Причина" #. module: resource #: model:ir.model.fields,help:resource.field_resource_resource__user_id msgid "Related user name for the resource to manage its access." -msgstr "Пов'язане ім'я користувача ресурсу для управління доступом." +msgstr "Пов'язане ім'я користувача кадру для управління його доступом." #. module: resource #: model:ir.model.fields,field_description:resource.field_resource_calendar_leaves__resource_id @@ -325,14 +325,14 @@ msgstr "Пов'язане ім'я користувача ресурсу для #: model_terms:ir.ui.view,arch_db:resource.view_resource_calendar_leaves_search #: model_terms:ir.ui.view,arch_db:resource.view_resource_resource_search msgid "Resource" -msgstr "Ресурс" +msgstr "Кадр" #. module: resource #: model:ir.actions.act_window,name:resource.action_resource_calendar_leave_tree #: model:ir.actions.act_window,name:resource.resource_calendar_leaves_action_from_calendar #: model:ir.ui.menu,name:resource.menu_view_resource_calendar_leaves_search msgid "Resource Leaves" -msgstr "Вихідні ресурсу" +msgstr "Відпустки кадру" #. module: resource #: model:ir.model,name:resource.model_resource_calendar_leaves @@ -342,12 +342,12 @@ msgstr "Деталі відпусток ресурсу" #. module: resource #: model:ir.model,name:resource.model_resource_mixin msgid "Resource Mixin" -msgstr "Мікс ресурсу" +msgstr "Мікс кадру" #. module: resource #: model:ir.model.fields,field_description:resource.field_resource_resource__resource_type msgid "Resource Type" -msgstr "Тип ресурсу" +msgstr "Тип кадру" #. module: resource #: model:ir.model,name:resource.model_resource_calendar @@ -357,7 +357,7 @@ msgstr "Робочий час ресурсу" #. module: resource #: model:ir.model.fields,field_description:resource.field_resource_calendar_attendance__calendar_id msgid "Resource's Calendar" -msgstr "Календар ресурсу" +msgstr "Календар кадру" #. module: resource #: model:ir.actions.act_window,name:resource.action_resource_resource_tree @@ -367,12 +367,12 @@ msgstr "Календар ресурсу" #: model:ir.ui.menu,name:resource.menu_resource_resource #: model_terms:ir.ui.view,arch_db:resource.resource_resource_tree msgid "Resources" -msgstr "Ресурси" +msgstr "Кадри" #. module: resource #: model:ir.actions.act_window,name:resource.resource_calendar_resources_leaves msgid "Resources Leaves" -msgstr "Відпустки ресурсу" +msgstr "Відпустки кадрів" #. module: resource #: model_terms:ir.actions.act_window,help:resource.action_resource_resource_tree @@ -382,9 +382,9 @@ msgid "" "in a specific project phase. You can also set their efficiency level and " "workload based on their weekly working hours." msgstr "" -"Ресурси дозволяють створювати та керувати ресурсами, які потрібно залучити " -"до певної фази проекту. Ви також можете встановити їх рівень ефективності та" -" навантаження залежно від їх тижневого робочого часу." +"Кадри дозволяють створювати та керувати кадрами, які потрібно залучити до " +"певної фази проекту. Ви також можете встановити їх рівень ефективності та " +"навантаження залежно від їх тижневого робочого часу." #. module: resource #: selection:resource.calendar.attendance,dayofweek:0 @@ -394,17 +394,17 @@ msgstr "Субота" #. module: resource #: model_terms:ir.ui.view,arch_db:resource.view_resource_resource_search msgid "Search Resource" -msgstr "Шукати ресурс" +msgstr "Пошук кадру" #. module: resource #: model_terms:ir.ui.view,arch_db:resource.view_resource_calendar_leaves_search msgid "Search Working Period Leaves" -msgstr "Шукати відпустки робочого періоду" +msgstr "Пошук відпустки робочого періоду" #. module: resource #: model_terms:ir.ui.view,arch_db:resource.view_resource_calendar_search msgid "Search Working Time" -msgstr "Шукати робочий час" +msgstr "Пошук робочого часу" #. module: resource #: code:addons/resource/models/res_company.py:22 @@ -482,8 +482,8 @@ msgstr "" "Це поле використовується для розрахунку очікуваної тривалості робочого " "замовлення в цьому робочому центрі. Наприклад, якщо робочий порядок займає " "одну годину, а коефіцієнт ефективності становить 100%, то очікувана " -"тривалість буде одна година. Якщо коефіцієнт ефективності становить 200%, " -"очікувана тривалість - 30 хвилин." +"тривалість становитиме одну годину. Якщо коефіцієнт ефективності становить " +"200%, очікувана тривалість становить 30 хвилин." #. module: resource #: selection:resource.calendar.attendance,dayofweek:0 @@ -585,7 +585,7 @@ msgstr "Деталі роботи" #. module: resource #: model_terms:ir.ui.view,arch_db:resource.resource_calendar_form msgid "Work Resources" -msgstr "Робочі середи" +msgstr "Робочі кадри" #. module: resource #: model:ir.model.fields,field_description:resource.field_resource_calendar_attendance__hour_from diff --git a/addons/sale/i18n/cs.po b/addons/sale/i18n/cs.po index fc73627ac41..956c8745576 100644 --- a/addons/sale/i18n/cs.po +++ b/addons/sale/i18n/cs.po @@ -627,7 +627,7 @@ msgstr "" #. module: sale #: model:ir.model.fields,field_description:sale.field_sale_order__message_attachment_count msgid "Attachment Count" -msgstr "" +msgstr "Počet příloh" #. module: sale #: model:ir.model.fields,field_description:sale.field_product_attribute_custom_value__attribute_value_id @@ -2132,7 +2132,7 @@ msgstr "Platná by měla být pouze celočíselná hodnota." #. module: sale #: model_terms:ir.ui.view,arch_db:sale.brand_promotion msgid "Open Source CRM" -msgstr "" +msgstr "Open Source CRM" #. module: sale #: model_terms:ir.ui.view,arch_db:sale.optional_product_items @@ -3487,6 +3487,8 @@ msgid "" "The commitment date is sooner than the expected date.You may be unable to " "honor the commitment date." msgstr "" +"Datum závazku je dříve, než je očekávané datum. Může se stát, že datum " +"závazku nebude splněno." #. module: sale #: model:ir.model.fields,help:sale.field_crm_team__dashboard_graph_model diff --git a/addons/sale/i18n/es.po b/addons/sale/i18n/es.po index 6c9146fc10e..c897324306a 100644 --- a/addons/sale/i18n/es.po +++ b/addons/sale/i18n/es.po @@ -3,7 +3,6 @@ # * sale # # Translators: -# Carlos Lopez <celm1990@hotmail.com>, 2018 # Miguel Orueta <mo@landoo.es>, 2018 # e2f_es_ t7 <e2f_es_t7@outlook.com>, 2018 # Ana Juaristi <ajuaristio@gmail.com>, 2018 @@ -28,8 +27,9 @@ # Harald Panten <harald.panten@qubiq.es>, 2018 # Lucas Weigandt <lucasweigandt@gmail.com>, 2018 # Cris Martin <cristina.marrod@gmail.com>, 2018 -# Pilar Marín <pilar@odooperu.pe>, 2018 # Omar Torres <otorresgi18@gmail.com>, 2018 +# Pilar Marín <pilar@odooperu.pe>, 2018 +# Carlos Lopez <celm1990@hotmail.com>, 2018 # msgid "" msgstr "" @@ -37,7 +37,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" "PO-Revision-Date: 2018-08-24 09:24+0000\n" -"Last-Translator: Omar Torres <otorresgi18@gmail.com>, 2018\n" +"Last-Translator: Carlos Lopez <celm1990@hotmail.com>, 2018\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -53,7 +53,7 @@ msgstr "# de líneas" #. module: sale #: model:ir.model.fields,field_description:sale.field_payment_transaction__sale_order_ids_nbr msgid "# of Sales Orders" -msgstr "" +msgstr "# Orden de Venta" #. module: sale #: model:mail.template,report_name:sale.email_template_edi_sale @@ -263,6 +263,8 @@ msgid "" "<span class=\"d-none d-md-inline\">Sales Order #</span>\n" " <span class=\"d-block d-md-none\">Ref.</span>" msgstr "" +"<span class=\"d-none d-md-inline\">Orden de Venta #</span>\n" +" <span class=\"d-block d-md-none\">Ref.</span>" #. module: sale #: model_terms:ir.ui.view,arch_db:sale.optional_product_items @@ -468,6 +470,8 @@ msgstr "Un único precio de venta por producto" msgid "" "A transaction can't be linked to sales orders having different currencies." msgstr "" +"Una transacción no puede vincularse a pedidos de venta que tengan diferentes" +" monedas" #. module: sale #: code:addons/sale/models/sale.py:780 @@ -475,6 +479,8 @@ msgstr "" msgid "" "A transaction can't be linked to sales orders having different partners." msgstr "" +"Una transacción no puede vincularse a pedidos de Venta que tengan socios " +"diferentes." #. module: sale #: model_terms:ir.actions.act_window,help:sale.action_orders_upselling @@ -517,6 +523,11 @@ msgid "" " - Timesheet: the quantity is the sum of hours recorded on tasks linked to this sale line\n" " - Stock Moves: the quantity comes from confirmed pickings\n" msgstr "" +"Según la configuración del producto, la cantidad enviada puede ser automaticamente calculada por el mecanismo:\n" +" - Manual: La cantidad es establecida manualmente en linea\n" +" - Analitica de Gastos: La cantidad es la suma de la cantidad de gastos contabilizados\n" +" - Timesheet: La cantidad es la suma de horas realizadas en tareas enlazadas para la linea de venta\n" +" - Movimiento de Stocks: La cantidad proviene de los pickings confirmados\n" #. module: sale #: model:ir.model.fields,field_description:sale.field_sale_payment_acquirer_onboarding_wizard__acc_number @@ -1837,7 +1848,7 @@ msgstr "" #. module: sale #: model_terms:ir.ui.view,arch_db:sale.report_all_channels_sales_view_search msgid "Last 365 Days" -msgstr "" +msgstr "Últimos 365 días" #. module: sale #: model:ir.model.fields,field_description:sale.field_product_attribute_custom_value____last_update diff --git a/addons/sale/i18n/ja.po b/addons/sale/i18n/ja.po index 01b7eef4b0a..68a1a75ebfd 100644 --- a/addons/sale/i18n/ja.po +++ b/addons/sale/i18n/ja.po @@ -3,24 +3,25 @@ # * sale # # Translators: -# SHIMIZU Taku <shimizu.taku@gmail.com>, 2018 -# Martin Trigaux, 2018 -# Yoshi Tashiro <tashiro@roomsfor.hk>, 2018 -# Manami Hashi <manami@roomsfor.hk>, 2018 -# 高木正勝 <masakatsu.takagi@pro-spire.co.jp>, 2018 +# 城谷 龍弥 <tatsuya.shirotani@pro-spire.co.jp>, 2018 # kent_ocean <ke.tanabe@gmail.com>, 2018 # Takahiro MURAKAMI <murakami@date-yakkyoku.com>, 2018 -# Norimichi Sugimoto <norimichi.sugimoto@tls-ltd.co.jp>, 2018 -# 城谷 龍弥 <tatsuya.shirotani@pro-spire.co.jp>, 2018 # Tim Siu Lai <tl@roomsfor.hk>, 2018 +# SHIMIZU Taku <shimizu.taku@gmail.com>, 2018 +# Manami Hashi <manami@roomsfor.hk>, 2018 # Takuya Sawada <takuya@tuntunkun.com>, 2018 +# Martin Trigaux, 2018 +# 高木正勝 <masakatsu.takagi@pro-spire.co.jp>, 2018 +# Norimichi Sugimoto <norimichi.sugimoto@tls-ltd.co.jp>, 2018 +# Yoshi Tashiro <tashiro@roomsfor.hk>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" -"PO-Revision-Date: 2018-10-08 06:49+0000\n" -"Last-Translator: Takuya Sawada <takuya@tuntunkun.com>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:24+0000\n" +"Last-Translator: Yoshi Tashiro <tashiro@roomsfor.hk>, 2018\n" "Language-Team: Japanese (https://www.transifex.com/odoo/teams/41243/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1769,7 +1770,7 @@ msgstr "" #. module: sale #: model_terms:ir.ui.view,arch_db:sale.report_all_channels_sales_view_search msgid "Last 365 Days" -msgstr "" +msgstr "過去365日" #. module: sale #: model:ir.model.fields,field_description:sale.field_product_attribute_custom_value____last_update @@ -3205,7 +3206,7 @@ msgstr "プロダクトに複数の価格や自動値引等を設定" #. module: sale #: model_terms:ir.ui.view,arch_db:sale.sale_onboarding_order_confirmation_step msgid "Set payments" -msgstr "" +msgstr "支払い方法を設定" #. module: sale #: model_terms:ir.ui.view,arch_db:sale.res_config_settings_view_form diff --git a/addons/sale/i18n/nb.po b/addons/sale/i18n/nb.po index a84a68ab9ae..f5afcba0260 100644 --- a/addons/sale/i18n/nb.po +++ b/addons/sale/i18n/nb.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" -"PO-Revision-Date: 2018-10-08 06:49+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:24+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -838,7 +840,7 @@ msgstr "Beregn fraktkostnad på ordrer" #. module: sale #: model:ir.model,name:sale.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: sale #: model:ir.ui.menu,name:sale.menu_sale_config @@ -1767,7 +1769,7 @@ msgstr "" #. module: sale #: model_terms:ir.ui.view,arch_db:sale.report_all_channels_sales_view_search msgid "Last 365 Days" -msgstr "" +msgstr "Siste 365 dager" #. module: sale #: model:ir.model.fields,field_description:sale.field_product_attribute_custom_value____last_update @@ -2128,7 +2130,7 @@ msgstr "Signering via nett" #: code:addons/sale/static/src/js/sale.js:32 #, python-format msgid "Only Integer Value should be valid." -msgstr "" +msgstr "Kun heltall er gyldig verdi" #. module: sale #: model_terms:ir.ui.view,arch_db:sale.brand_promotion @@ -3687,6 +3689,9 @@ msgid "" "list view and click on 'Portal Access Management' option in the dropdown " "menu *Action*." msgstr "" +"For å sende invitasjoner i B2B modus, åpne en kontrakt, eller velg flere i " +"listevisning, og klikk på 'Tilgangsadministrasjon for Portal' i " +"nedtrekksmenyen *Handling\"." #. module: sale #: selection:sale.order,activity_state:0 diff --git a/addons/sale/i18n/nl.po b/addons/sale/i18n/nl.po index fef48ea6184..230a292fc87 100644 --- a/addons/sale/i18n/nl.po +++ b/addons/sale/i18n/nl.po @@ -2476,7 +2476,7 @@ msgstr "Betaal met een andere betalingsverwerker" #. module: sale #: selection:sale.payment.acquirer.onboarding.wizard,payment_method:0 msgid "Pay with credit card (via Stripe)" -msgstr "Betaal met credit card (via Stripe)" +msgstr "Betaal met creditcard (via Stripe)" #. module: sale #: selection:res.company,sale_onboarding_payment_method:0 diff --git a/addons/sale/i18n/uk.po b/addons/sale/i18n/uk.po index 87327fda4a4..1878da20fa3 100644 --- a/addons/sale/i18n/uk.po +++ b/addons/sale/i18n/uk.po @@ -49,7 +49,7 @@ msgid "" "'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })" msgstr "" "${object.company_id.name} ${object.state in ('draft', 'sent') and " -"'Пропозиція' or 'Замовлення'} (Референс ${object.name or 'немає' })" +"'Quotation' or 'Order'} (Ref ${object.name or 'n/a' })" #. module: sale #: model_terms:ir.ui.view,arch_db:sale.sale_order_portal_content @@ -140,7 +140,7 @@ msgstr "" #. module: sale #: model_terms:ir.ui.view,arch_db:sale.sale_order_portal_template msgid "<i class=\"fa fa-comment\"/> Feedback" -msgstr "<i class=\"fa fa-comment\"/> Коментувати" +msgstr "<i class=\"fa fa-comment\"/> Відгук" #. module: sale #: model_terms:ir.ui.view,arch_db:sale.sale_order_portal_template @@ -276,7 +276,7 @@ msgstr "" #. module: sale #: model_terms:ir.ui.view,arch_db:sale.report_saleorder_document msgid "<span>Pro-Forma Invoice # </span>" -msgstr "<span>Рахунок № </span>" +msgstr "<span>Проформа рахунку № </span>" #. module: sale #: model_terms:ir.ui.view,arch_db:sale.sale_order_portal_template @@ -396,7 +396,7 @@ msgstr "<strong>Разом</strong>" #. module: sale #: model_terms:ir.ui.view,arch_db:sale.report_saleorder_document msgid "<strong>Your Reference:</strong>" -msgstr "<strong>Ваш референс:</strong>" +msgstr "<strong>Ваше посилання:</strong>" #. module: sale #: code:addons/sale/models/sale.py:811 @@ -500,7 +500,7 @@ msgstr "Стан дії" #: model:ir.actions.act_window,name:sale.mail_activity_type_action_config_sale #: model:ir.ui.menu,name:sale.sale_menu_config_activity_type msgid "Activity Types" -msgstr "Типи діяльності" +msgstr "Типи дії" #. module: sale #: model_terms:ir.ui.view,arch_db:sale.sale_product_configurator_view_form @@ -860,7 +860,7 @@ msgstr "Налаштування" #: code:addons/sale/static/src/js/product_configurator_controller.js:125 #, python-format msgid "Configure" -msgstr "Налаштування" +msgstr "Налаштувати" #. module: sale #: model_terms:ir.ui.view,arch_db:sale.view_order_form @@ -1022,7 +1022,7 @@ msgstr "" #. module: sale #: model:ir.model.fields,help:sale.field_sale_order__access_url msgid "Customer Portal URL" -msgstr "URL Порталу клієнта" +msgstr "URL порталу клієнта" #. module: sale #: model:ir.model.fields,field_description:sale.field_sale_order__client_order_ref @@ -1220,7 +1220,7 @@ msgstr "" #. module: sale #: model:ir.model.fields,field_description:sale.field_product_pricelist__discount_policy msgid "Discount Policy" -msgstr "Дисконтна політика" +msgstr "Політика знижки" #. module: sale #: selection:product.pricelist,discount_policy:0 @@ -1301,7 +1301,7 @@ msgid "" "not copied when duplicating a sales order." msgstr "" "Попередні платежі здійснюються при створенні рахунків-фактур із замовлення " -"клієнта. Вони не копіюються при дублюванні замовлення на продаж." +"на продаж. Вони не копіюються при дублюванні замовлення на продаж." #. module: sale #: model_terms:ir.ui.view,arch_db:sale.sale_order_portal_template @@ -1510,7 +1510,7 @@ msgid "" msgstr "" "Зображення варіанта товару (зображення великого розміру шаблону товару, якщо" " воно помилкове). Він автоматично змінюється у вигляді зображення 1024x1024 " -"пікселів із збереженим форматом зображення." +"пікселів зі збереженим форматом зображення." #. module: sale #: code:addons/sale/models/product_template.py:89 @@ -1532,7 +1532,7 @@ msgstr "в т. ч. податки)" #. module: sale #: model:ir.model.fields,field_description:sale.field_sale_advance_payment_inv__deposit_account_id msgid "Income Account" -msgstr "Рахунок доходів" +msgstr "Рахунок доходу" #. module: sale #: model_terms:ir.ui.view,arch_db:sale.res_config_settings_view_form @@ -1571,7 +1571,7 @@ msgstr "Рахунок %s оплачено" #. module: sale #: model:ir.model.fields,field_description:sale.field_sale_order__partner_invoice_id msgid "Invoice Address" -msgstr "Адреса рахунка" +msgstr "Адреса рахунку" #. module: sale #: model:mail.message.subtype,name:sale.mt_salesteam_invoice_confirmed @@ -1601,12 +1601,12 @@ msgstr "Рядки рахунку" #. module: sale #: model:ir.actions.act_window,name:sale.action_view_sale_advance_payment_inv msgid "Invoice Order" -msgstr "Рахунок по замовленню" +msgstr "Виставити рахунок на замовлення" #. module: sale #: model_terms:ir.ui.view,arch_db:sale.view_sale_advance_payment_inv msgid "Invoice Sales Order" -msgstr "Рахунок по замовленню" +msgstr "Виставити рахунок на замовлення на продаж" #. module: sale #: model:ir.model.fields,field_description:sale.field_sale_order__invoice_status @@ -1617,7 +1617,7 @@ msgstr "Статус рахунку" #. module: sale #: model:ir.model.fields,help:sale.field_sale_order__partner_invoice_id msgid "Invoice address for current sales order." -msgstr "Адреса для рахунку цього замовлення." +msgstr "Адреса для рахунка цього замовлення." #. module: sale #: model:ir.model.fields,help:sale.field_crm_team__invoiced @@ -1628,7 +1628,7 @@ msgid "" msgstr "" "Дохід за рахунком на поточний місяць. Це сума, на яку в цьому місяці " "виставлено рахунок на продаж. Він використовується для обчислення " -"коефіцієнта прогресії поточного та цільового доходу у вигляді канбану." +"коефіцієнта прогресії поточного та цільового доходу у перегляді канбану." #. module: sale #: selection:res.config.settings,default_invoice_policy:0 @@ -1693,14 +1693,14 @@ msgid "" "Invoices will be created in draft so that you can review\n" " them before validation." msgstr "" -"Рахунки-фактури будуть створені в проекті, щоб ви могли\n" +"Рахунки-фактури будуть створені в проекті, щоби ви могли\n" " переглянути їх перед перевіркою." #. module: sale #: code:addons/sale/models/sales_team.py:96 #, python-format msgid "Invoices: Untaxed Total" -msgstr "Рахунки-фактури: неоплачений загальний" +msgstr "Рахунки-фактури: всього без податків" #. module: sale #: model_terms:ir.ui.view,arch_db:sale.crm_team_salesteams_view_kanban @@ -1714,12 +1714,12 @@ msgstr "Виставлення рахунків" #: model:ir.model.fields,field_description:sale.field_product_template__invoice_policy #: model:ir.model.fields,field_description:sale.field_res_config_settings__default_invoice_policy msgid "Invoicing Policy" -msgstr "Виписування рахунків" +msgstr "Політика виставлення рахунків" #. module: sale #: model:ir.model.fields,field_description:sale.field_crm_team__invoiced_target msgid "Invoicing Target" -msgstr "Цільовий рахунок-фактура" +msgstr "Цільове виставлення рахунка-фактури" #. module: sale #: model_terms:ir.ui.view,arch_db:sale.report_saleorder_document @@ -1883,7 +1883,7 @@ msgstr "" #. module: sale #: model_terms:ir.ui.view,arch_db:sale.res_config_settings_view_form msgid "Manage promotion & coupon programs" -msgstr "Керування просуванням та купонними програмами" +msgstr "Керуйте просуванням та купонними програмами" #. module: sale #: selection:sale.order.line,qty_delivered_method:0 @@ -1902,8 +1902,8 @@ msgid "" "Timesheets on contract: Invoice based on the tracked hours on the related timesheet.\n" "Create a task and track hours: Create a task on the sales order validation and track the work hours." msgstr "" -"Вручну встановлювати величини на замовлення: рахунок-фактура на основі введеної вручну кількості, без створення аналітичного обліку.\n" -"Табкль на контракті: рахунок-фактура на основі годин, що відстежуються, у відповідному табелі.\n" +"Вручну встановлювати кількості на замовлення: рахунок-фактура на основі введеної вручну кількості, без створення аналітичного обліку.\n" +"Табель на контракті: рахунок-фактура на основі годин, що відстежуються, у відповідному табелі.\n" "Створення завдання та відстеження годин: створіть завдання з перевірки замовлення на продаж та відстежуйте години роботи." #. module: sale @@ -1975,7 +1975,7 @@ msgstr "Мої комерційні пропозиції" #. module: sale #: model_terms:ir.ui.view,arch_db:sale.view_sales_order_line_filter msgid "My Sales Order Lines" -msgstr "Мої рядки замовлення" +msgstr "Мої рядки замовлення на продаж" #. module: sale #: model:ir.model.fields,help:sale.field_sale_order__signed_by @@ -1993,12 +1993,12 @@ msgstr "Новий" #. module: sale #: model:ir.actions.act_window,name:sale.action_quotation_form msgid "New Quotation" -msgstr "Нова пропозиція" +msgstr "Нова комерційна пропозиція" #. module: sale #: model:ir.model.fields,field_description:sale.field_sale_order__activity_date_deadline msgid "Next Activity Deadline" -msgstr "Наступий дедлайн дії" +msgstr "Дедлайн наступної дії" #. module: sale #: model:ir.model.fields,field_description:sale.field_sale_order__activity_summary @@ -2008,7 +2008,7 @@ msgstr "Підсумок наступної дії" #. module: sale #: model:ir.model.fields,field_description:sale.field_sale_order__activity_type_id msgid "Next Activity Type" -msgstr "Наступний тип дії" +msgstr "Тип наступної дії" #. module: sale #: selection:product.template,expense_policy:0 @@ -2179,7 +2179,7 @@ msgid "" "(cross-sell strategy, e.g. for computers: warranty, software, etc.)." msgstr "" "Необов'язкові товари пропонуються кожного разу, коли клієнт натискає " -"\"Додати в кошик\" (стратегія крос-продажі, наприклад, для комп'ютерів: " +"\"Додати в кошик\" (стратегія крос-продажів, наприклад, для комп'ютерів: " "гарантія, програмне забезпечення тощо)." #. module: sale @@ -2287,7 +2287,7 @@ msgstr "" #. module: sale #: selection:product.template,invoice_policy:0 msgid "Ordered quantities" -msgstr "По замовленій кількості" +msgstr "Замовлені кількості" #. module: sale #: model:ir.ui.menu,name:sale.menu_sale_order @@ -2325,7 +2325,7 @@ msgstr "Інша інформація" #. module: sale #: selection:sale.order,activity_state:0 msgid "Overdue" -msgstr "Прострочено" +msgstr "Протерміновано" #. module: sale #: model:ir.actions.report,name:sale.action_report_pro_forma_invoice @@ -2438,7 +2438,7 @@ msgstr "Платіжна операція" #. module: sale #: model:ir.model.fields,field_description:sale.field_sale_payment_acquirer_onboarding_wizard__paypal_seller_account msgid "Paypal Merchant ID" -msgstr "ID мерчанта Paypal " +msgstr "ID продавця Paypal " #. module: sale #: model:ir.model.fields,field_description:sale.field_sale_payment_acquirer_onboarding_wizard__paypal_pdt_token @@ -2474,7 +2474,7 @@ msgstr "" #. module: sale #: model:ir.model.fields,field_description:sale.field_sale_order__access_url msgid "Portal Access URL" -msgstr "URL Доступу до порталу" +msgstr "URL доступу до порталу" #. module: sale #: selection:sale.report,state:0 @@ -2509,7 +2509,7 @@ msgstr "Ціна зниження податку без урахування" #. module: sale #: model:ir.model.fields,field_description:sale.field_sale_order_line__price_reduce_taxinc msgid "Price Reduce Tax inc" -msgstr "Ціна зниження податку вкл" +msgstr "Ціна зниження з включеним податком" #. module: sale #: model:ir.model.fields,field_description:sale.field_report_all_channels_sales__price_subtotal @@ -2528,19 +2528,19 @@ msgstr "Ціна розрахована за формулами (знижки, #: model:ir.model.fields,field_description:sale.field_sale_product_configurator__pricelist_id #: model:ir.model.fields,field_description:sale.field_sale_report__pricelist_id msgid "Pricelist" -msgstr "Прайс-лист" +msgstr "Прайслист" #. module: sale #: model:ir.model.fields,help:sale.field_sale_order__pricelist_id msgid "Pricelist for current sales order." -msgstr "Прайс-лист дял поточного замовлення" +msgstr "Прайслист для поточного замовлення" #. module: sale #: model:ir.model.fields,field_description:sale.field_res_config_settings__sale_pricelist_setting #: model:ir.ui.menu,name:sale.menu_product_pricelist_main #: model_terms:ir.ui.view,arch_db:sale.res_config_settings_view_form msgid "Pricelists" -msgstr "Прайс-листи" +msgstr "Прайслисти" #. module: sale #: model:ir.model.fields,field_description:sale.field_res_config_settings__multi_sales_price_method @@ -2682,7 +2682,7 @@ msgstr "К-сть в рахунку" #. module: sale #: model:ir.model.fields,field_description:sale.field_sale_report__product_uom_qty msgid "Qty Ordered" -msgstr "Кількість замовлень" +msgstr "Замовлена кількість" #. module: sale #: model:ir.model.fields,field_description:sale.field_sale_report__qty_to_invoice @@ -2719,12 +2719,12 @@ msgstr "Комерційна пропозиція" #: model_terms:ir.ui.view,arch_db:sale.portal_my_quotations #: model_terms:ir.ui.view,arch_db:sale.report_saleorder_document msgid "Quotation #" -msgstr "Пропозиція №" +msgstr "Комерційна пропозиція №" #. module: sale #: model:ir.actions.report,name:sale.action_report_saleorder msgid "Quotation / Order" -msgstr "Пропозиція / Замовлення" +msgstr "Комерційа пропозиція / Замовлення" #. module: sale #: model_terms:ir.ui.view,arch_db:sale.view_quotation_tree @@ -2739,12 +2739,12 @@ msgstr "" #. module: sale #: model_terms:ir.ui.view,arch_db:sale.view_quotation_tree msgid "Quotation Number" -msgstr "Номер пропозиції" +msgstr "Номер комерційної пропозиції" #. module: sale #: selection:sale.order,state:0 selection:sale.report,state:0 msgid "Quotation Sent" -msgstr "Пропозицію відправлено" +msgstr "Комерційну пропозицію відправлено" #. module: sale #: sql_constraint:res.company:0 @@ -2754,14 +2754,14 @@ msgstr "" #. module: sale #: model:mail.message.subtype,description:sale.mt_order_confirmed msgid "Quotation confirmed" -msgstr "Пропозицію підтверджено" +msgstr "Комерційну пропозицію підтверджено" #. module: sale #: model:mail.message.subtype,description:sale.mt_order_sent #: model:mail.message.subtype,name:sale.mt_order_sent #: model:mail.message.subtype,name:sale.mt_salesteam_order_sent msgid "Quotation sent" -msgstr "Пропозицію відправлено" +msgstr "Комерційну пропозицію відправлено" #. module: sale #: code:addons/sale/controllers/portal.py:159 @@ -2794,12 +2794,12 @@ msgstr "Комерційні пропозиції та замовлення" #. module: sale #: model:ir.actions.act_window,name:sale.action_order_report_quotation_salesteam msgid "Quotations Analysis" -msgstr "Аналіз пропозицій" +msgstr "Аналіз комерційних пропозицій" #. module: sale #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order msgid "Quotations and Sales" -msgstr "Пропозиції та продаж" +msgstr "Комерційні пропозиції та продажі" #. module: sale #: selection:product.attribute,type:0 @@ -2816,13 +2816,13 @@ msgstr "" #: code:addons/sale/controllers/portal.py:104 #, python-format msgid "Reference" -msgstr "Референс" +msgstr "Посилання" #. module: sale #: model:ir.model.fields,help:sale.field_sale_order__origin msgid "Reference of the document that generated this sales order request." msgstr "" -"Посилання на документ на основі якого згенеровано запит комерційної " +"Посилання на документ, на основі якого згенеровано запит комерційної " "пропозиції." #. module: sale @@ -2980,7 +2980,7 @@ msgstr "Замовлення на продаж" #: model:mail.message.subtype,name:sale.mt_order_confirmed #: model:mail.message.subtype,name:sale.mt_salesteam_order_confirmed msgid "Sales Order Confirmed" -msgstr "Замовлення підтверджено" +msgstr "Замовлення на продаж підтверджено" #. module: sale #: model:ir.model.fields,field_description:sale.field_account_analytic_line__so_line @@ -2992,7 +2992,7 @@ msgstr "Елемент замовлення на продаж" #: model:ir.model,name:sale.model_sale_order_line #: model:ir.model.fields,field_description:sale.field_product_template__sale_line_warn msgid "Sales Order Line" -msgstr "Рядок замовлення" +msgstr "Рядок замовлення на продаж" #. module: sale #: model:ir.model.fields,field_description:sale.field_account_invoice_line__sale_line_ids @@ -3004,12 +3004,12 @@ msgstr "Рядки замовлення на продаж" #. module: sale #: model_terms:ir.ui.view,arch_db:sale.view_sales_order_line_filter msgid "Sales Order Lines ready to be invoiced" -msgstr "Рядки замовлення готові до включення у рахунок" +msgstr "Рядки замовлення на продаж готові до включення у рахунок" #. module: sale #: model_terms:ir.ui.view,arch_db:sale.view_sales_order_line_filter msgid "Sales Order Lines related to a Sales Order of mine" -msgstr "Рядки замовлення на продаж, пов'язані із моїм замовленням на продаж" +msgstr "Рядки замовлення на продаж, пов'язані з моїм замовленням на продаж" #. module: sale #: code:addons/sale/models/payment.py:133 @@ -3123,7 +3123,7 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:sale.view_sales_order_filter #: model_terms:ir.ui.view,arch_db:sale.view_sales_order_line_filter msgid "Search Sales Order" -msgstr "Пошук замовлення на пролаж" +msgstr "Пошук замовлення на продаж" #. module: sale #: selection:sale.order.line,display_type:0 @@ -3138,7 +3138,7 @@ msgstr "" #. module: sale #: model:ir.model.fields,field_description:sale.field_sale_order__access_token msgid "Security Token" -msgstr "Token безпеки" +msgstr "Токен безпеки" #. module: sale #: selection:product.attribute,type:0 @@ -3168,7 +3168,7 @@ msgstr "" #. module: sale #: model_terms:ir.ui.view,arch_db:sale.res_config_settings_view_form msgid "Sell and purchase products in different units of measure" -msgstr "Продаж та купівля товарів у різних одиницях виміру" +msgstr "Продаж та купівля товарів у різних одиницях вимірювання" #. module: sale #: model_terms:ir.ui.view,arch_db:sale.res_config_settings_view_form @@ -3178,7 +3178,7 @@ msgstr "Продаж товарів по кілька одиниць # на па #. module: sale #: model_terms:ir.ui.view,arch_db:sale.view_order_form msgid "Send PRO-FORMA Invoice" -msgstr "Відправити рахунок" +msgstr "Відправити про-форму рахунка-фактури" #. module: sale #: model_terms:ir.ui.view,arch_db:sale.res_config_settings_view_form @@ -3298,7 +3298,7 @@ msgstr "Показувати маржу на замовлення" #. module: sale #: selection:product.pricelist,discount_policy:0 msgid "Show public price & discount to the customer" -msgstr "Показати загальну ціну та знижку для клієнта" +msgstr "Показати загальну ціну та знижку клієнту" #. module: sale #: model_terms:ir.ui.view,arch_db:sale.res_config_settings_view_form @@ -3393,7 +3393,7 @@ msgid "" "Planned: Future activities." msgstr "" "Етап заснований на діях\n" -"Прострочений: термін виконання вже минув\n" +"Протермінований: термін виконання вже минув\n" "Сьогодні: дата дії сьогодні\n" "Заплановано: майбутні дії." @@ -3434,7 +3434,7 @@ msgid "" "Target of invoice revenue for the current month. This is the amount the " "sales channel estimates to be able to invoice this month." msgstr "" -"Цільова сума доходів від рахунку-фактури за поточний місяць. Це сума, яку " +"Цільова сума доходів від рахунка-фактури за поточний місяць. Це сума, яку " "оцінює канал продажу, щоб мати змогу виставляти рахунок у цьому місяці." #. module: sale @@ -3532,7 +3532,7 @@ msgstr "Сума, за якою виставляється рахунок, бе #. module: sale #: model:ir.model.fields,help:sale.field_sale_order__analytic_account_id msgid "The analytic account related to a sales order." -msgstr "Аналітичний рахунок пов’язаний з замовленням на продаж" +msgstr "Аналітичний рахунок пов’язаний із замовленням на продаж" #. module: sale #: code:addons/sale/models/sale.py:360 @@ -3565,7 +3565,7 @@ msgid "" " in their detail form." msgstr "" "Маржа розраховується як сума цін реалізації продукції за вирахуванням " -"вартості, встановленої у їх детальній формі." +"вартості, встановленої у їхній детальній формі." #. module: sale #: model:ir.model.fields,help:sale.field_sale_order__reference @@ -3579,9 +3579,9 @@ msgid "" "The product used to invoice a down payment should be of type 'Service'. " "Please use another product or update this product." msgstr "" -"Товар, що використовується для оплати рахунку-фактури початкового внеску, " +"Товар, що використовується для оплати рахунка-фактури початкового внеску, " "повинен мати тип \"Сервіс\". Будь ласка, використайте інший товар або " -"оновіть цей продукт." +"оновіть цей товар." #. module: sale #: code:addons/sale/wizard/sale_make_invoice_advance.py:152 @@ -3592,7 +3592,7 @@ msgid "" " create a deposit invoice." msgstr "" "Для товару, який використовується для оплати першого внеску, політика " -"рахунку-фактури повинна бути встановлена на \"Замовлені величини\". Будь " +"рахунка-фактури повинна бути встановлена на \"Замовлені кількості\". Будь " "ласка, оновіть депозитний товар, щоб мати змогу створити депозитний рахунок-" "фактуру." @@ -3617,7 +3617,7 @@ msgstr "На даний момент для вас немає замовлень #. module: sale #: model_terms:ir.ui.view,arch_db:sale.portal_my_quotations msgid "There are currently no quotations for your account." -msgstr "Зараз немає комерційних пропозицій для вашого обліку." +msgstr "Зараз немає комерційних пропозицій для вашого рахунку." #. module: sale #: model_terms:ir.ui.view,arch_db:sale.res_config_settings_view_form @@ -3638,7 +3638,7 @@ msgid "" " install a chart of account from Accounting app, settings menu." msgstr "" "Для цього товару немає облікового запису про доходи: \"%s\". Можливо, вам " -"необхідно встановити діаграму рахунку з програми обліку, меню налаштувань." +"необхідно встановити план рахунку з програми бухобліку, меню налаштувань." #. module: sale #: code:addons/sale/models/sale.py:549 code:addons/sale/models/sale.py:553 @@ -3816,7 +3816,7 @@ msgstr "Разом:" #. module: sale #: model:ir.model.fields,field_description:sale.field_product_template__service_type msgid "Track Service" -msgstr "Відслідковування послуг" +msgstr "Відслідковувати послугу" #. module: sale #: model:ir.model.fields,field_description:sale.field_sale_order__transaction_ids @@ -3866,12 +3866,12 @@ msgstr "Ціна за одиницю:" #: model:ir.model.fields,field_description:sale.field_sale_report__product_uom #: model_terms:ir.ui.view,arch_db:sale.view_order_line_tree msgid "Unit of Measure" -msgstr "Одиниця виміру" +msgstr "Одиниця вимірювання" #. module: sale #: model:ir.ui.menu,name:sale.menu_product_uom_categ_form_action msgid "Unit of Measure Categories" -msgstr "Категорії одиниць виміру" +msgstr "Категорії одиниць вимірювання" #. module: sale #: model:product.product,uom_name:sale.advance_product_0 @@ -3881,14 +3881,14 @@ msgstr "Категорії одиниць виміру" #: model:product.template,uom_name:sale.product_product_1_product_template #: model:product.template,uom_name:sale.product_product_4e_product_template msgid "Unit(s)" -msgstr "шт" +msgstr "Штука(и)" #. module: sale #: model:ir.ui.menu,name:sale.menu_product_uom_form_action #: model:ir.ui.menu,name:sale.next_id_16 #: model_terms:ir.ui.view,arch_db:sale.res_config_settings_view_form msgid "Units of Measure" -msgstr "Одиниці виміру" +msgstr "Одиниці вимірювання" #. module: sale #: model_terms:ir.ui.view,arch_db:sale.view_order_form diff --git a/addons/sale/models/sale.py b/addons/sale/models/sale.py index 43caf3a306c..bc4343e5b7d 100644 --- a/addons/sale/models/sale.py +++ b/addons/sale/models/sale.py @@ -385,7 +385,7 @@ class SaleOrder(models.Model): if 'invoice_status' in values: self.activity_unlink(['sale.mail_act_sale_upsell']) if values['invoice_status'] == 'upselling': - for order in self: + for order in self.filtered('user_id'): order.activity_schedule( 'sale.mail_act_sale_upsell', user_id=order.user_id.id, diff --git a/addons/sale/report/sale_report_templates.xml b/addons/sale/report/sale_report_templates.xml index ea923c1fd80..8e678b1fcd6 100644 --- a/addons/sale/report/sale_report_templates.xml +++ b/addons/sale/report/sale_report_templates.xml @@ -37,37 +37,37 @@ <span t-field="doc.name"/> </h2> - <div class="row col mt32 mb32" id="informations"> - <div t-if="doc.client_order_ref" class="mr32"> + <div class="row mt32 mb32" id="informations"> + <div t-if="doc.client_order_ref" class="col-auto mw-100 mb-2"> <strong>Your Reference:</strong> - <p t-field="doc.client_order_ref"/> + <p class="m-0" t-field="doc.client_order_ref"/> </div> - <div t-if="doc.confirmation_date and doc.state not in ['draft','sent']" class="mr32"> + <div t-if="doc.confirmation_date and doc.state not in ['draft','sent']" class="col-auto mw-100 mb-2"> <strong>Date Ordered:</strong> - <p t-field="doc.confirmation_date"/> + <p class="m-0" t-field="doc.confirmation_date"/> </div> - <div t-if="doc.date_order and doc.state in ['draft','sent']" class="mr32"> + <div t-if="doc.date_order and doc.state in ['draft','sent']" class="col-auto mw-100 mb-2"> <strong>Quotation Date:</strong> - <p t-field="doc.date_order"/> + <p class="m-0" t-field="doc.date_order"/> </div> - <div t-if="doc.user_id.name" class="mr32"> + <div t-if="doc.user_id.name" class="col-auto mw-100 mb-2"> <strong>Salesperson:</strong> - <p t-field="doc.user_id"/> + <p class="m-0" t-field="doc.user_id"/> </div> - <div name="payment_term" t-if="doc.payment_term_id" class="mr32"> + <div name="payment_term" t-if="doc.payment_term_id" class="col-auto mw-100 mb-2"> <strong>Payment Terms:</strong> - <p t-field="doc.payment_term_id"/> + <p class="m-0" t-field="doc.payment_term_id"/> </div> - <div t-if="doc.validity_date and doc.state in ['draft', 'sent']" class="mr32"> + <div t-if="doc.validity_date and doc.state in ['draft', 'sent']" class="col-auto mw-100 mb-2"> <strong>Expiration Date:</strong> - <p t-field="doc.validity_date"/> + <p class="m-0" t-field="doc.validity_date"/> </div> </div> <!-- Is there a discount on at least one line? --> <t t-set="display_discount" t-value="any([l.discount for l in doc.order_line])"/> - <table class="table table-sm"> + <table class="table table-sm o_main_table"> <thead> <tr> <t t-set="colspan" t-value="5"/> @@ -94,7 +94,7 @@ <t t-set="current_subtotal" t-value="current_subtotal + line.price_subtotal" groups="account.group_show_line_subtotals_tax_excluded"/> <t t-set="current_subtotal" t-value="current_subtotal + line.price_total" groups="account.group_show_line_subtotals_tax_included"/> - <tr t-att-class="'bg-200 font-weight-bold' if line.display_type == 'line_section' else 'font-italic' if line.display_type == 'line_note' else ''"> + <tr t-att-class="'bg-200 font-weight-bold o_line_section' if line.display_type == 'line_section' else 'font-italic o_line_note' if line.display_type == 'line_note' else ''"> <t t-if="not line.display_type"> <td><span t-field="line.name"/></td> <td class="text-right"> @@ -110,7 +110,7 @@ <td class="text-right"> <span t-esc="', '.join(map(lambda x: (x.description or x.name), line.tax_id))"/> </td> - <td class="text-right"> + <td class="text-right o_price_total"> <span t-field="line.price_subtotal" groups="account.group_show_line_subtotals_tax_excluded"/> <span t-field="line.price_total" groups="account.group_show_line_subtotals_tax_included"/> </td> @@ -145,23 +145,23 @@ </table> <div class="clearfix"> - <div class="row" name="total"> + <div id="total" class="row" name="total"> <div t-attf-class="#{'col-4' if report_type != 'html' else 'col-sm-7 col-md-5'} ml-auto"> <table class="table table-sm"> - <tr class="border-black" style="border-bottom:1px solid #dddddd;"> + <tr class="border-black o_subtotal" style=""> <td><strong>Subtotal</strong></td> <td class="text-right"> <span t-field="doc.amount_untaxed"/> </td> </tr> <t t-foreach="doc.amount_by_group" t-as="amount_by_group"> - <tr style="border-bottom:1px solid #dddddd;"> + <tr style=""> <t t-if="amount_by_group[3] == 1 and doc.amount_untaxed == amount_by_group[2]"> <td> <span t-esc="amount_by_group[0]"/> <span>&nbsp;<span>on</span>&nbsp;<t t-esc="amount_by_group[2]" t-options='{"widget": "monetary", "display_currency": doc.pricelist_id.currency_id}'/></span> </td> - <td class="text-right"> + <td class="text-right o_price_total"> <span t-esc="amount_by_group[1]" t-options='{"widget": "monetary", "display_currency": doc.pricelist_id.currency_id}'/> </td> @@ -170,14 +170,14 @@ <td> <span t-esc="amount_by_group[0]"/> </td> - <td class="text-right"> + <td class="text-right o_price_total"> <span t-esc="amount_by_group[1]" t-options='{"widget": "monetary", "display_currency": doc.pricelist_id.currency_id}'/> </td> </t> </tr> </t> - <tr class="border-black"> + <tr class="border-black o_total"> <td><strong>Total</strong></td> <td class="text-right"> <span t-field="doc.amount_total"/> diff --git a/addons/sale/tests/test_sale_to_invoice.py b/addons/sale/tests/test_sale_to_invoice.py index b8ef5b03fa0..1260d090528 100644 --- a/addons/sale/tests/test_sale_to_invoice.py +++ b/addons/sale/tests/test_sale_to_invoice.py @@ -65,7 +65,7 @@ class TestSaleToInvoice(TestCommonSaleNoChart): 'active_model': 'sale.order', 'active_ids': [cls.sale_order.id], 'active_id': cls.sale_order.id, - 'default_journal_id': cls.journal_sale + 'default_journal_id': cls.journal_sale.id, } def test_downpayment(self): diff --git a/addons/sale/views/sale_portal_templates.xml b/addons/sale/views/sale_portal_templates.xml index 4d0b6ad1b32..0e8c7378139 100644 --- a/addons/sale/views/sale_portal_templates.xml +++ b/addons/sale/views/sale_portal_templates.xml @@ -444,7 +444,7 @@ <t t-set="current_subtotal" t-value="current_subtotal + line.price_subtotal" groups="account.group_show_line_subtotals_tax_excluded"/> <t t-set="current_subtotal" t-value="current_subtotal + line.price_total" groups="account.group_show_line_subtotals_tax_included"/> - <tr t-att-class="'bg-200 font-weight-bold' if line.display_type == 'line_section' else 'font-italic' if line.display_type == 'line_note' else ''"> + <tr t-att-class="'bg-200 font-weight-bold o_line_section' if line.display_type == 'line_section' else 'font-italic o_line_note' if line.display_type == 'line_note' else ''"> <t t-if="not line.display_type"> <td id="product_name"><span t-field="line.name"/></td> <td class="text-right"> diff --git a/addons/sale_management/i18n/nb.po b/addons/sale_management/i18n/nb.po index ba5b7b84d5f..c0e0f7e708a 100644 --- a/addons/sale_management/i18n/nb.po +++ b/addons/sale_management/i18n/nb.po @@ -3,15 +3,17 @@ # * sale_management # # Translators: -# Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Martin Trigaux, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:48+0000\n" -"PO-Revision-Date: 2018-10-08 06:48+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:24+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -107,7 +109,7 @@ msgstr "Attributter" #. module: sale_management #: model:ir.model,name:sale_management.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: sale_management #: model_terms:ir.ui.view,arch_db:sale_management.sale_order_template_view_form diff --git a/addons/sale_management/i18n/uk.po b/addons/sale_management/i18n/uk.po index e71dabb9eef..02abbbb81e7 100644 --- a/addons/sale_management/i18n/uk.po +++ b/addons/sale_management/i18n/uk.po @@ -85,7 +85,7 @@ msgstr "" #. module: sale_management #: model_terms:ir.ui.view,arch_db:sale_management.sale_order_form_quote msgid "Add to order lines" -msgstr "Додайте до рядків замовлення" +msgstr "Додати до рядків замовлення" #. module: sale_management #: model:ir.model.fields,field_description:sale_management.field_digest_digest__kpi_all_sale_total @@ -359,7 +359,7 @@ msgstr "" #. module: sale_management #: model:ir.model.fields,field_description:sale_management.field_sale_order_template__number_of_days msgid "Quotation Duration" -msgstr "Термін дії замовлення" +msgstr "Термін дії комерційної пропозиції" #. module: sale_management #: model:ir.model,name:sale_management.model_sale_order_template @@ -368,7 +368,7 @@ msgstr "Термін дії замовлення" #: model_terms:ir.ui.view,arch_db:sale_management.sale_order_template_view_form #: model_terms:ir.ui.view,arch_db:sale_management.sale_order_template_view_tree msgid "Quotation Template" -msgstr "Шаблон пропозиції" +msgstr "Шаблон комерційної пропозиції" #. module: sale_management #: model:ir.model,name:sale_management.model_sale_order_template_line @@ -378,7 +378,7 @@ msgstr "" #. module: sale_management #: model_terms:ir.ui.view,arch_db:sale_management.sale_order_template_view_form msgid "Quotation Template Lines" -msgstr "Шаблон пропозиції" +msgstr "Рядки шаблону комерційної пропозиції" #. module: sale_management #: model:ir.model,name:sale_management.model_sale_order_template_option @@ -389,7 +389,7 @@ msgstr "" #: model:ir.model.fields,field_description:sale_management.field_sale_order_template_line__sale_order_template_id #: model:ir.model.fields,field_description:sale_management.field_sale_order_template_option__sale_order_template_id msgid "Quotation Template Reference" -msgstr "Деталі шаблону пропозиції" +msgstr "Посилання шаблону комерційної пропозиції" #. module: sale_management #: model:ir.actions.act_window,name:sale_management.sale_order_template_action @@ -398,7 +398,7 @@ msgstr "Деталі шаблону пропозиції" #: model_terms:ir.ui.view,arch_db:sale_management.res_config_settings_view_form #: model:res.groups,name:sale_management.group_sale_order_template msgid "Quotation Templates" -msgstr "Шаблони пропозиції" +msgstr "Шаблони комеційної пропозиції" #. module: sale_management #: model_terms:ir.ui.view,arch_db:sale_management.sale_order_template_view_form @@ -437,7 +437,7 @@ msgstr "Опції продажу" #. module: sale_management #: model:ir.model,name:sale_management.model_sale_order msgid "Sale Order" -msgstr "Замовлення" +msgstr "Замовлення на продаж" #. module: sale_management #: model_terms:ir.ui.view,arch_db:sale_management.digest_digest_view_form @@ -447,7 +447,7 @@ msgstr "Продажі" #. module: sale_management #: model:ir.model,name:sale_management.model_sale_order_line msgid "Sales Order Line" -msgstr "Рядок замовлення" +msgstr "Рядок замовлення на продаж" #. module: sale_management #: model:ir.model.fields,field_description:sale_management.field_sale_order_option__order_id @@ -457,7 +457,7 @@ msgstr "Посилання на замовлення на продаж" #. module: sale_management #: model_terms:ir.ui.view,arch_db:sale_management.sale_order_form_quote msgid "Sales Quotation Template Lines" -msgstr "Рядки шаблону пропозиції" +msgstr "Рядки шаблону комерційної пропозиції" #. module: sale_management #: model_terms:ir.ui.view,arch_db:sale_management.sale_order_template_view_search @@ -492,7 +492,7 @@ msgid "" "The Administrator can set default Terms & Conditions in Sales Settings. " "Terms set here will show up instead if you select this quotation template." msgstr "" -"Адміністратор може встановити Терміни та умови за замовчуванням в " +"Адміністратор може встановити терміни та умови за замовчуванням в " "налаштуваннях продажів. Умови, встановлені тут, відображатимуться, якщо ви " "виберете цей шаблон комерційної пропозиції." @@ -516,13 +516,13 @@ msgstr "Ціна одиниці" #. module: sale_management #: model:ir.model.fields,field_description:sale_management.field_sale_order_template_line__product_uom_id msgid "Unit of Measure" -msgstr "Одиниця виміру" +msgstr "Одиниця вимірювання" #. module: sale_management #: model:ir.model.fields,field_description:sale_management.field_sale_order_option__uom_id #: model:ir.model.fields,field_description:sale_management.field_sale_order_template_option__uom_id msgid "Unit of Measure " -msgstr "Одиниця виміру" +msgstr "Одиниця вимірювання" #. module: sale_management #: model_terms:ir.actions.act_window,help:sale_management.sale_order_template_action diff --git a/addons/sale_quotation_builder/i18n/nb.po b/addons/sale_quotation_builder/i18n/nb.po index a5d59f2d350..4e88b4b09e4 100644 --- a/addons/sale_quotation_builder/i18n/nb.po +++ b/addons/sale_quotation_builder/i18n/nb.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:24+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -74,7 +76,7 @@ msgstr "Lukk" #. module: sale_quotation_builder #: model:ir.model,name:sale_quotation_builder.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: sale_quotation_builder #: model_terms:ir.ui.view,arch_db:sale_quotation_builder.sale_order_template_view_form_inherit_sale_quotation_builder diff --git a/addons/sale_stock/i18n/es.po b/addons/sale_stock/i18n/es.po index a4c5f1c0324..614ea1c9b53 100644 --- a/addons/sale_stock/i18n/es.po +++ b/addons/sale_stock/i18n/es.po @@ -5,7 +5,6 @@ # Translators: # e2f <projects@e2f.com>, 2018 # Martin Trigaux, 2018 -# Pedro M. Baeza <pedro.baeza@gmail.com>, 2018 # Mateo Tibaquirá Palacios <nestormateo@gmail.com>, 2018 # Jesús Alan Ramos Rodríguez <alan.ramos@jarsa.com.mx>, 2018 # Carlos Liébana Anero <carlosliebana@gmail.com>, 2018 @@ -16,14 +15,17 @@ # e2f_EPV Translator <e2f_EPV@outlook.com>, 2018 # Cristopher Cravioto <ccr@odoo.com>, 2018 # Mariela Moreno <mam@odoo.com>, 2018 +# Pedro M. Baeza <pedro.baeza@gmail.com>, 2018 # Rick Hunter <rick.hunter.ec@gmail.com>, 2018 +# Pilar Marín <pilar@odooperu.pe>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-24 09:34+0000\n" -"PO-Revision-Date: 2018-10-24 09:34+0000\n" -"Last-Translator: Rick Hunter <rick.hunter.ec@gmail.com>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:25+0000\n" +"Last-Translator: Pilar Marín <pilar@odooperu.pe>, 2018\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -110,6 +112,11 @@ msgid "" " - Timesheet: the quantity is the sum of hours recorded on tasks linked to this sale line\n" " - Stock Moves: the quantity comes from confirmed pickings\n" msgstr "" +"Según la configuración del producto, la cantidad enviada puede ser automaticamente calculada por el mecanismo:\n" +" - Manual: La cantidad es establecida manualmente en linea\n" +" - Analitica de Gastos: La cantidad es la suma de la cantidad de gastos contabilizados\n" +" - Hojas de Horas: La cantidad es la suma de horas realizadas en tareas enlazadas para la linea de venta\n" +" - Movimiento de Stocks: La cantidad proviene de los pickings confirmados\n" #. module: sale_stock #: model:ir.ui.menu,name:sale_stock.menu_aftersale diff --git a/addons/sale_stock/i18n/nb.po b/addons/sale_stock/i18n/nb.po index f49bd1bd367..1a7e7e69e6a 100644 --- a/addons/sale_stock/i18n/nb.po +++ b/addons/sale_stock/i18n/nb.po @@ -6,13 +6,15 @@ # Martin Trigaux, 2018 # Aleksander, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-24 09:34+0000\n" -"PO-Revision-Date: 2018-10-24 09:34+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:25+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -142,7 +144,7 @@ msgstr "" #. module: sale_stock #: model:ir.model,name:sale_stock.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: sale_stock #: selection:sale.order,picking_policy:0 diff --git a/addons/sale_stock/i18n/uk.po b/addons/sale_stock/i18n/uk.po index 659883dc9c1..96ceb1ac3f9 100644 --- a/addons/sale_stock/i18n/uk.po +++ b/addons/sale_stock/i18n/uk.po @@ -228,8 +228,8 @@ msgid "" "the-art transportation practices." msgstr "" "Інкотермс - це набір термінів продажу. Вони служать для визначення розподілу" -" відповідальності та вартості доставки між покупцем і продавцем і уособлюють" -" витвір мистецтва практики перевезень." +" відповідальності та вартості доставки між покупцем і продавцем і для " +"найкращої практики перевезень." #. module: sale_stock #: model:ir.model.fields,help:sale_stock.field_sale_order__incoterm @@ -238,7 +238,7 @@ msgid "" "used in international transactions." msgstr "" "Міжнародні комерційні умови, комплект міжнародних правил з тлумачення " -"найбільш широко використовуваних торгівельних термінів в галузі міжнародної " +"найбільш широко використовуваних торговельних термінів в галузі міжнародної " "торгівлі." #. module: sale_stock @@ -302,7 +302,7 @@ msgid "" "for procurement and delivery that many days earlier than the actual promised" " date, to cope with unexpected delays in the supply chain." msgstr "" -"Межа відхилення для терміну постачання товарів замовникам. Поповнення " +"Маржа відхилення для терміну постачання товарів замовникам. Поповнення " "запасів та дата відвантаження буде запланована на цю кількість днів раніше " "ніж обіцяна дата, щоб впоратися з несподіваними затримками в ланцюгу " "постачань." @@ -369,7 +369,7 @@ msgid "" "every 24 hours." msgstr "" "Бронюючи товари вручну в замовленнях на доставку або керуючи планувальником," -" рекомендується краще керувати пріоритетами у випадку довгого строку " +" рекомендується краще керувати пріоритетами у випадку довгострокового " "обслуговування клієнтів та/або частого вилучення запасів. За замовчуванням, " "планувальник запускається автоматично кожні 24 години." @@ -381,7 +381,7 @@ msgstr "Маршрут" #. module: sale_stock #: model_terms:ir.ui.view,arch_db:sale_stock.res_config_settings_view_form_sale msgid "Routes for Sales Order Lines" -msgstr "Маршрути для рідків замовлення на продаж" +msgstr "Маршрути для рядків замовлення на продаж" #. module: sale_stock #: model:ir.model.fields,field_description:sale_stock.field_stock_move__sale_line_id @@ -392,7 +392,7 @@ msgstr "Рядок продажу" #: model:ir.model,name:sale_stock.model_sale_order #: model:ir.model.fields,field_description:sale_stock.field_procurement_group__sale_id msgid "Sale Order" -msgstr "Замовлення" +msgstr "Замовлення на продаж" #. module: sale_stock #: model_terms:ir.ui.view,arch_db:sale_stock.stock_production_lot_view_form @@ -417,7 +417,7 @@ msgstr "Замовлення на продаж" #. module: sale_stock #: model:ir.model,name:sale_stock.model_sale_order_line msgid "Sales Order Line" -msgstr "Рядок замовлення" +msgstr "Рядок замовлення на продаж" #. module: sale_stock #: model_terms:ir.ui.view,arch_db:sale_stock.stock_location_route_view_form_inherit_sale_stock @@ -462,7 +462,7 @@ msgstr "Завантажте всі товари одразу" #. module: sale_stock #: selection:res.config.settings,default_picking_policy:0 msgid "Ship products as soon as available, with back orders" -msgstr "Якнайшвидша доставка товарів, зі зворотним замовленням" +msgstr "Якнайшвидша доставка товарів, зі зворотнім замовленням" #. module: sale_stock #: model:ir.model.fields,field_description:sale_stock.field_sale_order__picking_policy @@ -483,7 +483,7 @@ msgstr "Складське переміщення " #: model:ir.model.fields,field_description:sale_stock.field_sale_order_line__move_ids #: selection:sale.order.line,qty_delivered_method:0 msgid "Stock Moves" -msgstr "Переміщення запасів" +msgstr "Складські переміщення " #. module: sale_stock #: model:ir.model,name:sale_stock.model_stock_rule @@ -597,7 +597,7 @@ msgstr "від" #. module: sale_stock #: model_terms:ir.ui.view,arch_db:sale_stock.exception_on_so msgid "ordered instead of" -msgstr "Замовлено замість" +msgstr "замовлено замість" #. module: sale_stock #: model_terms:ir.ui.view,arch_db:sale_stock.exception_on_picking diff --git a/addons/sale_stock/security/sale_stock_security.xml b/addons/sale_stock/security/sale_stock_security.xml index 630a6512b2d..c53b98a341d 100644 --- a/addons/sale_stock/security/sale_stock_security.xml +++ b/addons/sale_stock/security/sale_stock_security.xml @@ -10,5 +10,13 @@ <field name="name">Display incoterms on Sales Order and related invoices</field> <field name="category_id" ref="base.module_category_hidden"/> </record> + + <!-- Stock Portal Access Rules --> + <record id="stock_picking_rule_portal" model="ir.rule"> + <field name="name">Portal Follower Pickings</field> + <field name="model_id" ref="stock.model_stock_picking"/> + <field name="domain_force">['|', '|', ('message_partner_ids', 'in', [user.partner_id.id]), ('partner_id', '=', user.partner_id.id), ('sale_id.partner_id', '=', user.partner_id.id)]</field> + <field name="groups" eval="[(4, ref('base.group_portal'))]"/> + </record> </data> </odoo> diff --git a/addons/sale_timesheet/i18n/es.po b/addons/sale_timesheet/i18n/es.po index 7110e089f77..01910dd3891 100644 --- a/addons/sale_timesheet/i18n/es.po +++ b/addons/sale_timesheet/i18n/es.po @@ -4,7 +4,6 @@ # # Translators: # e2f <projects@e2f.com>, 2018 -# Martin Trigaux, 2018 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2018 # Lina Maria Avendaño Carvajal <lina8823@gmail.com>, 2018 # Luis M. Ontalba <luis.martinez@tecnativa.com>, 2018 @@ -12,15 +11,18 @@ # Antonio Trueba, 2018 # Gelo Joga Landoo <gj@landoo.es>, 2018 # e2f_EPV Translator <e2f_EPV@outlook.com>, 2018 +# Martin Trigaux, 2018 # Alejandro Die Sanchis <marketing@domatix.com>, 2018 # RGB Consulting <odoo@rgbconsulting.com>, 2018 +# Pilar Marín <pilar@odooperu.pe>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" -"PO-Revision-Date: 2018-10-08 06:49+0000\n" -"Last-Translator: RGB Consulting <odoo@rgbconsulting.com>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:25+0000\n" +"Last-Translator: Pilar Marín <pilar@odooperu.pe>, 2018\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -91,6 +93,11 @@ msgid "" " - Timesheet: the quantity is the sum of hours recorded on tasks linked to this sale line\n" " - Stock Moves: the quantity comes from confirmed pickings\n" msgstr "" +"Según la configuración del producto, la cantidad enviada puede ser automaticamente calculada por el mecanismo:\n" +" - Manual: La cantidad es establecida manualmente en linea\n" +" - Analitica de Gastos: La cantidad es la suma de la cantidad de gastos contabilizados\n" +" - Hojas de Horas: La cantidad es la suma de horas realizadas en tareas enlazadas para la linea de venta\n" +" - Movimiento de Stocks: La cantidad proviene de los pickings confirmados\n" #. module: sale_timesheet #: model:ir.model.fields,field_description:sale_timesheet.field_project_create_invoice__amount_to_invoice diff --git a/addons/sale_timesheet/i18n/uk.po b/addons/sale_timesheet/i18n/uk.po index 807c1c8e666..2c00991c242 100644 --- a/addons/sale_timesheet/i18n/uk.po +++ b/addons/sale_timesheet/i18n/uk.po @@ -5,15 +5,16 @@ # Translators: # Martin Trigaux, 2018 # Bohdan Lisnenko, 2018 -# Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018 # ТАрас <tratatuta@i.ua>, 2018 +# Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" -"PO-Revision-Date: 2018-10-08 06:49+0000\n" -"Last-Translator: ТАрас <tratatuta@i.ua>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:25+0000\n" +"Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n" "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -428,7 +429,7 @@ msgstr "Групувати за" #: model:product.template,uom_name:sale_timesheet.product_service_deliver_timesheet_2_product_template #: model:product.template,uom_name:sale_timesheet.product_service_order_timesheet_product_template msgid "Hour(s)" -msgstr "Година (и)" +msgstr "Година(и)" #. module: sale_timesheet #: model_terms:ir.ui.view,arch_db:sale_timesheet.timesheet_plan @@ -556,7 +557,7 @@ msgid "" "Create a task and track hours: Create a task on the sales order validation and track the work hours." msgstr "" "Вручну встановлювати величини на замовлення: рахунок-фактура на основі введеної вручну кількості, без створення аналітичного обліку.\n" -"Табкль на контракті: рахунок-фактура на основі годин, що відстежуються, у відповідному табелі.\n" +"Табель на контракті: рахунок-фактура на основі годин, що відстежуються, у відповідному табелі.\n" "Створення завдання та відстеження годин: створіть завдання з перевірки замовлення на продаж та відстежуйте години роботи." #. module: sale_timesheet @@ -614,12 +615,12 @@ msgstr "Не знайдено жодного завдання" #. module: sale_timesheet #: selection:account.analytic.line,timesheet_invoice_type:0 msgid "Non Billable" -msgstr "Не оплачуваний" +msgstr "Неоплачуваний" #. module: sale_timesheet #: model_terms:ir.ui.view,arch_db:sale_timesheet.timesheet_view_search msgid "Non Billable Hours" -msgstr "Не оплачувані години" +msgstr "Неоплачувані години" #. module: sale_timesheet #. openerp-web @@ -631,7 +632,7 @@ msgstr "" #. module: sale_timesheet #: model_terms:ir.ui.view,arch_db:sale_timesheet.timesheet_plan msgid "Non billable" -msgstr "Не оплачуваний" +msgstr "Неоплачуваний" #. module: sale_timesheet #: model:project.task,legend_blocked:sale_timesheet.project_task_internal @@ -835,7 +836,7 @@ msgstr "" #. module: sale_timesheet #: model:ir.model.fields,field_description:sale_timesheet.field_project_profitability_report__sale_line_id msgid "Sale Order Line" -msgstr "Рядок заявки на продаж" +msgstr "Рядок замовлення на продаж" #. module: sale_timesheet #: model:ir.model.fields,field_description:sale_timesheet.field_project_project__sale_line_employee_ids @@ -879,7 +880,7 @@ msgstr "Елемент замовлення на продаж" #. module: sale_timesheet #: model:ir.model,name:sale_timesheet.model_sale_order_line msgid "Sales Order Line" -msgstr "Рядок замовлення" +msgstr "Рядок замовлення на продаж" #. module: sale_timesheet #: model:ir.model.fields,help:sale_timesheet.field_sale_order_line__is_service @@ -946,7 +947,7 @@ msgstr "" #: model:ir.model.fields,field_description:sale_timesheet.field_project_create_sale_order__product_id #: model:ir.model.fields,field_description:sale_timesheet.field_project_create_sale_order_line__product_id msgid "Service" -msgstr "Сервіс" +msgstr "Послуга" #. module: sale_timesheet #: model:ir.model.fields,field_description:sale_timesheet.field_product_template__service_policy @@ -1149,7 +1150,7 @@ msgstr "" #. module: sale_timesheet #: model:ir.model.fields,field_description:sale_timesheet.field_sale_order__timesheet_count msgid "Timesheet activities" -msgstr "Дї по табелю" +msgstr "Дії по табелю" #. module: sale_timesheet #: model:ir.model.fields,field_description:sale_timesheet.field_sale_order__timesheet_ids @@ -1193,7 +1194,7 @@ msgstr "Табелі на завданнях" #. module: sale_timesheet #: model_terms:ir.ui.view,arch_db:sale_timesheet.timesheet_plan msgid "To invoice" -msgstr "На виписку" +msgstr "Виставити рахунок" #. module: sale_timesheet #: model:ir.model.fields,help:sale_timesheet.field_project_create_invoice__amount_to_invoice @@ -1205,7 +1206,7 @@ msgstr "" #. module: sale_timesheet #: model:ir.model.fields,field_description:sale_timesheet.field_product_template__service_type msgid "Track Service" -msgstr "Відслідковування послуг" +msgstr "Відслідковувати послугу" #. module: sale_timesheet #: model:ir.model.fields,field_description:sale_timesheet.field_project_create_sale_order__price_unit @@ -1224,7 +1225,7 @@ msgstr "" #: model:product.product,uom_name:sale_timesheet.product_service_deliver_manual #: model:product.template,uom_name:sale_timesheet.product_service_deliver_manual_product_template msgid "Unit(s)" -msgstr "шт" +msgstr "Штука(и)" #. module: sale_timesheet #: model:ir.model.fields,field_description:sale_timesheet.field_project_profitability_report__amount_untaxed_invoiced diff --git a/addons/sales_team/i18n/cs.po b/addons/sales_team/i18n/cs.po index c04778965ac..242d1efcd30 100644 --- a/addons/sales_team/i18n/cs.po +++ b/addons/sales_team/i18n/cs.po @@ -67,7 +67,7 @@ msgstr "Archivováno" #. module: sales_team #: model:ir.model.fields,field_description:sales_team.field_crm_team__message_attachment_count msgid "Attachment Count" -msgstr "" +msgstr "Počet příloh" #. module: sales_team #: model_terms:ir.ui.view,arch_db:sales_team.crm_team_view_form diff --git a/addons/sales_team/i18n/uk.po b/addons/sales_team/i18n/uk.po index ff7f90eaf9b..8ae6458171c 100644 --- a/addons/sales_team/i18n/uk.po +++ b/addons/sales_team/i18n/uk.po @@ -40,7 +40,7 @@ msgstr "<span>Перегляд</span>" #. module: sales_team #: model:ir.model.fields,field_description:sales_team.field_crm_team__message_needaction msgid "Action Needed" -msgstr "Дія необхідна" +msgstr "Необхідна дія" #. module: sales_team #: model:ir.model.fields,field_description:sales_team.field_crm_team__active @@ -75,7 +75,7 @@ msgstr "Аватар" #. module: sales_team #: selection:crm.team,dashboard_graph_type:0 msgid "Bar" -msgstr "Бар" +msgstr "Гістограма" #. module: sales_team #: code:addons/sales_team/models/crm_team.py:274 @@ -551,7 +551,7 @@ msgstr "Веб-сайт" #. module: sales_team #: model:ir.model.fields,field_description:sales_team.field_crm_team__website_message_ids msgid "Website Messages" -msgstr "Повідомлення з вебсайту" +msgstr "Повідомлення з веб-сайту" #. module: sales_team #: model:ir.model.fields,help:sales_team.field_crm_team__website_message_ids diff --git a/addons/sms/i18n/uk.po b/addons/sms/i18n/uk.po index 62aa26f5a7e..d996581bef8 100644 --- a/addons/sms/i18n/uk.po +++ b/addons/sms/i18n/uk.po @@ -5,12 +5,13 @@ # Translators: # Martin Trigaux, 2018 # Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" +"PO-Revision-Date: 2018-08-24 09:25+0000\n" "Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n" "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n" "MIME-Version: 1.0\n" @@ -24,7 +25,7 @@ msgstr "" #: code:addons/sms/static/src/js/sms_widget.js:93 #, python-format msgid "%s chars, fits in %s SMS (%s) " -msgstr "" +msgstr "%s символи, підходить %s SMS (%s) " #. module: sms #: model_terms:ir.ui.view,arch_db:sms.send_sms_view_form @@ -55,7 +56,7 @@ msgstr "Назва для відображення" #. module: sms #: model:ir.model,name:sms.model_mail_thread msgid "Email Thread" -msgstr "Ланцюжки повідомлень" +msgstr "Тема електронного листа" #. module: sms #: model:ir.model.fields,field_description:sms.field_sms_api__id @@ -112,14 +113,14 @@ msgstr "Отримувачі" #. module: sms #: model:ir.model,name:sms.model_sms_api msgid "SMS API" -msgstr "" +msgstr "SMS API" #. module: sms #. openerp-web #: code:addons/sms/static/src/xml/sms_widget.xml:4 #, python-format msgid "SMS Pricing" -msgstr "" +msgstr "Ціна SMS" #. module: sms #: code:addons/sms/models/mail_thread.py:48 diff --git a/addons/snailmail/i18n/nb.po b/addons/snailmail/i18n/nb.po index 11fba56e33f..2ba99ef315a 100644 --- a/addons/snailmail/i18n/nb.po +++ b/addons/snailmail/i18n/nb.po @@ -5,6 +5,7 @@ # Translators: # Jorunn D. Newth, 2018 # Martin Trigaux, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 # msgid "" msgstr "" @@ -12,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-30 12:25+0000\n" "PO-Revision-Date: 2018-08-24 09:25+0000\n" -"Last-Translator: Martin Trigaux, 2018\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -86,7 +87,7 @@ msgstr "Firma" #. module: snailmail #: model:ir.model,name:snailmail.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: snailmail #: model:ir.model,name:snailmail.model_res_partner @@ -200,7 +201,7 @@ msgstr "" #. module: snailmail #: model:ir.model,name:snailmail.model_ir_qweb_field_contact msgid "Qweb Field Contact" -msgstr "" +msgstr "Qweb-felt Kontakt" #. module: snailmail #: model:ir.model.fields,field_description:snailmail.field_snailmail_letter__partner_id diff --git a/addons/snailmail/i18n/uk.po b/addons/snailmail/i18n/uk.po index 512d139d2c3..5bf63234282 100644 --- a/addons/snailmail/i18n/uk.po +++ b/addons/snailmail/i18n/uk.po @@ -35,7 +35,7 @@ msgstr "" #. module: snailmail #: model:ir.model.fields,field_description:snailmail.field_snailmail_letter__attachment_id msgid "Attachment" -msgstr "Вкладення" +msgstr "Прикріплення" #. module: snailmail #: model:ir.model.fields,field_description:snailmail.field_snailmail_letter__duplex @@ -195,7 +195,7 @@ msgstr "" #. module: snailmail #: model:ir.model.fields,field_description:snailmail.field_res_config_settings__snailmail_color msgid "Print In Color" -msgstr "" +msgstr "Друкувати в кольорі" #. module: snailmail #: model:ir.model,name:snailmail.model_ir_qweb_field_contact diff --git a/addons/snailmail_account/i18n/nb.po b/addons/snailmail_account/i18n/nb.po index 5255305f736..fc1cf9e716a 100644 --- a/addons/snailmail_account/i18n/nb.po +++ b/addons/snailmail_account/i18n/nb.po @@ -5,6 +5,7 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 # msgid "" msgstr "" @@ -12,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-11-05 09:29+0000\n" "PO-Revision-Date: 2018-08-24 09:25+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -45,7 +46,7 @@ msgstr "Firmaer" #. module: snailmail_account #: model:ir.model,name:snailmail_account.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: snailmail_account #: model:ir.model.fields,field_description:snailmail_account.field_account_invoice_send__currency_id diff --git a/addons/snailmail_account/i18n/uk.po b/addons/snailmail_account/i18n/uk.po index 9fda87234e9..3c2bc10efe0 100644 --- a/addons/snailmail_account/i18n/uk.po +++ b/addons/snailmail_account/i18n/uk.po @@ -23,19 +23,19 @@ msgstr "" #. module: snailmail_account #: model_terms:ir.ui.view,arch_db:snailmail_account.account_invoice_send_inherit_account_wizard_form msgid "<span> to: </span>" -msgstr "" +msgstr "<span> до: </span>" #. module: snailmail_account #: model:ir.model,name:snailmail_account.model_account_invoice_send msgid "Account Invoice Send" -msgstr "" +msgstr "Рахунок-фактуру надіслано" #. module: snailmail_account #: model:ir.model.fields,help:snailmail_account.field_account_invoice_send__snailmail_is_letter msgid "" "Allows to send the document by snail mail (coventional posting delivery " "service)" -msgstr "" +msgstr "Дозволяє надіслати документ поштою (звичайна поштова служба доставки)" #. module: snailmail_account #: model:ir.model,name:snailmail_account.model_res_company @@ -65,17 +65,17 @@ msgstr "Партнер" #. module: snailmail_account #: model_terms:ir.ui.view,arch_db:snailmail_account.res_config_settings_view_form msgid "Print In Color" -msgstr "" +msgstr "Друкувати в кольорі" #. module: snailmail_account #: model_terms:ir.ui.view,arch_db:snailmail_account.res_config_settings_view_form msgid "Print on Both Sides" -msgstr "" +msgstr "Друкувати з двох сторін" #. module: snailmail_account #: model:ir.model.fields,field_description:snailmail_account.field_res_company__invoice_is_snailmail msgid "Send by Letter by default" -msgstr "" +msgstr "Надіслати листом за замовчуванням" #. module: snailmail_account #: model:ir.model.fields,field_description:snailmail_account.field_account_invoice_send__snailmail_is_letter @@ -86,4 +86,4 @@ msgstr "Надіслати поштою" #. module: snailmail_account #: model:ir.model.fields,field_description:snailmail_account.field_account_invoice_send__snailmail_cost msgid "Stamp(s)" -msgstr "" +msgstr "Штамп(и)" diff --git a/addons/stock/i18n/cs.po b/addons/stock/i18n/cs.po index 0a674184759..3cde36e15c1 100644 --- a/addons/stock/i18n/cs.po +++ b/addons/stock/i18n/cs.po @@ -11,7 +11,7 @@ # Michal Veselý <michal@veselyberanek.net>, 2018 # Ladislav Tomm <tomm@helemik.cz>, 2018 # Martin Trigaux, 2018 -# J. Podhorecky <j.podhorecky@volny.cz>, 2018 +# trendspotter <j.podhorecky@volny.cz>, 2018 # msgid "" msgstr "" @@ -19,7 +19,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-24 09:34+0000\n" "PO-Revision-Date: 2018-08-24 09:25+0000\n" -"Last-Translator: J. Podhorecky <j.podhorecky@volny.cz>, 2018\n" +"Last-Translator: trendspotter <j.podhorecky@volny.cz>, 2018\n" "Language-Team: Czech (https://www.transifex.com/odoo/teams/41243/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -598,7 +598,7 @@ msgstr "Ke konkrétnímu datu" #: model:ir.model.fields,field_description:stock.field_stock_picking__message_attachment_count #: model:ir.model.fields,field_description:stock.field_stock_production_lot__message_attachment_count msgid "Attachment Count" -msgstr "" +msgstr "Počet příloh" #. module: stock #: model:ir.ui.menu,name:stock.menu_variants_action diff --git a/addons/stock/i18n/is.po b/addons/stock/i18n/is.po index a24658a3702..3816384ca1b 100644 --- a/addons/stock/i18n/is.po +++ b/addons/stock/i18n/is.po @@ -6158,7 +6158,7 @@ msgstr "Urgent" #: model:ir.model.fields,field_description:stock.field_stock_move_line__picking_type_use_existing_lots #: model:ir.model.fields,field_description:stock.field_stock_picking_type__use_existing_lots msgid "Use Existing Lots/Serial Numbers" -msgstr "" +msgstr "Nota tilbúin lotu/raðnúmer" #. module: stock #: model_terms:ir.ui.view,arch_db:stock.view_product_replenish diff --git a/addons/stock/i18n/nb.po b/addons/stock/i18n/nb.po index 83216fbb563..72d17aae71d 100644 --- a/addons/stock/i18n/nb.po +++ b/addons/stock/i18n/nb.po @@ -3,17 +3,18 @@ # * stock # # Translators: -# Martin Trigaux, 2018 +# Mari Løken <inactive+mari123@transifex.com>, 2018 # Jorunn D. Newth, 2018 +# Martin Trigaux, 2018 # Marius Stedjan <marius@stedjan.com>, 2018 -# Mari Løken <inactive+mari123@transifex.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-24 09:34+0000\n" -"PO-Revision-Date: 2018-10-24 09:34+0000\n" -"Last-Translator: Mari Løken <inactive+mari123@transifex.com>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:25+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -970,7 +971,7 @@ msgstr "Vilkår" #. module: stock #: model:ir.model,name:stock.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: stock #: model:ir.ui.menu,name:stock.menu_stock_config_settings @@ -2432,7 +2433,7 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:stock.res_config_settings_view_form #: model_terms:ir.ui.view,arch_db:stock.view_stock_quant_pivot msgid "Inventory" -msgstr "Lagerbeholdning" +msgstr "Inventar" #. module: stock #: model_terms:ir.ui.view,arch_db:stock.view_inventory_form @@ -3788,7 +3789,7 @@ msgstr "Hovedlokasjon" #. module: stock #: model:ir.model.fields,field_description:stock.field_stock_location__parent_path msgid "Parent Path" -msgstr "" +msgstr "Overordnet sti" #. module: stock #: selection:procurement.group,move_type:0 diff --git a/addons/stock/i18n/nl.po b/addons/stock/i18n/nl.po index 1324d084c34..e95b3eeb418 100644 --- a/addons/stock/i18n/nl.po +++ b/addons/stock/i18n/nl.po @@ -1325,7 +1325,7 @@ msgstr "Aanmaakdatum, normaliter de datum van de order" #. module: stock #: selection:barcode.rule,type:0 msgid "Credit Card" -msgstr "Credit Card" +msgstr "Creditcard" #. module: stock #: code:addons/stock/models/stock_warehouse.py:525 diff --git a/addons/stock/i18n/uk.po b/addons/stock/i18n/uk.po index 157d486e5c2..9b24e2715ae 100644 --- a/addons/stock/i18n/uk.po +++ b/addons/stock/i18n/uk.po @@ -33,7 +33,7 @@ msgid "" msgstr "" "\n" "\n" -"%s --> Товар UoM є %s (%s) - Переміщення UoM є %s (%s)" +"%s --> Одиниця вимірювання товару є %s (%s) - Переміщення одиниці вимірювання є %s (%s)" #. module: stock #: code:addons/stock/models/stock_move.py:342 @@ -548,7 +548,7 @@ msgstr "" #. module: stock #: model_terms:ir.ui.view,arch_db:stock.view_stock_rule_form msgid "Applicability" -msgstr "застосовність" +msgstr "Застосовність" #. module: stock #: model_terms:ir.ui.view,arch_db:stock.stock_location_route_form_view @@ -717,17 +717,17 @@ msgstr "Штрих-код" #. module: stock #: model:ir.ui.menu,name:stock.menu_wms_barcode_nomenclature_all msgid "Barcode Nomenclatures" -msgstr "Номенклатура штрихкодів" +msgstr "Номенклатура штрих-кодів" #. module: stock #: model:ir.model,name:stock.model_barcode_rule msgid "Barcode Rule" -msgstr "Правило штрихкоду" +msgstr "Правило штрих-коду" #. module: stock #: model:ir.model.fields,field_description:stock.field_res_config_settings__module_stock_barcode msgid "Barcode Scanner" -msgstr "Сканер штрихкодів" +msgstr "Сканер штрих-кодів" #. module: stock #: model:ir.model.fields,field_description:stock.field_res_config_settings__module_stock_picking_batch @@ -752,12 +752,12 @@ msgstr "Придбати" #. module: stock #: selection:product.template,tracking:0 msgid "By Lots" -msgstr "По партіях" +msgstr "За партіями" #. module: stock #: selection:product.template,tracking:0 msgid "By Unique Serial Number" -msgstr "По унікальному серійному номеру" +msgstr "За унікальним серійним номером" #. module: stock #: code:addons/stock/models/stock_move.py:644 @@ -778,11 +778,12 @@ msgid "" "current stock) to gather products. If we want to chain moves and have this " "one to wait for the previous, this second option should be chosen." msgstr "" -"Зазвичай система бере з запасів початкового розташування та пасивно чекає їх" -" наявності. Іншим способом можна напряму створити замовлення на забезпечення" -" для початкового розташування (ігноруючи поточну наявність запасів) щоб " -"забрати товари. Якщо ми хочемо щоб переміщення відбувались по ланцюжку і щоб" -" це переміщення чекало на попереднє, то потрібно обрати другий спосіб." +"Зазвичай система бере із запасів початкового розташування та пасивно чекає " +"їх наявності. Іншим способом можна напряму створити замовлення на " +"забезпечення для початкового розташування (ігноруючи поточну наявність " +"запасів) щоб забрати товари. Якщо ми хочемо щоб переміщення відбувались по " +"ланцюжку і щоб це переміщення чекало на попереднє, то потрібно обрати другий" +" спосіб." #. module: stock #: model:ir.model.fields,help:stock.field_stock_location__active @@ -906,8 +907,8 @@ msgstr "Перевірте наявність операції пакуванн #: model:ir.model.fields,help:stock.field_stock_location__return_location msgid "Check this box to allow using this location as a return location." msgstr "" -"Позначте цей прапорець, щоб дозволити використовувати це місцеположення як " -"місце повернення." +"Позначте цей прапорець, щоб дозволити використовувати це місцезнаходження як" +" місцезнаходження повернення." #. module: stock #: model:ir.model.fields,help:stock.field_stock_location__scrap_location @@ -1309,12 +1310,12 @@ msgstr "Кредитна карта" #: code:addons/stock/models/stock_warehouse.py:525 #, python-format msgid "Cross-Dock" -msgstr "Борт-до-борту" +msgstr "Крос-докінг:" #. module: stock #: model:ir.model.fields,field_description:stock.field_stock_warehouse__crossdock_route_id msgid "Crossdock Route" -msgstr "Маршрут борт-до-борту" +msgstr "Маршрут крос-докінгу" #. module: stock #: model:ir.model.fields,field_description:stock.field_report_stock_forecast__cumulative_quantity @@ -1344,7 +1345,7 @@ msgstr "" "Поточна кількість товару.\n" "В контексті розташування запасів буде включено запаси по цьому розташуванню та по всіх підпорядкованих розташуваннях.\n" "В контексті складу, буде включено запаси на всіх розташуваннях запасів цього складу та на всіх підпорядкованих до нього.\n" -"В інших випадках буде по казано запаси по всіх складах з типом 'Внутрішній'." +"В інших випадках включені товари складуються на будь-якому місцехнаходженні складу з типом 'Внутрішній'." #. module: stock #: code:addons/stock/models/stock_picking.py:109 @@ -1356,7 +1357,7 @@ msgstr "Клієнт" #. module: stock #: model:ir.model.fields,field_description:stock.field_product_template__sale_delay msgid "Customer Lead Time" -msgstr "Термін поставки" +msgstr "Час виконання клієнтом" #. module: stock #: model:ir.model.fields,field_description:stock.field_res_partner__property_stock_customer @@ -1472,8 +1473,8 @@ msgstr "Маршрут для видачі за замовчуванням" #: model:ir.model.fields,help:stock.field_stock_warehouse_orderpoint__product_uom msgid "Default unit of measure used for all stock operations." msgstr "" -"Стандартна одиниця вимірювання, що використовується для всіх операцій з " -"акціями." +"Стандартна одиниця вимірювання, що використовується для всіх складських " +"операцій." #. module: stock #: selection:stock.move,procure_method:0 @@ -2561,7 +2562,7 @@ msgstr "Корегування залишків" #: model:ir.ui.menu,name:stock.menu_action_inventory_form #: model_terms:ir.ui.view,arch_db:stock.view_inventory_form msgid "Inventory Adjustments" -msgstr "Корегування залишків" +msgstr "Коригування залишків" #. module: stock #: model:ir.model.fields,field_description:stock.field_stock_inventory__date diff --git a/addons/stock/i18n/zh_CN.po b/addons/stock/i18n/zh_CN.po index 3902f036b1a..d529b2af632 100644 --- a/addons/stock/i18n/zh_CN.po +++ b/addons/stock/i18n/zh_CN.po @@ -4302,7 +4302,7 @@ msgstr "补货组的传播" #. module: stock #: selection:stock.rule,action:0 msgid "Pull & Push" -msgstr "推拉" +msgstr "拉并推" #. module: stock #: selection:stock.rule,action:0 diff --git a/addons/stock/models/stock_inventory.py b/addons/stock/models/stock_inventory.py index 6c635e8b0f5..b0416c1a2ae 100644 --- a/addons/stock/models/stock_inventory.py +++ b/addons/stock/models/stock_inventory.py @@ -331,8 +331,7 @@ class InventoryLine(models.Model): index=True, required=True) product_uom_id = fields.Many2one( 'uom.uom', 'Product Unit of Measure', - required=True, - default=lambda self: self.env.ref('uom.product_uom_unit', raise_if_not_found=True)) + required=True) product_uom_category_id = fields.Many2one(string='Uom category', related='product_uom_id.category_id', readonly=True) product_qty = fields.Float( 'Checked Quantity', diff --git a/addons/stock/models/stock_picking.py b/addons/stock/models/stock_picking.py index c9b30ae0c89..0c45da2985a 100644 --- a/addons/stock/models/stock_picking.py +++ b/addons/stock/models/stock_picking.py @@ -908,6 +908,8 @@ class Picking(models.Model): documents = {} for (parent, responsible), moves in grouped_moves: + if not parent: + continue moves = list(moves) moves = self.env[moves[0]._name].concat(*moves) # Get the note @@ -982,8 +984,12 @@ class Picking(models.Model): return self.env.ref('stock.exception_on_picking').render(values=values) documents = self._log_activity_get_documents(moves, 'move_dest_ids', 'DOWN', _keys_in_sorted, _keys_in_groupby) + documents = self._less_quantities_than_expected_add_documents(moves, documents) self._log_activity(_render_note_exception_quantity, documents) + def _less_quantities_than_expected_add_documents(self, moves, documents): + return documents + def _get_impacted_pickings(self, moves): """ This function is used in _log_less_quantities_than_expected the purpose is to notify a user with all the pickings that are diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml index 55b02efc58f..e33e665842a 100644 --- a/addons/stock/security/stock_security.xml +++ b/addons/stock/security/stock_security.xml @@ -139,14 +139,6 @@ <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field> </record> - <!-- Stock Portal Access Rules --> - <record id="stock_picking_rule_portal" model="ir.rule"> - <field name="name">Portal Follower Pickings</field> - <field name="model_id" ref="stock.model_stock_picking"/> - <field name="domain_force">['|', '|', ('message_partner_ids', 'in', [user.partner_id.id]), ('partner_id.id', '=', user.partner_id.id), ('sale_id.partner_id.id', '=', user.partner_id.id)]</field> - <field name="groups" eval="[(4, ref('base.group_portal'))]"/> - </record> - <record model="ir.rule" id="stock_location_route_comp_rule"> <field name="name">stock_location_route multi-company</field> <field name="model_id" ref="model_stock_location_route"/> diff --git a/addons/stock/wizard/stock_backorder_confirmation.py b/addons/stock/wizard/stock_backorder_confirmation.py index 8b0b70ccea3..31e7a6ca963 100644 --- a/addons/stock/wizard/stock_backorder_confirmation.py +++ b/addons/stock/wizard/stock_backorder_confirmation.py @@ -17,7 +17,7 @@ class StockBackorderConfirmation(models.TransientModel): for pick_id in self.pick_ids: moves_to_log = {} for move in pick_id.move_lines: - if float_compare(move.product_uom_qty, move.quantity_done, move.product_uom.rounding) > 0: + if float_compare(move.product_uom_qty, move.quantity_done, precision_rounding=move.product_uom.rounding) > 0: moves_to_log[move] = (move.quantity_done, move.product_uom_qty) pick_id._log_less_quantities_than_expected(moves_to_log) self.pick_ids.with_context({'cancel_backorder': cancel_backorder}).action_done() diff --git a/addons/stock_account/i18n/nb.po b/addons/stock_account/i18n/nb.po index f5a774078f1..0dfd94e8b05 100644 --- a/addons/stock_account/i18n/nb.po +++ b/addons/stock_account/i18n/nb.po @@ -3,16 +3,18 @@ # * stock_account # # Translators: -# Martin Trigaux, 2018 # Torvald Baade Bringsvor <bringsvor@bringsvor.com>, 2018 # Jorunn D. Newth, 2018 +# Martin Trigaux, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:25+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -142,7 +144,7 @@ msgstr "Velg dato" #. module: stock_account #: model:ir.model,name:stock_account.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: stock_account #: code:addons/stock_account/models/stock.py:587 diff --git a/addons/stock_account/i18n/uk.po b/addons/stock_account/i18n/uk.po index 33d879d8380..70075d095db 100644 --- a/addons/stock_account/i18n/uk.po +++ b/addons/stock_account/i18n/uk.po @@ -41,7 +41,7 @@ msgstr "Бухгалтерське проведення" #. module: stock_account #: model_terms:ir.ui.view,arch_db:stock_account.view_category_property_form msgid "Account Stock Properties" -msgstr "Властивості рахунків" +msgstr "Властивості рахунку обліку записів" #. module: stock_account #: model:ir.model.fields,field_description:stock_account.field_stock_inventory__accounting_date @@ -56,7 +56,7 @@ msgstr "Бухгалтерські записи" #. module: stock_account #: model_terms:ir.ui.view,arch_db:stock_account.view_location_form_inherit msgid "Accounting Information" -msgstr "Інформація для обліку" +msgstr "Інформація бухобліку" #. module: stock_account #: model:ir.model.fields,help:stock_account.field_res_config_settings__module_stock_landed_costs @@ -101,7 +101,8 @@ msgid "" " the product category, or on the location, before processing this operation." msgstr "" "Не вдається знайти вхідний рахунок складу для товару %s. Перш ніж обробляти " -"цю операцію, ви повинні визначити її у категорії товару чи на місці." +"цю операцію, ви повинні визначити її у категорії товару чи на " +"місцезнаходженні." #. module: stock_account #: code:addons/stock_account/models/stock.py:512 @@ -112,7 +113,8 @@ msgid "" "operation." msgstr "" "Не вдається знайти вихідний рахунок складу для товару %s. Перш ніж обробляти" -" цю операцію, ви повинні визначити її у категорії товару чи на місці." +" цю операцію, ви повинні визначити її у категорії товару чи на " +"місцезнаходженні." #. module: stock_account #: model_terms:ir.ui.view,arch_db:stock_account.view_inventory_valuation_search @@ -138,8 +140,8 @@ msgid "" "Changing your cost method is an important change that will impact your " "inventory valuation. Are you sure you want to make that change?" msgstr "" -"Зміна методу витрат - це важлива зміна, яка вплине на оцінку вашої " -"інвентаризації. Ви впевнені, що хочете внести ці зміни?" +"Зміна методу витрат - це важлива зміна, яка вплине на оцінку запасів. Ви " +"впевнені, що хочете внести ці зміни?" #. module: stock_account #: model_terms:ir.ui.view,arch_db:stock_account.view_stock_quantity_history @@ -243,8 +245,8 @@ msgid "" "If cost price is increased, stock variation account will be debited and stock output account will be credited with the value = (difference of amount * quantity available).\n" "If cost price is decreased, stock variation account will be creadited and stock input account will be debited." msgstr "" -"Якщо собівартість буде збільшена, обліковий запис варіації акцій буде дебетовано, а вихідний рахунок складу акцій буде зараховуватися з величиною = (різниця суми * доступна кількість).\n" -"Якщо собівартість знизиться, буде створений рахунок варіації запасів, а вхідний рахунок складу буде дебетовано." +"Якщо собівартість буде збільшена, варіації рахунку обліку запасів буде дебетовано, а вихідний рахунок обліку запасів буде зараховуватися з величиною = (різниця суми * доступна кількість).\n" +"Якщо собівартість знизиться, буде створена варіацію рахунка обліку запасів, а вхідний рахунок буде дебетовано." #. module: stock_account #: model_terms:ir.actions.act_window,help:stock_account.product_valuation_action @@ -254,7 +256,7 @@ msgstr "Якщо є товари, ви побачите його назву та #. module: stock_account #: model_terms:ir.ui.view,arch_db:stock_account.res_config_settings_view_form msgid "Include landed costs in product cost" -msgstr "Включіть витрати на землю у вартість товару" +msgstr "Включіть додаткові витрати у вартість товару" #. module: stock_account #: model:ir.model,name:stock_account.model_stock_inventory @@ -264,7 +266,7 @@ msgstr "Склад" #. module: stock_account #: model:ir.model,name:stock_account.model_stock_location msgid "Inventory Locations" -msgstr "Розташування складів" +msgstr "Місцерозташування запасів" #. module: stock_account #: code:addons/stock_account/wizard/stock_quantity_history.py:25 @@ -400,7 +402,7 @@ msgstr "Кількість" #. module: stock_account #: model_terms:ir.ui.view,arch_db:stock_account.view_move_tree_valuation_at_date msgid "Reference" -msgstr "Референс" +msgstr "Посилання" #. module: stock_account #: model:ir.model.fields,field_description:stock_account.field_stock_move__remaining_qty @@ -551,7 +553,7 @@ msgid "" "transit location." msgstr "" "Рядки переміщення не є узгодженими станами: вони роблять взаємодію в один " -"крок, поки вони повинні пройти через міжвідомче місце транзиту." +"крок, поки вони повинні пройти через місце транзиту в середині компанії." #. module: stock_account #: code:addons/stock_account/models/stock.py:367 @@ -582,7 +584,7 @@ msgstr "" #. module: stock_account #: model_terms:ir.ui.view,arch_db:stock_account.view_move_tree_valuation_at_date msgid "Unit of Measure" -msgstr "Одиниця виміру" +msgstr "Одиниця вимірювання" #. module: stock_account #: model_terms:ir.ui.view,arch_db:stock_account.product_variant_easy_edit_view_inherit diff --git a/addons/stock_landed_costs/i18n/cs.po b/addons/stock_landed_costs/i18n/cs.po index 9d2318d93d7..ca3a4f1ef01 100644 --- a/addons/stock_landed_costs/i18n/cs.po +++ b/addons/stock_landed_costs/i18n/cs.po @@ -8,14 +8,15 @@ # Jakub Lohnisky <jakub@lepremier.cz>, 2018 # Jan Horzinka <jan.horzinka@centrum.cz>, 2018 # Michal Veselý <michal@veselyberanek.net>, 2018 -# J. Podhorecky <j.podhorecky@volny.cz>, 2018 +# trendspotter <j.podhorecky@volny.cz>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: J. Podhorecky <j.podhorecky@volny.cz>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:25+0000\n" +"Last-Translator: trendspotter <j.podhorecky@volny.cz>, 2018\n" "Language-Team: Czech (https://www.transifex.com/odoo/teams/41243/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -55,7 +56,7 @@ msgstr "" #. module: stock_landed_costs #: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost__message_attachment_count msgid "Attachment Count" -msgstr "" +msgstr "Počet příloh" #. module: stock_landed_costs #: selection:product.template,split_method:0 diff --git a/addons/stock_landed_costs/i18n/uk.po b/addons/stock_landed_costs/i18n/uk.po index 8c1638fdc53..5ac0aa0bda9 100644 --- a/addons/stock_landed_costs/i18n/uk.po +++ b/addons/stock_landed_costs/i18n/uk.po @@ -29,7 +29,7 @@ msgstr "" #: code:addons/stock_landed_costs/models/stock_landed_cost.py:371 #, python-format msgid " already out" -msgstr " already out" +msgstr "вже вийшло" #. module: stock_landed_costs #: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost_lines__account_id @@ -39,12 +39,12 @@ msgstr "Рахунок" #. module: stock_landed_costs #: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost__account_journal_id msgid "Account Journal" -msgstr "Журнал бухобліку" +msgstr "Журнал проведень" #. module: stock_landed_costs #: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost__message_needaction msgid "Action Needed" -msgstr "Дія необхідна" +msgstr "Необхідна дія" #. module: stock_landed_costs #: model:ir.model.fields,field_description:stock_landed_costs.field_stock_valuation_adjustment_lines__additional_landed_cost @@ -134,7 +134,7 @@ msgstr "" #. module: stock_landed_costs #: model_terms:ir.actions.act_window,help:stock_landed_costs.action_stock_landed_cost msgid "Create a new landed cost" -msgstr "" +msgstr "Створити нові додаткові витрати" #. module: stock_landed_costs #: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost__create_uid @@ -159,7 +159,7 @@ msgstr "Дата" #. module: stock_landed_costs #: model_terms:ir.actions.act_window,help:stock_landed_costs.stock_landed_cost_type_action msgid "Define a new kind of landed cost" -msgstr "" +msgstr "Визначте новий вид додаткових витрат" #. module: stock_landed_costs #: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost_lines__name @@ -269,7 +269,7 @@ msgstr "Якщо позначено, деякі повідомлення маю #: model:ir.model.fields,help:stock_landed_costs.field_product_product__landed_cost_ok #: model:ir.model.fields,help:stock_landed_costs.field_product_template__landed_cost_ok msgid "Indicates whether the product is a landed cost." -msgstr "" +msgstr "Вказує, чи є товар додатковою витратою." #. module: stock_landed_costs #: model_terms:ir.ui.view,arch_db:stock_landed_costs.view_stock_landed_cost_type_form @@ -295,7 +295,7 @@ msgstr "Є додатковими витратами" #. module: stock_landed_costs #: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost__description msgid "Item Description" -msgstr "Опис пункту" +msgstr "Опис елементу" #. module: stock_landed_costs #: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost__account_move_id @@ -339,12 +339,12 @@ msgstr "Додаткові витрати" #. module: stock_landed_costs #: model_terms:ir.ui.view,arch_db:stock_landed_costs.view_stock_landed_cost_form msgid "Landed cost are computed based on the purchase unit of measure." -msgstr "Додаткові витрати обчислюються на основі одиниці виміру закупівлі." +msgstr "Додаткові витрати обчислюються на основі одиниці вимірювання купівлі." #. module: stock_landed_costs #: model:mail.message.subtype,description:stock_landed_costs.mt_stock_landed_cost_open msgid "Landed cost validated" -msgstr "додаткові витрати підтверджені" +msgstr "Додаткові витрати підтверджені" #. module: stock_landed_costs #: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost____last_update @@ -497,7 +497,7 @@ msgstr "Додаткові витарти запасів" #. module: stock_landed_costs #: model:ir.model,name:stock_landed_costs.model_stock_landed_cost_lines msgid "Stock Landed Cost Line" -msgstr "" +msgstr "Рядок складських додаткових витрат" #. module: stock_landed_costs #: model:ir.model,name:stock_landed_costs.model_stock_move @@ -543,7 +543,7 @@ msgstr "" #. module: stock_landed_costs #: model:ir.model,name:stock_landed_costs.model_stock_valuation_adjustment_lines msgid "Valuation Adjustment Lines" -msgstr "" +msgstr "Рядки коригування собівартості" #. module: stock_landed_costs #: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost__valuation_adjustment_lines @@ -559,7 +559,7 @@ msgstr "Об'єм" #. module: stock_landed_costs #: model:ir.model.fields,field_description:stock_landed_costs.field_stock_landed_cost__website_message_ids msgid "Website Messages" -msgstr "Повідомлення з вебсайту" +msgstr "Повідомлення з веб-сайту" #. module: stock_landed_costs #: model:ir.model.fields,help:stock_landed_costs.field_stock_landed_cost__website_message_ids @@ -579,6 +579,9 @@ msgid "" "only be applied for products with automated inventory valuation and FIFO " "costing method." msgstr "" +"Ви не можете застосувати додаткові витрати на вибрані переміщення. Додаткові" +" витрати можуть застосовуватися тільки для товарів з автоматичною оцінкою " +"запасу та методом калькулювання FIFO." #. module: stock_landed_costs #: model_terms:ir.ui.view,arch_db:stock_landed_costs.view_stock_landed_cost_type_form diff --git a/addons/stock_picking_batch/i18n/cs.po b/addons/stock_picking_batch/i18n/cs.po index 661a150a386..1a0502d6a8d 100644 --- a/addons/stock_picking_batch/i18n/cs.po +++ b/addons/stock_picking_batch/i18n/cs.po @@ -9,7 +9,7 @@ # Ladislav Tomm <tomm@helemik.cz>, 2018 # Jan Horzinka <jan.horzinka@centrum.cz>, 2018 # Michal Veselý <michal@veselyberanek.net>, 2018 -# J. Podhorecky <j.podhorecky@volny.cz>, 2018 +# trendspotter <j.podhorecky@volny.cz>, 2018 # msgid "" msgstr "" @@ -17,7 +17,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" "PO-Revision-Date: 2018-08-24 09:25+0000\n" -"Last-Translator: J. Podhorecky <j.podhorecky@volny.cz>, 2018\n" +"Last-Translator: trendspotter <j.podhorecky@volny.cz>, 2018\n" "Language-Team: Czech (https://www.transifex.com/odoo/teams/41243/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -60,7 +60,7 @@ msgstr "" #. module: stock_picking_batch #: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_batch__message_attachment_count msgid "Attachment Count" -msgstr "" +msgstr "Počet příloh" #. module: stock_picking_batch #: model_terms:ir.ui.view,arch_db:stock_picking_batch.report_picking_batch diff --git a/addons/stock_picking_batch/i18n/uk.po b/addons/stock_picking_batch/i18n/uk.po index 68614019485..e979a0d2f46 100644 --- a/addons/stock_picking_batch/i18n/uk.po +++ b/addons/stock_picking_batch/i18n/uk.po @@ -34,12 +34,12 @@ msgstr "<strong>Пакування</strong>" #. module: stock_picking_batch #: model_terms:ir.ui.view,arch_db:stock_picking_batch.report_picking_batch msgid "<strong>Responsible:</strong>" -msgstr "" +msgstr "<strong>Відповідальний:</strong>" #. module: stock_picking_batch #: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_batch__message_needaction msgid "Action Needed" -msgstr "Дія необхідна" +msgstr "Необхідна дія" #. module: stock_picking_batch #: model_terms:ir.ui.view,arch_db:stock_picking_batch.stock_picking_to_batch_form @@ -72,28 +72,28 @@ msgstr "Штрих-код" #: model_terms:ir.ui.view,arch_db:stock_picking_batch.stock_picking_batch_filter #, python-format msgid "Batch Picking" -msgstr "Комплектування партії" +msgstr "Партійне комплектування" #. module: stock_picking_batch #: model:ir.model,name:stock_picking_batch.model_stock_picking_to_batch msgid "Batch Picking Lines" -msgstr "" +msgstr "Рядки партійного комплектування" #. module: stock_picking_batch #: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_batch__name msgid "Batch Picking Name" -msgstr "Назва комплектування партії" +msgstr "Назва партійного комплектування" #. module: stock_picking_batch #: model:ir.actions.act_window,name:stock_picking_batch.stock_picking_batch_action #: model:ir.ui.menu,name:stock_picking_batch.stock_picking_batch_menu msgid "Batch Pickings" -msgstr "Комплектування партії" +msgstr "Партійні комплектування" #. module: stock_picking_batch #: model_terms:ir.ui.view,arch_db:stock_picking_batch.stock_picking_batch_filter msgid "Batch Pickings not finished" -msgstr "Комплектування партії не завершено" +msgstr "Партійні комплектування не завершені" #. module: stock_picking_batch #: model:ir.model.fields,help:stock_picking_batch.field_stock_picking__batch_id @@ -109,7 +109,7 @@ msgstr "Скасувати" #. module: stock_picking_batch #: model_terms:ir.ui.view,arch_db:stock_picking_batch.stock_picking_batch_form msgid "Cancel picking" -msgstr "Закрити відбір" +msgstr "Закрити комплектування" #. module: stock_picking_batch #: selection:stock.picking.batch,state:0 @@ -129,12 +129,12 @@ msgstr "Підтвердити" #. module: stock_picking_batch #: model_terms:ir.ui.view,arch_db:stock_picking_batch.stock_picking_batch_form msgid "Confirm picking" -msgstr "Підтвердьте відбір" +msgstr "Підтвердіть комплектування" #. module: stock_picking_batch #: model_terms:ir.actions.act_window,help:stock_picking_batch.stock_picking_batch_action msgid "Create a new batch picking" -msgstr "" +msgstr "Створити нове партійне комплектування" #. module: stock_picking_batch #: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_batch__create_uid @@ -268,7 +268,7 @@ msgstr "Повідомлення" #. module: stock_picking_batch #: model:ir.model.fields,help:stock_picking_batch.field_stock_picking_batch__name msgid "Name of the batch picking" -msgstr "Назва комплектування партії" +msgstr "Назва партійного комплектування" #. module: stock_picking_batch #: code:addons/stock_picking_batch/models/stock_picking_batch.py:52 @@ -304,7 +304,7 @@ msgstr "Кількість непрочитаних повідомлень" #. module: stock_picking_batch #: model:ir.model.fields,help:stock_picking_batch.field_stock_picking_batch__user_id msgid "Person responsible for this batch picking" -msgstr "Особа, яка відповідає за це комплектування партії" +msgstr "Особа, яка відповідає за це партійне комплектування" #. module: stock_picking_batch #: model:ir.model.fields,field_description:stock_picking_batch.field_stock_immediate_transfer__pick_to_backorder_ids @@ -319,7 +319,7 @@ msgstr "Комплектування" #. module: stock_picking_batch #: model_terms:ir.ui.view,arch_db:stock_picking_batch.report_picking_batch msgid "Picking Reference" -msgstr "" +msgstr "Посилання комплектування" #. module: stock_picking_batch #: model:ir.model.fields,help:stock_picking_batch.field_stock_immediate_transfer__pick_to_backorder_ids @@ -367,7 +367,7 @@ msgstr "Запланована дата" #. module: stock_picking_batch #: model_terms:ir.ui.view,arch_db:stock_picking_batch.stock_picking_batch_filter msgid "Search Batch Picking" -msgstr "Шукати комплектування партії" +msgstr "Шукати партійне комплектування" #. module: stock_picking_batch #: model_terms:ir.ui.view,arch_db:stock_picking_batch.stock_picking_to_batch_form @@ -388,7 +388,7 @@ msgstr "" #: code:addons/stock_picking_batch/models/stock_picking_batch.py:77 #, python-format msgid "Some products require lots/serial numbers." -msgstr "" +msgstr "Деякі товари вимагають партії/серійні номери." #. module: stock_picking_batch #: model:mail.message.subtype,description:stock_picking_batch.mt_batch_state @@ -411,7 +411,7 @@ msgstr "Статус" #: model_terms:ir.ui.view,arch_db:stock_picking_batch.stock_picking_batch_form #: model_terms:ir.ui.view,arch_db:stock_picking_batch.stock_picking_batch_tree msgid "Stock Batch Picking" -msgstr "Складське комплектування партії" +msgstr "Складське партійне комплектування" #. module: stock_picking_batch #: model_terms:ir.ui.view,arch_db:stock_picking_batch.report_picking_batch @@ -434,7 +434,7 @@ msgstr "" #. module: stock_picking_batch #: model_terms:ir.ui.view,arch_db:stock_picking_batch.report_picking_batch msgid "To take from:" -msgstr "" +msgstr "Взяти з:" #. module: stock_picking_batch #: model:ir.model,name:stock_picking_batch.model_stock_picking @@ -460,7 +460,7 @@ msgstr "Кількість непрочитаних повідомлень" #. module: stock_picking_batch #: model:ir.model.fields,field_description:stock_picking_batch.field_stock_picking_batch__website_message_ids msgid "Website Messages" -msgstr "Повідомлення з вебсайту" +msgstr "Повідомлення з веб-сайту" #. module: stock_picking_batch #: model:ir.model.fields,help:stock_picking_batch.field_stock_picking_batch__website_message_ids diff --git a/addons/stock_zebra/i18n/uk.po b/addons/stock_zebra/i18n/uk.po index e0c8d462599..e6a0a0a655a 100644 --- a/addons/stock_zebra/i18n/uk.po +++ b/addons/stock_zebra/i18n/uk.po @@ -2,12 +2,16 @@ # This file contains the translation of the following modules: # * stock_zebra # +# Translators: +# Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" +"PO-Revision-Date: 2018-08-24 09:25+0000\n" +"Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n" "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,36 +22,36 @@ msgstr "" #. module: stock_zebra #: model:ir.actions.report,name:stock_zebra.label_transfer_template msgid "Barcodes (ZPL)" -msgstr "" +msgstr "Штрих-коди (ZPL)" #. module: stock_zebra #: model:ir.actions.report,name:stock_zebra.label_lot_template msgid "Lot/Serial Number (ZPL)" -msgstr "" +msgstr "Партія/Серійний номер (ZPL)" #. module: stock_zebra #: model:ir.actions.report,name:stock_zebra.label_picking_type msgid "Operation type (ZPL)" -msgstr "" +msgstr "Тип операції (ZPL)" #. module: stock_zebra #: model:ir.actions.report,name:stock_zebra.label_package_template msgid "Package Barcode (ZPL)" -msgstr "" +msgstr "Штрих-код пакування (ZPL)" #. module: stock_zebra #: model:ir.actions.report,name:stock_zebra.label_barcode_product_product #: model:ir.actions.report,name:stock_zebra.label_barcode_product_template msgid "Product Barcode (ZPL)" -msgstr "" +msgstr "Штрих-код товару (ZPL)" #. module: stock_zebra #: model:ir.actions.report,name:stock_zebra.label_product_product #: model:ir.actions.report,name:stock_zebra.label_product_template msgid "Product Label (ZPL)" -msgstr "" +msgstr "Мітка товару (ZPL)" #. module: stock_zebra #: model:ir.actions.report,name:stock_zebra.label_product_packaging msgid "Product Packaging (ZPL)" -msgstr "" +msgstr "Пакування товару (ZPL)" diff --git a/addons/survey/i18n/cs.po b/addons/survey/i18n/cs.po index a7920548236..3a1e574dad2 100644 --- a/addons/survey/i18n/cs.po +++ b/addons/survey/i18n/cs.po @@ -283,7 +283,7 @@ msgstr "Stav činností" #. module: survey #: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__add_sign msgid "Add Sign" -msgstr "" +msgstr "Přidat podpis" #. module: survey #: model_terms:ir.ui.view,arch_db:survey.survey_email_compose_message @@ -373,7 +373,7 @@ msgstr "Používáte Odoo denně?" #. module: survey #: model:ir.model.fields,field_description:survey.field_survey_survey__message_attachment_count msgid "Attachment Count" -msgstr "" +msgstr "Počet příloh" #. module: survey #: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__attachment_ids @@ -411,7 +411,7 @@ msgstr "Autorův avatar" #. module: survey #: model:ir.model,name:survey.model_ir_autovacuum msgid "Automatic Vacuum" -msgstr "" +msgstr "Automatické vysávání" #. module: survey #: model_terms:ir.ui.view,arch_db:survey.back @@ -653,7 +653,7 @@ msgstr "Smazat emaily" #. module: survey #: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__auto_delete_message msgid "Delete Message Copy" -msgstr "" +msgstr "Odstranit kopii zprávy" #. module: survey #: model:ir.model.fields,help:survey.field_survey_mail_compose_message__auto_delete @@ -775,6 +775,8 @@ msgid "" "Email address of the sender. This field is set when no matching partner is " "found and replaces the author_id field in the chatter." msgstr "" +"E-mailová adresa odesílatele. Toto pole je nastaveno, pokud nebyl nalezen " +"žádný odpovídající partner a nahrazuje pole autor_id v chatu." #. module: survey #: model:ir.model,name:survey.model_survey_mail_compose_message diff --git a/addons/survey/i18n/nb.po b/addons/survey/i18n/nb.po index 6e3ac4ade0c..8bcb3abcf6d 100644 --- a/addons/survey/i18n/nb.po +++ b/addons/survey/i18n/nb.po @@ -3,16 +3,18 @@ # * survey # # Translators: +# Jan Pedro Tumusok <jpt@eyenetworks.no>, 2018 # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 -# Jan Pedro Tumusok <jpt@eyenetworks.no>, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" -"PO-Revision-Date: 2018-10-08 06:49+0000\n" -"Last-Translator: Jan Pedro Tumusok <jpt@eyenetworks.no>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:25+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -736,7 +738,7 @@ msgstr "Utkast" #. module: survey #: model_terms:ir.ui.view,arch_db:survey.survey_kanban msgid "Dropdown menu" -msgstr "" +msgstr "Nedtrekksmeny" #. module: survey #: model:ir.model.fields,field_description:survey.field_survey_user_input__email @@ -1130,7 +1132,7 @@ msgstr "Forsinkede aktiviteter" #. module: survey #: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__layout msgid "Layout" -msgstr "" +msgstr "Layout" #. module: survey #: selection:survey.user_input,type:0 diff --git a/addons/survey/i18n/nl.po b/addons/survey/i18n/nl.po index e9941326210..d0fea4b0d0b 100644 --- a/addons/survey/i18n/nl.po +++ b/addons/survey/i18n/nl.po @@ -1618,7 +1618,7 @@ msgstr "Relatie" #. module: survey #: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__needaction_partner_ids msgid "Partners with Need Action" -msgstr "Relaties met Nodige Actie" +msgstr "Relaties met benodigde actie" #. module: survey #: selection:survey.mail.compose.message,moderation_status:0 diff --git a/addons/survey/i18n/uk.po b/addons/survey/i18n/uk.po index 277150c2af7..6883e04adbc 100644 --- a/addons/survey/i18n/uk.po +++ b/addons/survey/i18n/uk.po @@ -228,7 +228,7 @@ msgid "" "indicates a wrong answer" msgstr "" "Позитивна оцінка свідчить про правильний вибір; негативна або нульова оцінка" -" показує, що відповідь не вірна" +" показує, що відповідь невірна" #. module: survey #: model_terms:ir.ui.view,arch_db:survey.page @@ -291,8 +291,8 @@ msgid "" "Add a list of email of recipients (will not be converted into contacts). " "Separated by commas, semicolons or newline..." msgstr "" -"Додайте список емейлів отримувачів (не конвертовані в контакти).Розділювач " -"кома, " +"Додайте список електронних адрес отримувачів (не конвертовані в контакти). " +"Відокремлено комами, комами-крапками або рядком ..." #. module: survey #: model_terms:ir.actions.act_window,help:survey.action_survey_form @@ -402,7 +402,7 @@ msgid "" "Author of the message. If not set, email_from may hold an email address that" " did not match any partner." msgstr "" -"Автор повідомлення.Якщо не встановлено, email_from може містити електронну " +"Автор повідомлення. Якщо не встановлено, email_from може містити електронну " "адресу, яка не відповідає жодному з партнерів." #. module: survey @@ -735,7 +735,7 @@ msgstr "Чи є у вас пропозиція, щоб допомогти люд #. module: survey #: model:survey.question,question:survey.feedback_2_3 msgid "Do you have suggestions on how to improve the process view ?" -msgstr "Чи є у вас пропозиції щодо вдосконалення вигляду процесу?" +msgstr "Чи є у вас пропозиції щодо вдосконалення перегляду процесу?" #. module: survey #: model:survey.stage,name:survey.stage_draft @@ -810,7 +810,7 @@ msgstr "Запропоновані додаткові модулі є актуа #. module: survey #: model:ir.model.fields,field_description:survey.field_survey_mail_compose_message__starred_partner_ids msgid "Favorited By" -msgstr "В улюблених у" +msgstr "В закладках у" #. module: survey #: model_terms:ir.ui.view,arch_db:survey.result_choice @@ -825,7 +825,7 @@ msgstr "Фінансове управління" #. module: survey #: model:ir.model.fields,field_description:survey.field_survey_stage__fold msgid "Folded in kanban view" -msgstr "Складений у вигляді канбану" +msgstr "Складений у перегляді канбану" #. module: survey #: model:ir.model.fields,field_description:survey.field_survey_survey__message_follower_ids diff --git a/addons/test_mail/tests/test_performance.py b/addons/test_mail/tests/test_performance.py index 49befe45800..f96a9f0f974 100644 --- a/addons/test_mail/tests/test_performance.py +++ b/addons/test_mail/tests/test_performance.py @@ -265,7 +265,7 @@ class TestAdvMailPerformance(TransactionCase): def test_message_post_one_email_notification(self): record = self.env['mail.test.simple'].create({'name': 'Test'}) - with self.assertQueryCount(__system__=50, emp=70): # com runbot: 47 - 67 // test_mail only: 50 - 67 + with self.assertQueryCount(__system__=51, emp=71): # com runbot: 51 - 71 // test_mail only: 48 - 68 record.message_post( body='<p>Test Post Performances with an email ping</p>', partner_ids=self.customer.ids, @@ -401,7 +401,7 @@ class TestHeavyMailPerformance(TransactionCase): self.umbrella.message_subscribe(self.user_portal.partner_id.ids) record = self.umbrella.sudo(self.env.user) - with self.assertQueryCount(__system__=84, emp=107): # com runbot 81 - 104 // test_mail only: 84 - 104 + with self.assertQueryCount(__system__=85, emp=108): # com runbot: 85 - 108 // test_mail only: 81 - 105 record.message_post( body='<p>Test Post Performances</p>', message_type='comment', @@ -418,7 +418,7 @@ class TestHeavyMailPerformance(TransactionCase): record = self.umbrella.sudo(self.env.user) template_id = self.env.ref('test_mail.mail_test_tpl').id - with self.assertQueryCount(__system__=103, emp=138): # com runbot 100 - 135 // test_mail only: 103 - 135 + with self.assertQueryCount(__system__=104, emp=139): # com runbot: 104 - 139 // test_mail only: 101 - 136 record.message_post_with_template(template_id, message_type='comment', composition_mode='comment') self.assertEqual(record.message_ids[0].body, '<p>Adding stuff on %s</p>' % record.name) @@ -488,7 +488,7 @@ class TestHeavyMailPerformance(TransactionCase): }) self.assertEqual(rec.message_partner_ids, self.partners | self.env.user.partner_id) - with self.assertQueryCount(__system__=60, emp=79): # com runbot: 60 - 75 // test_mail only: 60 - 72 + with self.assertQueryCount(__system__=61, emp=79): # com runbot: 61 - 75 // test_mail only: 60 - 72 rec.write({'user_id': self.user_portal.id}) self.assertEqual(rec.message_partner_ids, self.partners | self.env.user.partner_id | self.user_portal.partner_id) @@ -540,7 +540,7 @@ class TestHeavyMailPerformance(TransactionCase): }) self.assertEqual(rec.message_partner_ids, self.user_portal.partner_id | self.env.user.partner_id) - with self.assertQueryCount(__system__=99, emp=119): # com runbot: 98 - 119 // test_mail only: 98 - 116 + with self.assertQueryCount(__system__=99, emp=120): # com runbot: 98 - 120 // test_mail only: 98 - 116 rec.write({ 'name': 'Test2', 'umbrella_id': self.umbrella.id, @@ -578,7 +578,7 @@ class TestHeavyMailPerformance(TransactionCase): }) self.assertEqual(rec.message_partner_ids, self.user_portal.partner_id | self.env.user.partner_id) - with self.assertQueryCount(__system__=104, emp=126): # test_mail only: 104 - 122 + with self.assertQueryCount(__system__=105, emp=126): # test_mail only: 105 - 126 rec.write({ 'name': 'Test2', 'umbrella_id': umbrella_id, diff --git a/addons/uom/i18n/uk.po b/addons/uom/i18n/uk.po index a952dce4e80..7f9649512f7 100644 --- a/addons/uom/i18n/uk.po +++ b/addons/uom/i18n/uk.po @@ -6,12 +6,13 @@ # Martin Trigaux, 2018 # Bohdan Lisnenko, 2018 # Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-18 09:49+0000\n" -"PO-Revision-Date: 2018-09-18 09:49+0000\n" +"PO-Revision-Date: 2018-08-24 09:33+0000\n" "Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n" "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n" "MIME-Version: 1.0\n" @@ -43,7 +44,7 @@ msgstr "Більший коефіцієнт" #. module: uom #: selection:uom.uom,uom_type:0 msgid "Bigger than the reference Unit of Measure" -msgstr "Більша за основну одиницю виміру категорії" +msgstr "Більша за основну одиницю вимірювання категорії" #. module: uom #: model:ir.model.fields,field_description:uom.field_uom_uom__category_id @@ -99,8 +100,9 @@ msgid "" "How many times this Unit of Measure is bigger than the reference Unit of " "Measure in this category: 1 * (this unit) = ratio * (reference unit)" msgstr "" -"Скільки разів ця одиниця вимірювання більша, ніж еталонна одиниця виміру в " -"цій категорії: 1 * (ця одиниця) = співвідношення * (контрольна одиниця)" +"Скільки разів ця одиниця вимірювання більша, ніж одиниця вимірювання " +"референсу у цій категорії: 1 * (ця одиниця) = співвідношення * (контрольна " +"одиниця)" #. module: uom #: model:ir.model.fields,help:uom.field_uom_uom__factor @@ -108,9 +110,9 @@ msgid "" "How much bigger or smaller this unit is compared to the reference Unit of " "Measure for this category: 1 * (reference unit) = ratio * (this unit)" msgstr "" -"Наскільки більшою чи меншою є ця одиниця, порівняно з контрольною одиницею " -"виміру для цієї категорії: 1 * (контрольна одиниця) = співвідношення * (ця " -"одиниця)" +"Наскільки більшою чи меншою є ця одиниця, порівняно з одиницею вимірювання " +"референсу для цієї категорії: 1 * (контрольна одиниця) = співвідношення * " +"(ця одиниця)" #. module: uom #: model:ir.model.fields,field_description:uom.field_uom_category__id @@ -154,17 +156,17 @@ msgstr "Літр(и)" #. module: uom #: model:res.groups,name:uom.group_uom msgid "Manage Multiple Units of Measure" -msgstr "Керування різними одиницями віміру" +msgstr "Керування різними одиницями вімірювання" #. module: uom #: model:ir.model,name:uom.model_uom_uom msgid "Product Unit of Measure" -msgstr "Одиниця виміру товару" +msgstr "Одиниця вимірювання товару" #. module: uom #: model:ir.model,name:uom.model_uom_category msgid "Product UoM Categories" -msgstr "Категорії товару UoM" +msgstr "Категорії одиниці вимірювання товару" #. module: uom #: model:ir.model.fields,field_description:uom.field_uom_uom__factor @@ -174,7 +176,7 @@ msgstr "Співвідношення" #. module: uom #: selection:uom.uom,uom_type:0 msgid "Reference Unit of Measure for this category" -msgstr "Основна одиниця виміру для цієї категорії" +msgstr "Основна одиниця вимірювання для цієї категорії" #. module: uom #: model:ir.model.fields,field_description:uom.field_uom_uom__rounding @@ -184,7 +186,7 @@ msgstr "Точність округлення" #. module: uom #: selection:uom.uom,uom_type:0 msgid "Smaller than the reference Unit of Measure" -msgstr "Менша за основну одиницю виміру категорії" +msgstr "Менша за основну одиницю вимірювання" #. module: uom #: model:ir.model.fields,help:uom.field_uom_uom__rounding @@ -198,7 +200,7 @@ msgstr "" #. module: uom #: sql_constraint:uom.uom:0 msgid "The conversion ratio for a unit of measure cannot be 0!" -msgstr "Коефіцієнт конверсії одиниці виміру не може бути 0!" +msgstr "Коефіцієнт конверсії одиниці вимірювання не може бути 0!" #. module: uom #: sql_constraint:uom.uom:0 @@ -251,27 +253,27 @@ msgstr "" #. module: uom #: model:uom.category,name:uom.product_uom_categ_unit msgid "Unit" -msgstr "Одиниці" +msgstr "Одиниця" #. module: uom #: model:ir.model.fields,field_description:uom.field_uom_uom__name msgid "Unit of Measure" -msgstr "Одиниця виміру" +msgstr "Одиниця вимірювання" #. module: uom #: model:ir.actions.act_window,name:uom.product_uom_categ_form_action msgid "Unit of Measure Categories" -msgstr "Категорії одиниць виміру" +msgstr "Категорії одиниць вимірювання" #. module: uom #: model:ir.model.fields,field_description:uom.field_uom_category__name msgid "Unit of Measure Category" -msgstr "Категорія одиниць виміру" +msgstr "Категорія одиниць вимірювання" #. module: uom #: model:uom.uom,name:uom.product_uom_unit msgid "Unit(s)" -msgstr "шт" +msgstr "Штука(и)" #. module: uom #: selection:uom.category,measure_type:0 @@ -283,12 +285,12 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:uom.product_uom_form_view #: model_terms:ir.ui.view,arch_db:uom.product_uom_tree_view msgid "Units of Measure" -msgstr "Одиниці виміру" +msgstr "Одиниці вимірювання" #. module: uom #: model_terms:ir.ui.view,arch_db:uom.product_uom_categ_form_view msgid "Units of Measure categories" -msgstr "Категорії одиниць виміру" +msgstr "Категорії одиниць вимірювання" #. module: uom #: model_terms:ir.actions.act_window,help:uom.product_uom_categ_form_action @@ -298,9 +300,9 @@ msgid "" " <i>'Time'</i>, you will have the following units of measure:\n" " Hours, Days." msgstr "" -"Одиниці виміру, що належать до тієї ж категорії, можуть бути\n" +"Одиниці вимірювання, що належать до тієї ж категорії, можуть бути\n" "перетворені між собою. Наприклад, у категорії\n" -"<i>'Час'</i>, у вас будуть такі одиниці виміру:\n" +"<i>'Час'</i>, у вас будуть такі одиниці вимірювання:\n" "Години, дні." #. module: uom @@ -370,7 +372,7 @@ msgstr "см" #. module: uom #: model_terms:ir.ui.view,arch_db:uom.product_uom_form_view msgid "e.g: 1 * (reference unit) = ratio * (this unit)" -msgstr "приклад: 1 х (ця одиниця) = співвідношення х (основна одиниця)" +msgstr "приклад: 1 х (основна одиниця) = співвідношення х (ця одиниця)" #. module: uom #: model_terms:ir.ui.view,arch_db:uom.product_uom_form_view diff --git a/addons/utm/i18n/cs.po b/addons/utm/i18n/cs.po index e0e6f2ed05f..13f7f2ebc1c 100644 --- a/addons/utm/i18n/cs.po +++ b/addons/utm/i18n/cs.po @@ -6,7 +6,7 @@ # Martin Trigaux, 2018 # Ladislav Tomm <tomm@helemik.cz>, 2018 # Jan Horzinka <jan.horzinka@centrum.cz>, 2018 -# J. Podhorecky <j.podhorecky@volny.cz>, 2018 +# trendspotter <j.podhorecky@volny.cz>, 2018 # msgid "" msgstr "" @@ -14,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" "PO-Revision-Date: 2018-08-24 09:33+0000\n" -"Last-Translator: J. Podhorecky <j.podhorecky@volny.cz>, 2018\n" +"Last-Translator: trendspotter <j.podhorecky@volny.cz>, 2018\n" "Language-Team: Czech (https://www.transifex.com/odoo/teams/41243/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -212,7 +212,7 @@ msgstr "" #. module: utm #: model:utm.source,name:utm.utm_source_twitter msgid "Twitter" -msgstr "" +msgstr "Twitter" #. module: utm #: model:ir.model,name:utm.model_utm_campaign diff --git a/addons/utm/i18n/nb.po b/addons/utm/i18n/nb.po index 1c928ef1d78..38c4f758ee2 100644 --- a/addons/utm/i18n/nb.po +++ b/addons/utm/i18n/nb.po @@ -3,15 +3,17 @@ # * utm # # Translators: -# Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Martin Trigaux, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" -"PO-Revision-Date: 2018-10-08 06:49+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:33+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -103,7 +105,7 @@ msgstr "Facebook" #. module: utm #: model:ir.model,name:utm.model_ir_http msgid "HTTP Routing" -msgstr "" +msgstr "HTTP-ruting" #. module: utm #: model:ir.model.fields,field_description:utm.field_utm_campaign__id diff --git a/addons/utm/i18n/uk.po b/addons/utm/i18n/uk.po index 4472dcdcb86..99261688a9e 100644 --- a/addons/utm/i18n/uk.po +++ b/addons/utm/i18n/uk.po @@ -76,12 +76,12 @@ msgstr "Створено" #. module: utm #: model_terms:ir.actions.act_window,help:utm.utm_medium_action msgid "Define a new medium" -msgstr "" +msgstr "Визначте новий носій" #. module: utm #: model_terms:ir.actions.act_window,help:utm.utm_source_action msgid "Define a new source" -msgstr "" +msgstr "Визначте нове джерело" #. module: utm #: model:ir.model.fields,field_description:utm.field_utm_campaign__display_name @@ -94,7 +94,7 @@ msgstr "Назва для відображення" #. module: utm #: model:utm.campaign,name:utm.utm_campaign_email_campaign_services msgid "Email Campaign - Services" -msgstr "Електронна пошта - служба" +msgstr "Кампанія електронної пошти - послуги" #. module: utm #: model:utm.source,name:utm.utm_source_facebook @@ -209,7 +209,7 @@ msgid "" "This is the source of the link, e.g. Search Engine, another domain, or name " "of email list" msgstr "" -"Це джерело посилання, наприклад, пошукова система, інший домен або ім'я " +"Це джерело посилання, наприклад, пошукова система, інший домен або назва " "списку листів" #. module: utm @@ -225,19 +225,19 @@ msgstr "Кампанія UTM" #. module: utm #: model:ir.model,name:utm.model_utm_medium msgid "UTM Medium" -msgstr "" +msgstr "Носій UTM " #. module: utm #: model:ir.model,name:utm.model_utm_mixin msgid "UTM Mixin" -msgstr "" +msgstr "Мікс UTM " #. module: utm #: model:ir.model,name:utm.model_utm_source msgid "UTM Source" -msgstr "" +msgstr "Джерело UTM " #. module: utm #: model:ir.ui.menu,name:utm.marketing_utm msgid "UTMs" -msgstr "UTMs" +msgstr "UTM" diff --git a/addons/web/i18n/cs.po b/addons/web/i18n/cs.po index d7a7df2f4e2..71f219b2bf7 100644 --- a/addons/web/i18n/cs.po +++ b/addons/web/i18n/cs.po @@ -262,7 +262,7 @@ msgstr "Přístup zamítnut" #: code:addons/web/static/src/js/services/crash_manager.js:15 #, python-format msgid "Access Error" -msgstr "" +msgstr "Chyba přístupu" #. module: web #. openerp-web @@ -2817,7 +2817,7 @@ msgstr "Uložit" #: code:addons/web/static/src/js/views/view_dialogs.js:137 #, python-format msgid "Save & Close" -msgstr "" +msgstr "Uložit a zavřít" #. module: web #. openerp-web diff --git a/addons/web/i18n/es.po b/addons/web/i18n/es.po index 3380775f563..bee5737b4b9 100644 --- a/addons/web/i18n/es.po +++ b/addons/web/i18n/es.po @@ -3,40 +3,42 @@ # * web # # Translators: -# Martin Trigaux, 2018 -# e2f <projects@e2f.com>, 2018 # ES R2 <e2fds74f5ds412@outlook.com>, 2018 # David Perez <david@closemarketing.es>, 2018 # Ana Juaristi <ajuaristio@gmail.com>, 2018 # Mateo Tibaquirá Palacios <nestormateo@gmail.com>, 2018 # Alejandro Santana <alejandrosantana@anubia.es>, 2018 # Odoo developer at Praxya.com <sergio.estada@gmail.com>, 2018 -# David Arnold <blaggacao@users.noreply.github.com>, 2018 # José Vicente <txusev@gmail.com>, 2018 -# Luis M. Ontalba <luis.martinez@tecnativa.com>, 2018 -# Luis M. Triana <luis.triana@jarsa.com.mx>, 2018 # David Casas <info@informaticacoslada.com>, 2018 -# Antonio Trueba, 2018 -# RGB Consulting <odoo@rgbconsulting.com>, 2018 -# e2f_EPV Translator <e2f_EPV@outlook.com>, 2018 # Kiko <kiko@comunitea.com>, 2018 -# Nicolás Broggi <rnbroggi@gmail.com>, 2018 # Gustavo Valverde, 2018 -# Albert Orellano <albert.orellano@megaterios.co>, 2018 +# e2f <projects@e2f.com>, 2018 # Cristian Salamea <ovnicraft@gmail.com>, 2018 # Pedro M. Baeza <pedro.baeza@gmail.com>, 2018 # Jesús Alan Ramos Rodríguez <alan.ramos@jarsa.com.mx>, 2018 +# David Arnold <blaggacao@users.noreply.github.com>, 2018 # Alejandro Die Sanchis <marketing@domatix.com>, 2018 +# Luis M. Ontalba <luis.martinez@tecnativa.com>, 2018 +# Luis M. Triana <luis.triana@jarsa.com.mx>, 2018 +# Antonio Trueba, 2018 +# RGB Consulting <odoo@rgbconsulting.com>, 2018 # Inigo Zuluaga <inigo_zuluaga@yahoo.es>, 2018 +# e2f_EPV Translator <e2f_EPV@outlook.com>, 2018 +# Albert Orellano <albert.orellano@megaterios.co>, 2018 +# Nicolás Broggi <rnbroggi@gmail.com>, 2018 # Rubi Navarro <ren@odoo.com>, 2018 # Cristopher Cravioto <ccr@odoo.com>, 2018 +# Martin Trigaux, 2018 +# Carlos Lopez <celm1990@hotmail.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" -"PO-Revision-Date: 2018-10-08 06:49+0000\n" -"Last-Translator: Cristopher Cravioto <ccr@odoo.com>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:33+0000\n" +"Last-Translator: Carlos Lopez <celm1990@hotmail.com>, 2018\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1819,21 +1821,21 @@ msgstr "Idiomas" #: code:addons/web/static/src/js/views/search/time_range_menu_options.js:9 #, python-format msgid "Last 30 Days" -msgstr "" +msgstr "Últimos 30 días" #. module: web #. openerp-web #: code:addons/web/static/src/js/views/search/time_range_menu_options.js:10 #, python-format msgid "Last 365 Days" -msgstr "" +msgstr "Últimos 365 días" #. module: web #. openerp-web #: code:addons/web/static/src/js/views/search/time_range_menu_options.js:8 #, python-format msgid "Last 7 Days" -msgstr "" +msgstr "Últimos 7 días" #. module: web #: model:ir.model.fields,field_description:web.field_report_layout____last_update diff --git a/addons/web/i18n/it.po b/addons/web/i18n/it.po index 9d4853a2d0d..3a1ed8ca728 100644 --- a/addons/web/i18n/it.po +++ b/addons/web/i18n/it.po @@ -356,21 +356,21 @@ msgstr "Aggiungi gruppo personalizzato" #: code:addons/web/static/src/xml/kanban.xml:49 #, python-format msgid "Add a Column" -msgstr "Aggiungi una colonna" +msgstr "Aggiungi colonna" #. module: web #. openerp-web #: code:addons/web/static/src/xml/base.xml:1130 #, python-format msgid "Add a condition" -msgstr "Aggiungi una condizione" +msgstr "Aggiungi condizione" #. module: web #. openerp-web #: code:addons/web/static/src/js/views/list/list_editable_renderer.js:78 #, python-format msgid "Add a line" -msgstr "Aggiungi una riga" +msgstr "Aggiungi riga" #. module: web #. openerp-web @@ -2605,12 +2605,12 @@ msgstr "Preferenze" #. module: web #: model:ir.actions.report,name:web.action_report_externalpreview msgid "Preview External Report" -msgstr "Anteprima rendiconto esterno" +msgstr "Anteprima resoconto esterno" #. module: web #: model:ir.actions.report,name:web.action_report_internalpreview msgid "Preview Internal Report" -msgstr "Anteprima rendiconto interno" +msgstr "Anteprima resoconto interno" #. module: web #: model:ir.model.fields,field_description:web.field_report_layout__image @@ -2767,12 +2767,12 @@ msgstr "Rimuovere questo preferito dall'elenco" #: code:addons/web/static/src/js/chrome/action_manager_report.js:112 #, python-format msgid "Report" -msgstr "Rendiconto" +msgstr "Resoconto" #. module: web #: model:ir.model,name:web.model_report_layout msgid "Report Layout" -msgstr "Struttura rendiconto" +msgstr "Struttura resoconto" #. module: web #. openerp-web @@ -3206,8 +3206,7 @@ msgid "" "The record has been modified, your changes will be discarded. Do you want to" " proceed?" msgstr "" -"Il documento è stato modificato, verranno abbandonate le modifiche. " -"Procedere?" +"Il record è stato modificato, verranno abbandonate le modifiche. Procedere?" #. module: web #. openerp-web @@ -3298,12 +3297,12 @@ msgstr "" #. module: web #: model_terms:ir.ui.view,arch_db:web.preview_externalreport msgid "This is a sample of an external report." -msgstr "Questo è un campione di un resoconto esterno." +msgstr "Campione di resoconto esterno." #. module: web #: model_terms:ir.ui.view,arch_db:web.preview_internalreport msgid "This is a sample of an internal report." -msgstr "Questo è un campione di resoconto interno." +msgstr "Campione di resoconto interno." #. module: web #. openerp-web @@ -3407,7 +3406,7 @@ msgstr "Tipo:" msgid "" "Unable to find Wkhtmltopdf on this system. The report will be shown in html." msgstr "" -"Impossibile trovare wkhtmltopdf nel sistema. Il resoconto verrà mostrato in " +"Impossibile trovare wkhtmltopdf nel sistema, il resoconto verrà mostrato in " "html." #. module: web @@ -3492,7 +3491,7 @@ msgstr "Aggiornare i dati (compatibile con l'importazione)" #: code:addons/web/static/src/js/fields/upgrade_fields.js:69 #, python-format msgid "Upgrade now" -msgstr "Aggiorna adesso" +msgstr "Avanza adesso" #. module: web #. openerp-web @@ -3506,7 +3505,7 @@ msgstr "Avanza a Enterprise" #: code:addons/web/static/src/xml/base.xml:1571 #, python-format msgid "Upgrade to future versions" -msgstr "Aggiornamento a versioni future" +msgstr "Avanzamento alle prossime versioni" #. module: web #. openerp-web @@ -3709,7 +3708,7 @@ msgstr "Ieri" #: code:addons/web/static/src/js/chrome/abstract_web_client.js:352 #, python-format msgid "You are back online" -msgstr "Nuovamente online" +msgstr "Di nuovo in linea" #. module: web #. openerp-web @@ -3758,6 +3757,9 @@ msgid "" "to get a correct display of headers and footers as well as support for " "table-breaking between pages." msgstr "" +"Per visualizzare correttamente le intestazioni e i piè di pagina e gestire " +"le interruzioni tabella tra pagine è necessario aggiornare wkhtmltopdf alla " +"versione 0.12.0 o superiore." #. module: web #. openerp-web diff --git a/addons/web/i18n/ja.po b/addons/web/i18n/ja.po index 11915901fa5..6cfa0fe790a 100644 --- a/addons/web/i18n/ja.po +++ b/addons/web/i18n/ja.po @@ -637,7 +637,7 @@ msgstr "ベース" #: code:addons/web/static/src/xml/base.xml:1143 #, python-format msgid "Based On" -msgstr "" +msgstr "基準" #. module: web #. openerp-web @@ -819,7 +819,7 @@ msgstr "" #: code:addons/web/static/src/xml/base.xml:1185 #, python-format msgid "Compare To" -msgstr "" +msgstr "比較対象" #. module: web #. openerp-web @@ -1799,21 +1799,21 @@ msgstr "言語" #: code:addons/web/static/src/js/views/search/time_range_menu_options.js:9 #, python-format msgid "Last 30 Days" -msgstr "" +msgstr "過去30日" #. module: web #. openerp-web #: code:addons/web/static/src/js/views/search/time_range_menu_options.js:10 #, python-format msgid "Last 365 Days" -msgstr "" +msgstr "過去365日" #. module: web #. openerp-web #: code:addons/web/static/src/js/views/search/time_range_menu_options.js:8 #, python-format msgid "Last 7 Days" -msgstr "" +msgstr "過去7日" #. module: web #: model:ir.model.fields,field_description:web.field_report_layout____last_update @@ -2609,7 +2609,7 @@ msgstr "" #: code:addons/web/static/src/xml/web_calendar.xml:75 #, python-format msgid "Previous" -msgstr "" +msgstr "前" #. module: web #. openerp-web @@ -2623,7 +2623,7 @@ msgstr "前期間" #: code:addons/web/static/src/js/views/search/time_range_menu_options.js:25 #, python-format msgid "Previous Year" -msgstr "" +msgstr "昨年" #. module: web #. openerp-web @@ -3356,7 +3356,7 @@ msgstr "" msgid "" "Try to add some records, or make sure that there is no active filter in the " "search bar." -msgstr "" +msgstr "レコードを追加するか、サーチバーのフィルタを調整してみてください。" #. module: web #. openerp-web diff --git a/addons/web/i18n/nb.po b/addons/web/i18n/nb.po index 2b9fd80db2d..e8aa2ea9d07 100644 --- a/addons/web/i18n/nb.po +++ b/addons/web/i18n/nb.po @@ -3,16 +3,18 @@ # * web # # Translators: -# Martin Trigaux, 2018 # Eirik Halvorsen <eirik386@gmail.com>, 2018 # Jorunn D. Newth, 2018 +# Martin Trigaux, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" -"PO-Revision-Date: 2018-10-08 06:49+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:33+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -165,7 +167,7 @@ msgstr "'%s' er ikke et korrekt heltall" #: code:addons/web/static/src/js/fields/field_utils.js:548 #, python-format msgid "'%s' is not a correct monetary field" -msgstr "" +msgstr "'%s' er ikke et gyldig valutafelt" #. module: web #. openerp-web @@ -186,7 +188,7 @@ msgstr "(Enterprise-utgave)" #: code:addons/web/static/src/xml/base.xml:298 #, python-format msgid "(change)" -msgstr "" +msgstr "(endre)" #. module: web #. openerp-web @@ -194,7 +196,7 @@ msgstr "" #: code:addons/web/static/src/xml/base.xml:537 #, python-format msgid "(count)" -msgstr "" +msgstr "(antall)" #. module: web #. openerp-web @@ -225,6 +227,8 @@ msgid "" "A popup window has been blocked. You may need to change your browser " "settings to allow popup windows for this page." msgstr "" +"Et popup-vindu ble blokkert. Du må kanskje endre innstillinger i nettleseren" +" din til å tillate popup-vinduer på dette nettstedet." #. module: web #. openerp-web @@ -234,6 +238,9 @@ msgid "" "A popup window with your report was blocked. You may need to change your " "browser settings to allow popup windows for this page." msgstr "" +"Popup-vinduet med rapporten din ble blokkert. Du må kanskje endre " +"innstillinger i nettleseren din til å tillate popup-vinduer på dette " +"nettstedet." #. module: web #. openerp-web @@ -247,7 +254,7 @@ msgstr "ALLE" #: code:addons/web/static/src/xml/base.xml:633 #, python-format msgid "ANY" -msgstr "" +msgstr "NOEN" #. module: web #. openerp-web @@ -322,7 +329,7 @@ msgstr "Legg til" #: code:addons/web/static/src/js/views/calendar/calendar_renderer.js:82 #, python-format msgid "Add %s" -msgstr "" +msgstr "Legg til %s" #. module: web #. openerp-web @@ -336,14 +343,14 @@ msgstr "Legg til tilpasset filter" #: code:addons/web/static/src/xml/base.xml:1111 #, python-format msgid "Add Custom Group" -msgstr "" +msgstr "Legg til tilpasset gruppe" #. module: web #. openerp-web #: code:addons/web/static/src/xml/kanban.xml:49 #, python-format msgid "Add a Column" -msgstr "" +msgstr "Legg til kolonne" #. module: web #. openerp-web @@ -357,21 +364,21 @@ msgstr "Legg til betingelse" #: code:addons/web/static/src/js/views/list/list_editable_renderer.js:78 #, python-format msgid "Add a line" -msgstr "" +msgstr "Legg til linje" #. module: web #. openerp-web #: code:addons/web/static/src/xml/base.xml:616 #, python-format msgid "Add branch" -msgstr "" +msgstr "Legg til gren" #. module: web #. openerp-web #: code:addons/web/static/src/xml/kanban.xml:48 #, python-format msgid "Add column" -msgstr "" +msgstr "Legg til kolonne" #. module: web #. openerp-web @@ -392,14 +399,14 @@ msgstr "Legg til ny verdi" #: code:addons/web/static/src/xml/base.xml:615 #, python-format msgid "Add node" -msgstr "" +msgstr "Legg til notat" #. module: web #. openerp-web #: code:addons/web/static/src/xml/base.xml:701 #, python-format msgid "Add tag" -msgstr "" +msgstr "Legg til tag" #. module: web #. openerp-web @@ -497,6 +504,9 @@ msgid "" "JavaScript file served from a different origin. (Opening your browser " "console might give you a hint on the error.)" msgstr "" +"En ukjent CORS-feil oppstod. Denne feilen kommer sannsynligvis fra en " +"ekstern JavaScript-fil fra en annen opprinnelse. (Om du åpner nettleser-" +"konsollen, kan du sannsynligvis få et hint om feilen.)" #. module: web #. openerp-web @@ -511,7 +521,7 @@ msgstr "Og mer" #: code:addons/web/static/src/xml/base.xml:628 #, python-format msgid "Any" -msgstr "" +msgstr "Noen" #. module: web #. openerp-web @@ -535,7 +545,7 @@ msgstr "Arkiver" #: code:addons/web/static/src/xml/kanban.xml:27 #, python-format msgid "Archive All" -msgstr "" +msgstr "Arkiver alle" #. module: web #. openerp-web @@ -551,13 +561,14 @@ msgstr "Arkivert" msgid "" "Are you sure that you want to archive all the records from this column?" msgstr "" +"Er du sikker på at du vil arkivere alle oppføringene i denne kolonnen?" #. module: web #. openerp-web #: code:addons/web/static/src/js/views/list/list_controller.js:156 #, python-format msgid "Are you sure that you want to archive all the selected records?" -msgstr "" +msgstr "Er du sikker på at du vil arkivere de valgte oppføringene?" #. module: web #. openerp-web @@ -586,7 +597,7 @@ msgstr "Er du sikker på at du vil fjerne denne oppføringen?" #: code:addons/web/static/src/xml/base.xml:1028 #, python-format msgid "Attach" -msgstr "" +msgstr "Legg til vedlegg" #. module: web #. openerp-web @@ -629,14 +640,14 @@ msgstr "Base" #: code:addons/web/static/src/xml/base.xml:1143 #, python-format msgid "Based On" -msgstr "" +msgstr "Basert på" #. module: web #. openerp-web #: code:addons/web/static/src/xml/base.xml:250 #, python-format msgid "Become Superuser" -msgstr "" +msgstr "Bli superbruker" #. module: web #: code:addons/web/controllers/main.py:1538 @@ -645,6 +656,8 @@ msgid "" "Binary fields can not be exported to Excel unless their content is " "base64-encoded. That does not seem to be the case for %s." msgstr "" +"Binærfelter kan ikke eksporteres til Excel med mindre de er base64-kodet. " +"Det ser ikke ut til å være tilfellet for %s." #. module: web #. openerp-web @@ -693,7 +706,7 @@ msgstr "Bytes, Kb, Mb, Gb, Tb, Pb, Eb, Zb, Yb" #: code:addons/web/static/src/xml/base.xml:1222 #, python-format msgid "CLEAR" -msgstr "" +msgstr "NULLSTILL" #. module: web #. openerp-web @@ -736,7 +749,7 @@ msgstr "Kan ikke vise diagram med modus:" #: code:addons/web/static/src/js/views/kanban/kanban_record.js:414 #, python-format msgid "Card color: %s" -msgstr "" +msgstr "Kortfarge: %s" #. module: web #. openerp-web @@ -811,7 +824,7 @@ msgstr "Kolonnetittel" #: code:addons/web/static/src/xml/base.xml:1185 #, python-format msgid "Compare To" -msgstr "" +msgstr "Sammenlign med" #. module: web #. openerp-web @@ -899,7 +912,7 @@ msgstr "Kopier hele feilmeldingen til utklippstavle" #: code:addons/web/static/src/js/core/ajax.js:372 #, python-format msgid "Could not connect to the server" -msgstr "" +msgstr "Kan ikke koble til Server" #. module: web #. openerp-web @@ -994,7 +1007,7 @@ msgstr "Opprett:" #: code:addons/web/static/src/js/views/calendar/calendar_controller.js:245 #, python-format msgid "Create: %s" -msgstr "" +msgstr "Opprett: %s" #. module: web #: model:ir.model.fields,field_description:web.field_report_layout__create_uid @@ -1032,7 +1045,7 @@ msgstr "Opprettet av:" #: code:addons/web/static/src/xml/base.xml:919 #, python-format msgid "Current state" -msgstr "" +msgstr "Nåværende status" #. module: web #. openerp-web @@ -1048,7 +1061,7 @@ msgstr "Tilpasset filter" #: code:addons/web/static/src/xml/kanban.xml:88 #, python-format msgid "Dark blue" -msgstr "" +msgstr "Mørk blå" #. module: web #. openerp-web @@ -1057,7 +1070,7 @@ msgstr "" #: code:addons/web/static/src/xml/kanban.xml:85 #, python-format msgid "Dark purple" -msgstr "" +msgstr "Mørk lilla" #. module: web #: model_terms:ir.ui.view,arch_db:web.login @@ -1111,14 +1124,14 @@ msgstr "Slett" #: code:addons/web/static/src/xml/base.xml:614 #, python-format msgid "Delete node" -msgstr "" +msgstr "Slett node" #. module: web #. openerp-web #: code:addons/web/static/src/js/views/list/list_editable_renderer.js:557 #, python-format msgid "Delete row " -msgstr "" +msgstr "Slett rad" #. module: web #. openerp-web @@ -1234,7 +1247,7 @@ msgstr "Last ned .xls-fil" #: code:addons/web/static/src/xml/base.xml:1556 #, python-format msgid "Dropdown menu" -msgstr "" +msgstr "Nedtrekksmeny" #. module: web #. openerp-web @@ -1295,7 +1308,7 @@ msgstr "Rediger stadium" #: code:addons/web/static/src/xml/base.xml:276 #, python-format msgid "Edit View:" -msgstr "" +msgstr "Rediger visning:" #. module: web #. openerp-web @@ -1334,7 +1347,7 @@ msgstr "Feil, passord ikke endret!" #: code:addons/web/static/src/xml/kanban.xml:62 #, python-format msgid "Esc to discard" -msgstr "" +msgstr "Klikk Esc for å forkaste" #. module: web #. openerp-web @@ -1369,7 +1382,7 @@ msgstr "Utvid alle" #: code:addons/web/static/src/xml/base.xml:1433 #, python-format msgid "Expand parents" -msgstr "" +msgstr "Utvid overordnede" #. module: web #. openerp-web @@ -1390,7 +1403,7 @@ msgstr "Eksporter data" #: code:addons/web/static/src/xml/base.xml:1400 #, python-format msgid "Export Format:" -msgstr "" +msgstr "Eksportformat:" #. module: web #. openerp-web @@ -1413,14 +1426,14 @@ msgstr "Ekstern ID" #: code:addons/web/static/src/xml/base.xml:826 #, python-format msgid "External link" -msgstr "" +msgstr "Ekstern link" #. module: web #. openerp-web #: code:addons/web/static/src/xml/base.xml:1220 #, python-format msgid "FILTER" -msgstr "" +msgstr "FILTER" #. module: web #. openerp-web @@ -1534,7 +1547,7 @@ msgstr "Minimer" #: code:addons/web/static/src/xml/base.xml:756 #, python-format msgid "Followed by" -msgstr "" +msgstr "Følges av" #. module: web #. openerp-web @@ -1561,7 +1574,7 @@ msgstr "Skjema" #: code:addons/web/static/src/js/views/search/filters_menu.js:179 #, python-format msgid "From %s To %s" -msgstr "" +msgstr "Fra %s til %s" #. module: web #. openerp-web @@ -1570,7 +1583,7 @@ msgstr "" #: code:addons/web/static/src/xml/kanban.xml:89 #, python-format msgid "Fushia" -msgstr "" +msgstr "Fushia" #. module: web #. openerp-web @@ -1591,7 +1604,7 @@ msgstr "" #: code:addons/web/static/src/js/views/kanban/kanban_column_quick_create.js:189 #, python-format msgid "Got it" -msgstr "" +msgstr "OK" #. module: web #. openerp-web @@ -1628,56 +1641,56 @@ msgstr "Grupper etter: %s" #. module: web #: model:ir.model,name:web.model_ir_http msgid "HTTP Routing" -msgstr "" +msgstr "HTTP-ruting" #. module: web #. openerp-web #: code:addons/web/static/src/xml/base.xml:877 #, python-format msgid "Hide in Kanban" -msgstr "" +msgstr "Gjem i kanban" #. module: web #. openerp-web #: code:addons/web/static/src/xml/base.xml:432 #, python-format msgid "Hit DOWN to navigate to the list below" -msgstr "" +msgstr "Klikk NED for å navigere til listen under" #. module: web #. openerp-web #: code:addons/web/static/src/xml/base.xml:439 #, python-format msgid "Hit ENTER to" -msgstr "" +msgstr "Klikk ENTER for å" #. module: web #. openerp-web #: code:addons/web/static/src/xml/base.xml:431 #, python-format msgid "Hit ENTER to CREATE" -msgstr "" +msgstr "Klikk ENTER for å OPPRETTE" #. module: web #. openerp-web #: code:addons/web/static/src/xml/base.xml:423 #, python-format msgid "Hit ENTER to SAVE" -msgstr "" +msgstr "Klikk ENTER for å LAGRE" #. module: web #. openerp-web #: code:addons/web/static/src/xml/base.xml:424 #, python-format msgid "Hit ESCAPE to DISCARD" -msgstr "" +msgstr "Klikk ESCAPE for å FORKASTE" #. module: web #. openerp-web #: code:addons/web/static/src/xml/colorpicker.xml:41 #, python-format msgid "Hue" -msgstr "" +msgstr "Kulør" #. module: web #. openerp-web @@ -1745,7 +1758,7 @@ msgstr "Ugyldig domene" #: code:addons/web/static/src/xml/base.xml:737 #, python-format msgid "Invalid field chain" -msgstr "" +msgstr "Ugyldig feltkjede" #. module: web #. openerp-web @@ -1793,21 +1806,21 @@ msgstr "Språk" #: code:addons/web/static/src/js/views/search/time_range_menu_options.js:9 #, python-format msgid "Last 30 Days" -msgstr "" +msgstr "Siste 30 dager" #. module: web #. openerp-web #: code:addons/web/static/src/js/views/search/time_range_menu_options.js:10 #, python-format msgid "Last 365 Days" -msgstr "" +msgstr "Siste 365 dager" #. module: web #. openerp-web #: code:addons/web/static/src/js/views/search/time_range_menu_options.js:8 #, python-format msgid "Last 7 Days" -msgstr "" +msgstr "Siste 7 dager" #. module: web #: model:ir.model.fields,field_description:web.field_report_layout____last_update @@ -1880,14 +1893,14 @@ msgstr "Forlat utviklerverktøy" #: code:addons/web/static/src/xml/kanban.xml:84 #, python-format msgid "Light blue" -msgstr "" +msgstr "Lys blå" #. module: web #. openerp-web #: code:addons/web/static/src/xml/colorpicker.xml:49 #, python-format msgid "Lightness %" -msgstr "" +msgstr "Lystetthet %" #. module: web #. openerp-web @@ -1930,7 +1943,7 @@ msgstr "Laster inn (%d)" #: code:addons/web/static/src/xml/base.xml:1466 #, python-format msgid "Loading, please wait..." -msgstr "" +msgstr "Laster, vennligst vent..." #. module: web #. openerp-web @@ -1950,7 +1963,7 @@ msgstr "Logg inn" #. module: web #: model_terms:ir.ui.view,arch_db:web.login msgid "Log in as superuser" -msgstr "" +msgstr "Logg inn som superbruker" #. module: web #. openerp-web @@ -1993,7 +2006,7 @@ msgstr "Epost:" #: code:addons/web/static/src/xml/base.xml:271 #, python-format msgid "Manage Attachments" -msgstr "" +msgstr "Administrer vedlegg" #. module: web #: model_terms:ir.ui.view,arch_db:web.login_layout @@ -2013,7 +2026,7 @@ msgstr "Administrer filtre" #: code:addons/web/static/src/xml/base.xml:639 #, python-format msgid "Match" -msgstr "" +msgstr "Match" #. module: web #. openerp-web @@ -2051,7 +2064,7 @@ msgstr "Mål" #: code:addons/web/static/src/xml/kanban.xml:87 #, python-format msgid "Medium blue" -msgstr "" +msgstr "Medium blå" #. module: web #. openerp-web @@ -2196,7 +2209,7 @@ msgstr "Ingen oppdatering:" #: code:addons/web/static/src/js/tools/debug_manager.js:359 #, python-format msgid "No attachment available" -msgstr "" +msgstr "Ingen vedlegg tilgjengelig" #. module: web #. openerp-web @@ -2204,7 +2217,7 @@ msgstr "" #: code:addons/web/static/src/xml/kanban.xml:80 #, python-format msgid "No color" -msgstr "" +msgstr "Ingen farge" #. module: web #. openerp-web @@ -2255,7 +2268,7 @@ msgstr "" #: code:addons/web/static/src/xml/base.xml:927 #, python-format msgid "Not active state, click to change it" -msgstr "" +msgstr "Ikke aktiv tilstand, klikk for å endre den" #. module: web #. openerp-web @@ -2363,7 +2376,7 @@ msgstr "Ved endring:" #: code:addons/web/static/src/js/fields/basic_fields.js:2283 #, python-format msgid "Only Integer Value should be valid." -msgstr "" +msgstr "Kun heltall er gyldig verdi" #. module: web #: code:addons/web/controllers/main.py:502 @@ -2384,7 +2397,7 @@ msgstr "Bare deg" #: code:addons/web/static/src/xml/colorpicker.xml:55 #, python-format msgid "Opacity %" -msgstr "" +msgstr "Gjennomsiktighet %" #. module: web #. openerp-web @@ -2405,7 +2418,7 @@ msgstr "Åpne utviklerverktøy" #: code:addons/web/static/src/xml/base.xml:241 #, python-format msgid "Open View" -msgstr "" +msgstr "Åpne Visning" #. module: web #. openerp-web @@ -2452,7 +2465,7 @@ msgstr "Åpne: " #: code:addons/web/static/src/xml/kanban.xml:82 #, python-format msgid "Orange" -msgstr "" +msgstr "Oransje" #. module: web #: model_terms:ir.ui.view,arch_db:web.external_layout_background @@ -2488,7 +2501,7 @@ msgstr "Telefon:" #: code:addons/web/static/src/js/widgets/colorpicker.js:33 #, python-format msgid "Pick a color" -msgstr "" +msgstr "Velg en farge" #. module: web #. openerp-web @@ -2505,6 +2518,8 @@ msgid "" "Pie chart cannot display all zero numbers.. Try to change your domain to " "display positive results" msgstr "" +"Kakediagram kan ikke vise kun nullverdier. Forsøk å endre domenet for å vise" +" positive resultater." #. module: web #. openerp-web @@ -2529,7 +2544,7 @@ msgstr "Pivot" #: code:addons/web/static/src/js/views/list/list_renderer.js:352 #, python-format msgid "Please click on the \"save\" button first." -msgstr "" +msgstr "Klikk på 'Lagre'-knappen først." #. module: web #. openerp-web @@ -2557,7 +2572,7 @@ msgstr "Velg hvilke felt som skal lagres i eksportlisten..." #: code:addons/web/static/src/xml/base.xml:1525 #, python-format msgid "Please update translations of :" -msgstr "" +msgstr "Oppdater oversettelse for:" #. module: web #. openerp-web @@ -2592,12 +2607,12 @@ msgstr "Forhåndsvis intern rapport" #. module: web #: model:ir.model.fields,field_description:web.field_report_layout__image msgid "Preview image src" -msgstr "" +msgstr "Forhåndsvis bildelink" #. module: web #: model:ir.model.fields,field_description:web.field_report_layout__pdf msgid "Preview pdf src" -msgstr "" +msgstr "Forhåndsvis pdf-link" #. module: web #. openerp-web @@ -2650,12 +2665,12 @@ msgstr "Kvartal" #: code:addons/web/static/src/xml/kanban.xml:32 #, python-format msgid "Quick add" -msgstr "" +msgstr "Hurtigopprett" #. module: web #: model:ir.model,name:web.model_ir_qweb_field_image msgid "Qweb Field Image" -msgstr "" +msgstr "Qweb Felt-bilde" #. module: web #. openerp-web @@ -2679,7 +2694,7 @@ msgstr "Rød" #: code:addons/web/static/src/xml/base.xml:249 #, python-format msgid "Regenerate Assets Bundles" -msgstr "" +msgstr "Regenerer Ressursbunt" #. module: web #. openerp-web @@ -2693,7 +2708,7 @@ msgstr "Relasjon ikke tillatt" #: code:addons/web/static/src/xml/base.xml:771 #, python-format msgid "Relation to follow" -msgstr "" +msgstr "Relasjon å følge" #. module: web #. openerp-web @@ -2730,7 +2745,7 @@ msgstr "Fjern fra favoritter" #: code:addons/web/static/src/xml/base.xml:696 #, python-format msgid "Remove tag" -msgstr "" +msgstr "Fjern tag" #. module: web #. openerp-web @@ -2749,14 +2764,14 @@ msgstr "Rapport" #. module: web #: model:ir.model,name:web.model_report_layout msgid "Report Layout" -msgstr "" +msgstr "Rapportlayout" #. module: web #. openerp-web #: code:addons/web/static/src/js/services/crash_manager.js:223 #, python-format msgid "Request timeout" -msgstr "" +msgstr "Forespørsel timet ut" #. module: web #. openerp-web @@ -2770,7 +2785,7 @@ msgstr "Gjenopprett" #: code:addons/web/static/src/xml/base.xml:240 #, python-format msgid "Run Click Everywhere Test" -msgstr "" +msgstr "Kjør Click Everywhere test" #. module: web #. openerp-web @@ -2791,7 +2806,7 @@ msgstr "Kjør JS-tester" #: code:addons/web/static/src/xml/base.xml:1226 #, python-format msgid "SEE RESULT" -msgstr "" +msgstr "SE RESULTAT" #. module: web #. openerp-web @@ -2800,14 +2815,14 @@ msgstr "" #: code:addons/web/static/src/xml/kanban.xml:86 #, python-format msgid "Salmon pink" -msgstr "" +msgstr "Lakserosa" #. module: web #. openerp-web #: code:addons/web/static/src/xml/colorpicker.xml:45 #, python-format msgid "Saturation %" -msgstr "" +msgstr "Fargetetthet %" #. module: web #. openerp-web @@ -2826,7 +2841,7 @@ msgstr "Lagre" #: code:addons/web/static/src/js/views/view_dialogs.js:137 #, python-format msgid "Save & Close" -msgstr "" +msgstr "Lagre og lukk" #. module: web #. openerp-web @@ -2952,6 +2967,8 @@ msgid "" "Select <i class=\"fa fa-database\" role=\"img\" aria-label=\"Database\" " "title=\"Database\"/>" msgstr "" +"Velg <i class=\"fa fa-database\" role=\"img\" aria-label=\"Database\" " +"title=\"Database\"/>" #. module: web #. openerp-web @@ -3135,6 +3152,8 @@ msgid "" "The field chain is not valid. Did you maybe use a non-existing field name or" " followed a non-relational field?" msgstr "" +"Feltkjeden er ikke gyldig. Brukte du kanskje et ikkeeksisterende felt, eller" +" fulgte et ikke-relasjonelt felt?" #. module: web #. openerp-web @@ -3172,6 +3191,8 @@ msgid "" "The operation was interrupted. This usually means that the current operation" " is taking too much time." msgstr "" +"Operasjonen ble avbrutt. Dette betyr som regel at den nåværende operasjonen " +"tar for mye tid." #. module: web #. openerp-web @@ -3253,6 +3274,7 @@ msgstr "Dette år" #, python-format msgid "This date is on the future. Make sure it is what you expected." msgstr "" +"Dette datoen er i fremtiden. Vær sikker på at det er dette du forventet." #. module: web #. openerp-web @@ -3294,7 +3316,7 @@ msgstr "Tidsspenn" #: code:addons/web/static/src/xml/base.xml:1139 #, python-format msgid "Time Ranges" -msgstr "" +msgstr "Tidsintervaller" #. module: web #. openerp-web @@ -3305,6 +3327,9 @@ msgid "" "one. The time in Odoo is displayed according to the timezone set on your " "user's preferences." msgstr "" +"Tidssonefeil : Tidssonen i nettleseren din stemmer ikke med den valgte " +"tidssonen. Tiden i Odoo vises i henhold til tidssonen du har satt i " +"brukerens innstillinger." #. module: web #. openerp-web @@ -3352,6 +3377,8 @@ msgid "" "Try to add some records, or make sure\n" " that there is at least one measure and no active filter in the search bar." msgstr "" +"Prøv å legge til oppføringer, eller forsikre deg om at\n" +" det er minst en måleverdi, og ingen aktive filtre i søkefeltet." #. module: web #. openerp-web @@ -3361,6 +3388,8 @@ msgid "" "Try to add some records, or make sure that there is no active filter in the " "search bar." msgstr "" +"Forsøk å legge til oppføringer, eller forsikre deg om at det ikke finnes " +"aktive filtre i søkefeltet." #. module: web #. openerp-web @@ -3382,7 +3411,7 @@ msgstr "Type:" #, python-format msgid "" "Unable to find Wkhtmltopdf on this system. The report will be shown in html." -msgstr "" +msgstr "Kan ikke finne Wkhtmltopdf på systemet. Rapporten vil vises som html." #. module: web #. openerp-web @@ -3396,7 +3425,7 @@ msgstr "Av-arkiver" #: code:addons/web/static/src/xml/kanban.xml:28 #, python-format msgid "Unarchive All" -msgstr "" +msgstr "Dearkiver alle" #. module: web #. openerp-web @@ -3438,7 +3467,7 @@ msgstr "Ukjent type " #: code:addons/web/static/src/js/views/list/list_editable_renderer.js:556 #, python-format msgid "Unlink row " -msgstr "" +msgstr "Slett rad" #. module: web #. openerp-web @@ -3459,7 +3488,7 @@ msgstr "Uten navn" #: code:addons/web/static/src/xml/base.xml:1393 #, python-format msgid "Update data (import-compatible export)" -msgstr "" +msgstr "Oppdater data (import-kompatibel eksport)" #. module: web #. openerp-web @@ -3473,7 +3502,7 @@ msgstr "Oppgrader nå" #: code:addons/web/static/src/xml/base.xml:1577 #, python-format msgid "Upgrade to enterprise" -msgstr "" +msgstr "Oppgrader til enterprise" #. module: web #. openerp-web @@ -3519,7 +3548,7 @@ msgstr "Bruk som standard" #: code:addons/web/static/src/xml/base.xml:1387 #, python-format msgid "Use data in a spreadsheet (export all data)" -msgstr "" +msgstr "Bruk data i et regneark (eksporter all data)" #. module: web #. openerp-web @@ -3568,7 +3597,7 @@ msgstr "Advarsel" #: code:addons/web/static/src/js/widgets/attach_document.js:87 #, python-format msgid "Warning : You have to save first before attaching a file." -msgstr "" +msgstr "Advarsel : Du må lagre før du legger ved en fil." #. module: web #: model_terms:ir.ui.view,arch_db:web.benchmark_suite @@ -3722,7 +3751,7 @@ msgstr "" msgid "" "You need to start Odoo with at least two workers to print a pdf version of " "the reports." -msgstr "" +msgstr "Du må starte Odoo med minst to workers for å printe pdf-rapporter." #. module: web #. openerp-web @@ -3733,6 +3762,9 @@ msgid "" "to get a correct display of headers and footers as well as support for " "table-breaking between pages." msgstr "" +"Du bør oppgradere versjonen av Wkhtmltopdf til minst 0.12.0 for å kunne få " +"korrekt visning av topp- og bunntekst, samt for å få støtte for tabeller som" +" går over flere sider." #. module: web #. openerp-web @@ -3749,13 +3781,15 @@ msgid "" "Your installation of Wkhtmltopdf seems to be broken. The report will be " "shown in html." msgstr "" +"Din installasjon av Wkhtmltopdf ser ikke ut til å fungere. Rapporten blir " +"vist som HTML." #. module: web #. openerp-web #: code:addons/web/static/src/js/views/kanban/kanban_record.js:246 #, python-format msgid "[No widget %s]" -msgstr "" +msgstr "[Ingen widget %s]" #. module: web #. openerp-web @@ -3804,7 +3838,7 @@ msgstr "alle oppføringer" #: code:addons/web/static/src/js/widgets/domain_selector.js:28 #, python-format msgid "child of" -msgstr "" +msgstr "underordnet av" #. module: web #. openerp-web @@ -3819,7 +3853,7 @@ msgstr "inneholder" #: code:addons/web/static/src/js/widgets/domain_selector.js:24 #, python-format msgid "does not contain" -msgstr "" +msgstr "inneholder ikke" #. module: web #. openerp-web @@ -3912,7 +3946,7 @@ msgstr "er ikke" #: code:addons/web/static/src/js/widgets/domain_selector.js:18 #, python-format msgid "is not =" -msgstr "" +msgstr "er ikke =" #. module: web #. openerp-web @@ -4047,7 +4081,7 @@ msgstr "eller" #: code:addons/web/static/src/js/widgets/domain_selector.js:29 #, python-format msgid "parent of" -msgstr "" +msgstr "overordnet av" #. module: web #. openerp-web diff --git a/addons/web/i18n/pt_BR.po b/addons/web/i18n/pt_BR.po index 1fd37f82ff9..adf20a58ea5 100644 --- a/addons/web/i18n/pt_BR.po +++ b/addons/web/i18n/pt_BR.po @@ -3,30 +3,32 @@ # * web # # Translators: -# Rodrigo de Almeida Sottomaior Macedo <rmsolucoeseminformatic4@gmail.com>, 2018 -# danimaribeiro <danimaribeiro@gmail.com>, 2018 -# Martin Trigaux, 2018 -# Mateus Lopes <mateus1@gmail.com>, 2018 -# Luiz Carlos de Lima <luiz.carlos@akretion.com.br>, 2018 # Thiago MACÊDO <thiago95macedo@gmail.com>, 2018 -# falexandresilva <falexandresilva@gmail.com>, 2018 -# grazziano <gra.negocia@gmail.com>, 2018 # Marcos Abreu <marcoos.abreu@gmail.com>, 2018 -# Diego Bittencourt <diegomb86@gmail.com>, 2018 +# Luiz Carlos de Lima <luiz.carlos@akretion.com.br>, 2018 # Adriel Kotviski <kotviski@gmail.com>, 2018 -# Silmar <pinheirosilmar@gmail.com>, 2018 +# falexandresilva <falexandresilva@gmail.com>, 2018 +# Diego Bittencourt <diegomb86@gmail.com>, 2018 +# Rodrigo de Almeida Sottomaior Macedo <rmsolucoeseminformatic4@gmail.com>, 2018 +# danimaribeiro <danimaribeiro@gmail.com>, 2018 # André Augusto Firmino Cordeiro <a.cordeito@gmail.com>, 2018 +# Silmar <pinheirosilmar@gmail.com>, 2018 +# Martin Trigaux, 2018 # Luciano Giacomazzi <lucianogiacomazzi@gmail.com>, 2018 -# Maicon Grahl <maicongrahl@hotmail.com>, 2018 +# grazziano <gra.negocia@gmail.com>, 2018 # Franciele Neiva <franciele.neiva@br.ey.com>, 2018 +# Mateus Lopes <mateus1@gmail.com>, 2018 +# Maicon Grahl <maicongrahl@hotmail.com>, 2018 # Yannick Belot <yannickbh@gmail.com>, 2018 +# Rafael H L Moretti <rafael.moretti@gmail.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" -"PO-Revision-Date: 2018-10-08 06:49+0000\n" -"Last-Translator: Yannick Belot <yannickbh@gmail.com>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:33+0000\n" +"Last-Translator: Rafael H L Moretti <rafael.moretti@gmail.com>, 2018\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/odoo/teams/41243/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1737,6 +1739,8 @@ msgid "" "Invalid database name. Only alphanumerical characters, underscore, hyphen " "and dot are allowed." msgstr "" +"Nome de base de dados inválido. Apenas caracteres alfanuméricos, subtraço, " +"hífen e ponto são permitidos." #. module: web #. openerp-web @@ -3821,7 +3825,7 @@ msgstr "contém" #: code:addons/web/static/src/js/widgets/domain_selector.js:24 #, python-format msgid "does not contain" -msgstr "" +msgstr "não contém" #. module: web #. openerp-web diff --git a/addons/web/static/lib/py.js/lib/py.js b/addons/web/static/lib/py.js/lib/py.js index 06d834321de..bd794323995 100644 --- a/addons/web/static/lib/py.js/lib/py.js +++ b/addons/web/static/lib/py.js/lib/py.js @@ -282,7 +282,10 @@ var py = {}; var name_pattern = new RegExp('^' + Name + '$'); var strip = new RegExp('^' + Whitespace); return function tokenize(s) { - var max=s.length, tokens = [], start, end = undefined; + s = s + .replace(/\\\"/g, '\\u0022') // for double quote + .replace(/\\\'/g, '\\u0027'); // for single quote + var max=s.length, tokens = [], start, end; // /g flag makes repeated exec() have memory var pseudoprog = new RegExp(PseudoToken, 'g'); @@ -302,7 +305,6 @@ var py = {}; end = pseudoprog.lastIndex; // strip leading space caught by Whitespace var token = s.slice(start, end).replace(strip, ''); - var initial = token[0]; if (number_pattern.test(token)) { tokens.push(create(symbols['(number)'], { @@ -310,9 +312,13 @@ var py = {}; })); } else if (string_pattern.test(token)) { var m = string_pattern.exec(token); + var value = (m[3] !== undefined ? m[3] : m[5]); + value + .replace(/\\u0022/g, '"') + .replace(/\\u0027/g, "'"); tokens.push(create(symbols['(string)'], { unicode: !!(m[2] || m[4]), - value: (m[3] !== undefined ? m[3] : m[5]) + value: value })); } else if (token in symbols) { var symbol; diff --git a/addons/web/static/src/js/chrome/action_manager_act_window.js b/addons/web/static/src/js/chrome/action_manager_act_window.js index 04b06377d3f..c1667e9b9e6 100644 --- a/addons/web/static/src/js/chrome/action_manager_act_window.js +++ b/addons/web/static/src/js/chrome/action_manager_act_window.js @@ -635,7 +635,7 @@ ActionManager.include({ _.object(_.reject(_.pairs(env.context), function (pair) { return pair[0].match('^(?:(?:default_|search_default_|show_).+|' + '.+_view_ref|group_by|group_by_no_leaf|active_id|' + - 'active_ids)$') !== null; + 'active_ids|orderedBy)$') !== null; })) ); ctx.add(actionData.context || {}); diff --git a/addons/web/static/src/js/views/graph/graph_renderer.js b/addons/web/static/src/js/views/graph/graph_renderer.js index fe4efab1b20..38c2f02351e 100644 --- a/addons/web/static/src/js/views/graph/graph_renderer.js +++ b/addons/web/static/src/js/views/graph/graph_renderer.js @@ -337,8 +337,8 @@ return AbstractRenderer.extend({ var self = this; // Remove Undefined of first GroupBy - var graphData = _.filter(this.state.data, function(elem){ - return elem.labels[0] !== undefined; + var graphData = _.filter(this.state.data, function (elem) { + return elem.labels[0] !== undefined && elem.labels[0] !== _t("Undefined"); }); // undefined label value becomes a string 'Undefined' translated @@ -391,10 +391,9 @@ return AbstractRenderer.extend({ var tick = 0; var serie, tickLabel; var identity = function (p) {return p;}; - - for (var i = 0; i < this.state.data.length; i++) { + for (var i = 0; i < graphData.length; i++) { if (graphData[i].labels[0] !== tickLabel) { - tickLabel = this.state.data[i].labels[0]; + tickLabel = graphData[i].labels[0]; ticksLabels.push(tickLabel); tick++; } diff --git a/addons/web/static/src/js/views/pivot/pivot_view.js b/addons/web/static/src/js/views/pivot/pivot_view.js index 38d8d80a9d7..5e05a2fe7e7 100644 --- a/addons/web/static/src/js/views/pivot/pivot_view.js +++ b/addons/web/static/src/js/views/pivot/pivot_view.js @@ -70,9 +70,6 @@ var PivotView = AbstractView.extend({ widgets[name] = field.attrs.widget; } - if (field.attrs.string) { - measures[name].string = field.attrs.string; - } if (field.attrs.invisible && py.eval(field.attrs.invisible)) { delete measures[name]; @@ -89,6 +86,11 @@ var PivotView = AbstractView.extend({ if (field.attrs.type === 'measure' && !(field.attrs.name in measures)) { measures[field.attrs.name] = self.fields[field.attrs.name]; } + + if (field.attrs.string) { + measures[name].string = field.attrs.string; + } + if (field.attrs.type === 'measure' || 'operator' in field.attrs) { activeMeasures.push(name); measures[name] = self.fields[name]; diff --git a/addons/web/static/src/scss/layout_background.scss b/addons/web/static/src/scss/layout_background.scss index ff2d0cef3b0..9c47ac72a27 100644 --- a/addons/web/static/src/scss/layout_background.scss +++ b/addons/web/static/src/scss/layout_background.scss @@ -34,34 +34,48 @@ background-position: bottom center; background-repeat: no-repeat; min-height: 620px; + + .table { + border-top: 1px solid gray('300'); + } + + .table td, .table th { + border-top: none; + } thead tr th, h2 { color: $o-brand-odoo; } tbody { color: gray('700'); - tr:nth-child(odd) { - background-color: rgba(220, 205, 216, 0.2); - } - tr td { - border-top: none; + tr { + &:nth-child(odd) { + background-color: rgba(220, 205, 216, 0.2); + } + &.o_line_section { + color: $o-brand-odoo; + background-color: rgba(73, 80, 87, 0.2) !important; + } } } /*Total table*/ - .row > .col-4 > table { - tr:nth-child(odd) { - background-color: transparent !important; - } - tr:first-child td { - /*we could get rid of this rule if .border-black td would be terminated in report.scss*/ - border-top: none !important; - } - tr:last-child td { - color: $o-brand-odoo; - } - } - #total { - table tr:last-child td { - border-bottom: 1px solid black; + /* row div rule compat 12.0 */ + .row > div > table, + div#total table { + tr { + &:nth-child(odd) { + background-color: transparent !important; + } + /* first-child & last-child rule compat 12.0 */ + &:first-child, + &:last-child, + &.o_subtotal, + &.o_total { + border-top: none !important; + td { + color: $o-brand-odoo; + border-top: 1px solid gray('400') !important; + } + } } } } diff --git a/addons/web/static/src/scss/layout_boxed.scss b/addons/web/static/src/scss/layout_boxed.scss index b0b2fb1f743..bf19b6fb7ae 100644 --- a/addons/web/static/src/scss/layout_boxed.scss +++ b/addons/web/static/src/scss/layout_boxed.scss @@ -23,52 +23,73 @@ } } .o_report_layout_boxed { - // This is not a general rule since the id is not used in all the reports, - // we should make a general structure for report body to use it everywhere - #informations { - border: 1px solid gray('700'); - padding-top: 10px; - margin: 0; - } > h2 { text-transform: uppercase; } table { border: 1px solid gray('700'); thead { + border-bottom: 2px solid gray('700'); tr th { - border-bottom: 3px solid gray('700') !important; text-transform: uppercase; + border: 1px solid gray('700'); } } tbody { color: gray('700'); tr { td { + // remove border-top from standard layout border-top: none; border-right: 1px solid gray('700'); } - td:last-child { + &.o_line_section td, + &.o_line_note td, + &.is-subtotal td { + border-top: 1px solid gray('700'); + border-bottom: 1px solid gray('700'); + } + &.o_line_section td { + background-color: gray('700'); + color: #fff; + } + &.is-subtotal, + td.o_price_total { background-color: gray('200'); } } } } + /* compat 12.0 */ + .page > table:not(.o_main_table) tr td:last-child { + background-color: gray('200'); + } + /* compat 12.0 */ + .row:not(#total) > div > table tr:not(:first-child):not(:last-child) td:last-child { + background-color: gray('200'); + } /*Total table*/ - .row > .col-4 > table { - td { - border-right: none; - } - tr:last-child td, tr:first-child td { - /*we could get rid of this rule if .border-black td would be terminated in report.scss*/ - border-top: none !important; - } - tr:first-child td { - background-color: transparent; - } - tr:last-child td { - background-color: gray('700'); - color: #fff; + /* row div rule compat 12.0 */ + .row > div > table, + div#total table { + tr { + &:first-child, + &.o_subtotal { + border-bottom: 1px solid gray('700'); + + td:first-child { + border-right: none; + } + } + &:last-child td, + &.o_total td { + background-color: gray('700'); + color: #fff; + + &:first-child { + border-right: none; + } + } } } } diff --git a/addons/web/static/src/scss/layout_clean.scss b/addons/web/static/src/scss/layout_clean.scss index 06b2e808dd4..910abc763a4 100644 --- a/addons/web/static/src/scss/layout_clean.scss +++ b/addons/web/static/src/scss/layout_clean.scss @@ -18,12 +18,10 @@ font-weight: bolder; } .pagenumber { - width: 35px; - height: 35px; border: 3px solid $o-brand-odoo; background-color: $o-brand-primary; color: white; - padding-top: 6px; + padding: 4px 8px; text-align: center; } } @@ -36,6 +34,10 @@ color: $o-brand-odoo; } table { + &.o_main_table { + margin-bottom: 0; + } + thead { color: $o-brand-odoo; tr th { @@ -66,18 +68,22 @@ } } /*Total table*/ - .row > .col-4 { - width: 43%; - position: relative; - top: -20px; - > table { - tr:last-child td { - border-top: 1px solid gray('200') !important; - } - tr:first-child td { - /*we could get rid of this rule if .border-black td would be terminated in report.scss*/ + /* compat 12.0 */ + .row:not(#total) > div:has(table) { + top: -16px; + } + /* row col rule compat 12.0 */ + .row > div > table, + div#total table { + tr { + &:first-child td, + &.o_subtotal { border-top: none !important; } + &:last-child td, + &.o_total { + border-top: 1px solid gray('200') !important; + } } } } diff --git a/addons/web/static/src/scss/report.scss b/addons/web/static/src/scss/report.scss index 37a7630225b..e901b5b9364 100644 --- a/addons/web/static/src/scss/report.scss +++ b/addons/web/static/src/scss/report.scss @@ -44,3 +44,18 @@ body { .o_underline { text-decoration: underline; } + +/*Total table*/ +div#total { + page-break-inside: avoid; + table { + tr { + &.o_subtotal, + &.o_total { + td { + border-top: 1px solid black !important; + } + } + } + } +} diff --git a/addons/web/static/tests/chrome/action_manager_tests.js b/addons/web/static/tests/chrome/action_manager_tests.js index 6c0b0d96703..7eea78ded29 100644 --- a/addons/web/static/tests/chrome/action_manager_tests.js +++ b/addons/web/static/tests/chrome/action_manager_tests.js @@ -2202,6 +2202,62 @@ QUnit.module('ActionManager', { actionManager.destroy(); }); + QUnit.test('orderedBy in context is not propagated when executing another action', function (assert) { + assert.expect(6); + + this.data.partner.fields.foo.sortable = true, + + this.archs['partner,false,form'] = '<header>' + + '<button name="8" string="Execute action" type="action"/>' + + '</header>'; + + var searchReadCount = 0; + var actionManager = createActionManager({ + actions: this.actions, + archs: this.archs, + data: this.data, + mockRPC: function (route, args) { + if (route === '/web/dataset/search_read') { + if (searchReadCount === 1) { + assert.strictEqual(args.model, 'partner'); + assert.notOk(args.sort); + } + if (searchReadCount === 2) { + assert.strictEqual(args.model, 'partner'); + assert.strictEqual(args.sort, "foo ASC"); + } + if (searchReadCount === 3) { + assert.strictEqual(args.model, 'pony'); + assert.notOk(args.sort); + } + searchReadCount += 1; + } + return this._super.apply(this, arguments); + }, + }); + actionManager.doAction(3); + + // Simulate the activation of a filter + var searchData = { + domains: [[["foo", "=", "yop"]]], + contexts: [{ + orderedBy: [], + }], + }; + actionManager.trigger_up('search', searchData); + + // Sort records + actionManager.$('.o_list_view th.o_column_sortable').click(); + + // get to the form view of the model, on the first record + actionManager.$('.o_data_cell:first').click(); + + // Change model by clicking on the button within the form + actionManager.$('.o_form_view button').click(); + + actionManager.destroy(); + }); + QUnit.test('breadcrumbs are updated when switching between views', function (assert) { assert.expect(10); diff --git a/addons/web/static/tests/core/py_utils_tests.js b/addons/web/static/tests/core/py_utils_tests.js index d59fd30f957..be5760fc6c7 100644 --- a/addons/web/static/tests/core/py_utils_tests.js +++ b/addons/web/static/tests/core/py_utils_tests.js @@ -1254,6 +1254,13 @@ QUnit.module('core', function () { assert.checkAST(expr); }); + QUnit.test("parse escaped quoted strings", function (assert) { + assert.expect(2); + + assert.checkAST(`'\"'`, "a string containing \""); + assert.checkAST(`'\'`, "a string containing \'"); + }); + QUnit.module('pyutils (_normalizeDomain)'); QUnit.assert.checkNormalization = function (domain, normalizedDomain) { diff --git a/addons/web/static/tests/views/graph_tests.js b/addons/web/static/tests/views/graph_tests.js index 73f2179dc8f..d651afc030c 100644 --- a/addons/web/static/tests/views/graph_tests.js +++ b/addons/web/static/tests/views/graph_tests.js @@ -785,13 +785,40 @@ QUnit.module('Views', { '</graph>', }); - assert.strictEqual(graph.$("svg.nvd3-svg:contains('Undefined')").length, 0); - assert.strictEqual(graph.$("svg.nvd3-svg:contains('March')").length, 1); + assert.strictEqual(graph.$("svg.nvd3-svg .nv-x:contains('Undefined')").length, 0); + assert.strictEqual(graph.$("svg.nvd3-svg:contains('January')").length, 1); testUtils.dom.click(graph.$buttons.find('.o_graph_button[data-mode=bar]')); - assert.strictEqual(graph.$("svg.nvd3-svg:contains('Undefined')").length, 1); + assert.strictEqual(graph.$("svg.nvd3-svg .nv-x:contains('Undefined')").length, 1); + assert.strictEqual(graph.$("svg.nvd3-svg:contains('January')").length, 1); + + graph.destroy(); + }); + + QUnit.test('Undefined should appear in bar, pie graph but not in line graph with multiple groupbys', function (assert) { + assert.expect(6); + + var graph = createView({ + View: GraphView, + model: "foo", + groupBy:['date', 'color_id'], + data: this.data, + arch: '<graph string="Partners" type="line">' + + '<field name="bar"/>' + + '</graph>', + }); + + assert.strictEqual(graph.$("svg.nvd3-svg .nv-x:contains('Undefined')").length, 0); assert.strictEqual(graph.$("svg.nvd3-svg:contains('January')").length, 1); + graph.$buttons.find('.o_graph_button[data-mode=bar]').click(); + assert.strictEqual(graph.$("svg.nvd3-svg .nv-x:contains('Undefined')").length, 1); + assert.strictEqual(graph.$("svg.nvd3-svg:contains('January')").length, 1); + + // Undefined should not appear after switching back to line chart + graph.$buttons.find('.o_graph_button[data-mode=line]').click(); + assert.strictEqual(graph.$("svg.nvd3-svg .nv-x:contains('Undefined')").length, 0); + assert.strictEqual(graph.$("svg.nvd3-svg:contains('January')").length, 1); graph.destroy(); }); }); diff --git a/addons/web/static/tests/views/pivot_tests.js b/addons/web/static/tests/views/pivot_tests.js index 46c28529bed..3e3ba9fd89a 100644 --- a/addons/web/static/tests/views/pivot_tests.js +++ b/addons/web/static/tests/views/pivot_tests.js @@ -149,6 +149,23 @@ QUnit.module('Views', { pivot.destroy(); }); + QUnit.test('pivot rendering with string attribute on non stored field', function (assert) { + assert.expect(1); + + this.data.partner.fields.fubar = {string: "Fubar", type: "integer", store:false}; + + var pivot = createView({ + View: PivotView, + model: "partner", + data: this.data, + arch: '<pivot string="Partners">' + + '<field name="fubar" string="fubar" type="measure"/>' + + '</pivot>', + }); + assert.ok(pivot.$el.hasClass('o_pivot'),'Non stored fields can have a string attribute'); + pivot.destroy(); + }); + QUnit.test('pivot rendering with invisible attribute on field', function (assert) { assert.expect(2); // when invisible, a field should neither be an active measure, diff --git a/addons/web_diagram/i18n/uk.po b/addons/web_diagram/i18n/uk.po index 054fac5d389..0be71314eab 100644 --- a/addons/web_diagram/i18n/uk.po +++ b/addons/web_diagram/i18n/uk.po @@ -6,12 +6,13 @@ # Martin Trigaux, 2018 # ТАрас <tratatuta@i.ua>, 2018 # Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018 +# msgid "" msgstr "" -"Project-Id-Version: Odoo Server saas~11.2\n" +"Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-03-22 14:11+0000\n" -"PO-Revision-Date: 2018-03-22 14:11+0000\n" +"POT-Creation-Date: 2018-09-18 09:49+0000\n" +"PO-Revision-Date: 2018-08-24 09:33+0000\n" "Last-Translator: Alina Lisnenko <alinasemeniuk1@gmail.com>, 2018\n" "Language-Team: Ukrainian (https://www.transifex.com/odoo/teams/41243/uk/)\n" "MIME-Version: 1.0\n" diff --git a/addons/web_editor/i18n/ja.po b/addons/web_editor/i18n/ja.po index b606b416a82..54758ebe021 100644 --- a/addons/web_editor/i18n/ja.po +++ b/addons/web_editor/i18n/ja.po @@ -3,18 +3,19 @@ # * web_editor # # Translators: -# Martin Trigaux, 2018 -# Yoshi Tashiro <tashiro@roomsfor.hk>, 2018 # Manami Hashi <manami@roomsfor.hk>, 2018 # 高木正勝 <masakatsu.takagi@pro-spire.co.jp>, 2018 +# Martin Trigaux, 2018 # Norimichi Sugimoto <norimichi.sugimoto@tls-ltd.co.jp>, 2018 +# Yoshi Tashiro <tashiro@roomsfor.hk>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-02 10:06+0000\n" -"PO-Revision-Date: 2018-10-02 10:06+0000\n" -"Last-Translator: Norimichi Sugimoto <norimichi.sugimoto@tls-ltd.co.jp>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:33+0000\n" +"Last-Translator: Yoshi Tashiro <tashiro@roomsfor.hk>, 2018\n" "Language-Team: Japanese (https://www.transifex.com/odoo/teams/41243/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1027,7 +1028,7 @@ msgstr "プレビュー表示" #: code:addons/web_editor/static/src/xml/editor.xml:68 #, python-format msgid "Previous" -msgstr "" +msgstr "前" #. module: web_editor #. openerp-web diff --git a/addons/web_editor/i18n/nb.po b/addons/web_editor/i18n/nb.po index 417795dce50..44973e24910 100644 --- a/addons/web_editor/i18n/nb.po +++ b/addons/web_editor/i18n/nb.po @@ -3,16 +3,18 @@ # * web_editor # # Translators: -# Martin Trigaux, 2018 # Aleksander, 2018 +# Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-02 10:06+0000\n" -"PO-Revision-Date: 2018-10-02 10:06+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:33+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,27 +30,29 @@ msgid "" "'Alt tag' specifies an alternate text for an image, if the image cannot be " "displayed (slow connection, missing image, screen reader ...)." msgstr "" +"'Alt'-taggen spesifiserer en alternativ tekst for et bilde, om bildet ikke " +"kan vises (treg oppkobling, manglende bilde, skjermleser ...)." #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:44 #, python-format msgid "'Title tag' is shown as a tooltip when you hover the picture." -msgstr "" +msgstr "'Title'-taggen vises som et verktøytips når du holder over bildet." #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:36 #, python-format msgid "(ALT Tag)" -msgstr "" +msgstr "(ALT Tag)" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:45 #, python-format msgid "(TITLE Tag)" -msgstr "" +msgstr "(TITLE Tag)" #. module: web_editor #. openerp-web @@ -77,6 +81,8 @@ msgid "" "A server error occured. Please check you correctly signed in and that the " "file you are saving is correctly formatted." msgstr "" +"En serverfeil oppstod. Forsikre deg om at du er logget inn og at filen du " +"lagrer er korrekt formatert." #. module: web_editor #. openerp-web @@ -144,7 +150,7 @@ msgstr "Alternativ opplasting" #: code:addons/web_editor/static/src/xml/editor.xml:331 #, python-format msgid "Aspect Ratio" -msgstr "" +msgstr "Størrelsesforhold" #. module: web_editor #. openerp-web @@ -168,7 +174,7 @@ msgstr "URL til vedlegg" #: code:addons/web_editor/static/src/xml/editor.xml:197 #, python-format msgid "Attention" -msgstr "" +msgstr "Oppmerksomhet" #. module: web_editor #. openerp-web @@ -267,7 +273,7 @@ msgstr "Endre beskrivelse og hjelpetekst for media" #: code:addons/web_editor/static/src/xml/editor.xml:197 #, python-format msgid "Checked" -msgstr "" +msgstr "Huket av" #. module: web_editor #. openerp-web @@ -312,14 +318,14 @@ msgstr "Kolonne" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:82 #, python-format msgid "Common colors" -msgstr "" +msgstr "Vanlige farger" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:365 #, python-format msgid "Contain" -msgstr "" +msgstr "Begrens" #. module: web_editor #. openerp-web @@ -358,7 +364,7 @@ msgstr "Opprettet" #: code:addons/web_editor/static/src/js/widgets/widgets.js:1628 #, python-format msgid "Crop Image" -msgstr "" +msgstr "Beskjær bilde" #. module: web_editor #. openerp-web @@ -372,7 +378,7 @@ msgstr "Tilpasset" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1068 #, python-format msgid "Custom Color" -msgstr "" +msgstr "Tilpasset farge" #. module: web_editor #. openerp-web @@ -503,14 +509,14 @@ msgstr "Flat" #: code:addons/web_editor/static/src/xml/editor.xml:348 #, python-format msgid "Flip Horizontal" -msgstr "" +msgstr "Vend horisontalt" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:349 #, python-format msgid "Flip Vertical" -msgstr "" +msgstr "Vend vertikalt" #. module: web_editor #. openerp-web @@ -580,12 +586,12 @@ msgstr "Fullskjerm" #: code:addons/web_editor/static/src/xml/backend.xml:21 #, python-format msgid "Fullscreen" -msgstr "" +msgstr "Fullskjerm" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_http msgid "HTTP Routing" -msgstr "" +msgstr "HTTP-ruting" #. module: web_editor #. openerp-web @@ -698,6 +704,8 @@ msgid "" "If you discard the current edition, all unsaved changes will be lost. You " "can cancel to return to the edition mode." msgstr "" +"Hvis du forkaster den nåværende versjonen, vil du miste alle endringer. Du " +"kan avbryte og returnere til redigeringsmodus." #. module: web_editor #. openerp-web @@ -707,6 +715,8 @@ msgid "" "If you reset this file, all your customizations will be lost as it will be " "reverted to the default file." msgstr "" +"Hvis du tilbakestiller denne filen, vil du miste alle tilpasninger, da den " +"vil bli tilbakestilt til originalfilen." #. module: web_editor #. openerp-web @@ -716,6 +726,8 @@ msgid "" "If you want to crop it, please first download it from the original source " "and upload it in Odoo." msgstr "" +"Hvis du vil beskjære det, må du først laste det ned fra originalkilden for " +"så å laste det opp i Odoo." #. module: web_editor #. openerp-web @@ -739,20 +751,22 @@ msgid "" "In this mode, you can only translate texts. To change the structure of the page, you must edit the master page.\n" " Each modification on the master page is automatically applied to all translated versions." msgstr "" +"I denne modusen kan du bare oversette tekst. For å endre strukturen på siden, må du redigere malsiden.\n" +"Alle modifikasjoner på malsiden blir automatisk påført alle oversatte versjoner." #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/ace.xml:31 #, python-format msgid "Include All SCSS Files" -msgstr "" +msgstr "Inkluder alle SCSS-filer" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/ace.xml:22 #, python-format msgid "Include Asset Bundles" -msgstr "" +msgstr "Inkluder ressursbunter" #. module: web_editor #. openerp-web @@ -766,7 +780,7 @@ msgstr "Innrykk" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1034 #, python-format msgid "Insert Horizontal Rule" -msgstr "" +msgstr "Sett inn horisontal strek" #. module: web_editor #. openerp-web @@ -815,7 +829,7 @@ msgstr "Kursiv" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1065 #, python-format msgid "Justify full" -msgstr "" +msgstr "Juster full" #. module: web_editor #. openerp-web @@ -866,7 +880,7 @@ msgstr "Link" #: code:addons/web_editor/static/src/xml/editor.xml:244 #, python-format msgid "Link Label" -msgstr "" +msgstr "Linketikett" #. module: web_editor #. openerp-web @@ -967,28 +981,28 @@ msgstr "Nummerert liste" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1060 #, python-format msgid "Outdent" -msgstr "" +msgstr "Uttrykk" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:270 #, python-format msgid "Outline" -msgstr "" +msgstr "Omriss" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:272 #, python-format msgid "Outline-Rounded" -msgstr "" +msgstr "Avrundet omriss" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:154 #, python-format msgid "Padding" -msgstr "" +msgstr "Polstring" #. module: web_editor #. openerp-web @@ -1037,82 +1051,82 @@ msgstr "Sitat" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb msgid "Qweb" -msgstr "" +msgstr "Qweb" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb_field msgid "Qweb Field" -msgstr "" +msgstr "Qweb-felt" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb_field_contact msgid "Qweb Field Contact" -msgstr "" +msgstr "Qweb-felt Kontakt" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb_field_date msgid "Qweb Field Date" -msgstr "" +msgstr "Qweb-felt Dato" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb_field_datetime msgid "Qweb Field Datetime" -msgstr "" +msgstr "Qweb-felt Datotid" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb_field_duration msgid "Qweb Field Duration" -msgstr "" +msgstr "Qweb-felt Varighet" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb_field_float msgid "Qweb Field Float" -msgstr "" +msgstr "Qweb-felt Desimaltall" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb_field_html msgid "Qweb Field HTML" -msgstr "" +msgstr "Qweb-felt HTML" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb_field_image msgid "Qweb Field Image" -msgstr "" +msgstr "Qweb Felt-bilde" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb_field_integer msgid "Qweb Field Integer" -msgstr "" +msgstr "Qweb-felt Heltall" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb_field_many2one msgid "Qweb Field Many to One" -msgstr "" +msgstr "Qweb-felt Mange til én" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb_field_monetary msgid "Qweb Field Monerary" -msgstr "" +msgstr "Qweb-felt Valuta" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb_field_relative msgid "Qweb Field Relative" -msgstr "" +msgstr "Qweb-felt Relativ" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb_field_selection msgid "Qweb Field Selection" -msgstr "" +msgstr "Qweb-felt Utvalg" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb_field_text msgid "Qweb Field Text" -msgstr "" +msgstr "Qweb-felt Tekst" #. module: web_editor #: model:ir.model,name:web_editor.model_ir_qweb_field_qweb msgid "Qweb Field qweb" -msgstr "" +msgstr "Qweb-felt qweb" #. module: web_editor #. openerp-web @@ -1210,56 +1224,56 @@ msgstr "Tilbakestilling av visninger er ikke støttet enda" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1003 #, python-format msgid "Resize Full" -msgstr "" +msgstr "Endre størrelse full" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1004 #, python-format msgid "Resize Half" -msgstr "" +msgstr "Endre størrelse halv" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:1005 #, python-format msgid "Resize Quarter" -msgstr "" +msgstr "Endre størrelse kvart" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:344 #, python-format msgid "Rotate Left" -msgstr "" +msgstr "Roter til venstre" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:345 #, python-format msgid "Rotate Right" -msgstr "" +msgstr "Roter til høyre" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:271 #, python-format msgid "Rounded" -msgstr "" +msgstr "Avrundet" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/ace.xml:11 #, python-format msgid "SCSS (CSS)" -msgstr "" +msgstr "SCSS (CSS)" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/widgets/ace.js:364 #, python-format msgid "SCSS file: %s" -msgstr "" +msgstr "SCSS-fil: %s" #. module: web_editor #. openerp-web @@ -1291,7 +1305,7 @@ msgstr "Søk etter kontakt" #: code:addons/web_editor/static/src/xml/snippets.xml:13 #, python-format msgid "Select Parent Container" -msgstr "" +msgstr "Velg overordnet beholder" #. module: web_editor #. openerp-web @@ -1336,6 +1350,8 @@ msgid "" "Sets the width and height of the background image in percent of the parent " "element." msgstr "" +"Setter bredde og høyde for bakgrunnsbilde prosentvis i forhold til det " +"overordnede elementet." #. module: web_editor #. openerp-web @@ -1387,14 +1403,14 @@ msgstr "Stil" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:993 #, python-format msgid "Subscript" -msgstr "" +msgstr "Senket skrift" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:994 #, python-format msgid "Superscript" -msgstr "" +msgstr "Hevet skrift" #. module: web_editor #. openerp-web @@ -1469,28 +1485,28 @@ msgstr "Dokumentet er ikke lagret!" #: code:addons/web_editor/static/src/xml/editor.xml:148 #, python-format msgid "This file is a public view attachment" -msgstr "" +msgstr "Denne filen er et offentlig visningsvedlegg" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:149 #, python-format msgid "This file is attached to the current record" -msgstr "" +msgstr "Denne filen er vedlagt nåværende oppføring" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:320 #, python-format msgid "This image is an external image" -msgstr "" +msgstr "Dette er et eksternt bilde" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:321 #, python-format msgid "This type of image is not supported for cropping." -msgstr "" +msgstr "Denne type bilde kan ikke beskjæres" #. module: web_editor #. openerp-web @@ -1708,14 +1724,14 @@ msgstr "YouTube" #: code:addons/web_editor/static/src/xml/editor.xml:340 #, python-format msgid "Zoom In" -msgstr "" +msgstr "Zoom inn" #. module: web_editor #. openerp-web #: code:addons/web_editor/static/src/xml/editor.xml:341 #, python-format msgid "Zoom Out" -msgstr "" +msgstr "Zoom ut" #. module: web_editor #. openerp-web diff --git a/addons/web_editor/i18n/pt_BR.po b/addons/web_editor/i18n/pt_BR.po index d25fdcfbfcb..affe91ffb1f 100644 --- a/addons/web_editor/i18n/pt_BR.po +++ b/addons/web_editor/i18n/pt_BR.po @@ -3,29 +3,31 @@ # * web_editor # # Translators: -# Rodrigo de Almeida Sottomaior Macedo <rmsolucoeseminformatic4@gmail.com>, 2018 # danimaribeiro <danimaribeiro@gmail.com>, 2018 -# Rui Andrada <shingonoide@gmail.com>, 2018 -# Martin Trigaux, 2018 -# Mateus Lopes <mateus1@gmail.com>, 2018 -# Luiz Carlos de Lima <luiz.carlos@akretion.com.br>, 2018 # Thiago MACÊDO <thiago95macedo@gmail.com>, 2018 # Caio Leonardo Mendes de Sousa <caleozao@gmail.com>, 2018 # falexandresilva <falexandresilva@gmail.com>, 2018 -# grazziano <gra.negocia@gmail.com>, 2018 # Thiago Menezes <thg.mnzs@gmail.com>, 2018 # André Augusto Firmino Cordeiro <a.cordeito@gmail.com>, 2018 # Silmar <pinheirosilmar@gmail.com>, 2018 # Pablo Valentini <pablondrina@gmail.com>, 2018 +# Rodrigo de Almeida Sottomaior Macedo <rmsolucoeseminformatic4@gmail.com>, 2018 +# Rui Andrada <shingonoide@gmail.com>, 2018 # Wagner Pereira <wagner@wagner.pereira.nom.br>, 2018 +# Luiz Carlos de Lima <luiz.carlos@akretion.com.br>, 2018 +# Martin Trigaux, 2018 +# Mateus Lopes <mateus1@gmail.com>, 2018 +# grazziano <gra.negocia@gmail.com>, 2018 # Yannick Belot <yannickbh@gmail.com>, 2018 +# Rafael H L Moretti <rafael.moretti@gmail.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-02 10:06+0000\n" -"PO-Revision-Date: 2018-10-02 10:06+0000\n" -"Last-Translator: Yannick Belot <yannickbh@gmail.com>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:33+0000\n" +"Last-Translator: Rafael H L Moretti <rafael.moretti@gmail.com>, 2018\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/odoo/teams/41243/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -459,7 +461,7 @@ msgstr "" #: code:addons/web_editor/static/src/js/editor/rte.summernote.js:966 #, python-format msgid "Double-click to edit" -msgstr "" +msgstr "Clique-duplo para editar" #. module: web_editor #. openerp-web diff --git a/addons/web_editor/static/src/scss/web_editor.ui.scss b/addons/web_editor/static/src/scss/web_editor.ui.scss index ad9da79f788..06e56ee657f 100644 --- a/addons/web_editor/static/src/scss/web_editor.ui.scss +++ b/addons/web_editor/static/src/scss/web_editor.ui.scss @@ -1239,6 +1239,7 @@ body.editor_enable { height: 70%; // in case flex is not supported flex: 1 1 auto; .ace_gutter { + display: block!important; // display even with aria-hidden cursor: ew-resize; .ace_gutter-cell.o_error { diff --git a/addons/web_settings_dashboard/i18n/cs.po b/addons/web_settings_dashboard/i18n/cs.po index 54ff8652d0a..11c74fc04db 100644 --- a/addons/web_settings_dashboard/i18n/cs.po +++ b/addons/web_settings_dashboard/i18n/cs.po @@ -314,7 +314,7 @@ msgstr "Překlady" #: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:102 #, python-format msgid "Twitter" -msgstr "" +msgstr "Twitter" #. module: web_settings_dashboard #. openerp-web diff --git a/addons/web_settings_dashboard/i18n/it.po b/addons/web_settings_dashboard/i18n/it.po index 3888c10d0ec..53d8cc4f10c 100644 --- a/addons/web_settings_dashboard/i18n/it.po +++ b/addons/web_settings_dashboard/i18n/it.po @@ -66,14 +66,14 @@ msgstr "Attiva la modalità sviluppatore (con gli asset)" #: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:64 #, python-format msgid "Active User" -msgstr "Utente attivo" +msgstr "utente attivo" #. module: web_settings_dashboard #. openerp-web #: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:65 #, python-format msgid "Active Users" -msgstr "Utenti attivi" +msgstr "utenti attivi" #. module: web_settings_dashboard #. openerp-web @@ -331,7 +331,7 @@ msgstr "Twitter" #: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:143 #, python-format msgid "Upgrade Now" -msgstr "Aggiorna adesso" +msgstr "Avanza ora" #. module: web_settings_dashboard #. openerp-web diff --git a/addons/web_settings_dashboard/i18n/nb.po b/addons/web_settings_dashboard/i18n/nb.po index 7ed53e3641d..b6e8a6a98d3 100644 --- a/addons/web_settings_dashboard/i18n/nb.po +++ b/addons/web_settings_dashboard/i18n/nb.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-08-24 09:05+0000\n" -"PO-Revision-Date: 2018-08-24 09:05+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"POT-Creation-Date: 2018-09-18 09:49+0000\n" +"PO-Revision-Date: 2018-08-24 09:33+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -177,7 +179,7 @@ msgstr "Inviter nye brukere:" #: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:104 #, python-format msgid "LinkedIn" -msgstr "" +msgstr "LinkedIn" #. module: web_settings_dashboard #. openerp-web @@ -283,14 +285,14 @@ msgstr "Del kjærligheten" #. module: web_settings_dashboard #. openerp-web -#: code:addons/web_settings_dashboard/static/src/js/dashboard.js:115 +#: code:addons/web_settings_dashboard/static/src/js/dashboard.js:116 #, python-format msgid "The following email addresses already exist: %s." msgstr "" #. module: web_settings_dashboard #. openerp-web -#: code:addons/web_settings_dashboard/static/src/js/dashboard.js:104 +#: code:addons/web_settings_dashboard/static/src/js/dashboard.js:105 #, python-format msgid "The following email addresses are invalid: %s." msgstr "" @@ -329,11 +331,11 @@ msgstr "Oppgrader nå" #: code:addons/web_settings_dashboard/static/src/xml/dashboard.xml:141 #, python-format msgid "Upgrade to enterprise" -msgstr "" +msgstr "Oppgrader til enterprise" #. module: web_settings_dashboard #. openerp-web -#: code:addons/web_settings_dashboard/static/src/js/dashboard.js:175 +#: code:addons/web_settings_dashboard/static/src/js/dashboard.js:176 #: model:ir.model,name:web_settings_dashboard.model_res_users #, python-format msgid "Users" diff --git a/addons/web_tour/i18n/nb.po b/addons/web_tour/i18n/nb.po index 28a09e72c59..a6bf949d6bb 100644 --- a/addons/web_tour/i18n/nb.po +++ b/addons/web_tour/i18n/nb.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:18+0000\n" -"PO-Revision-Date: 2018-09-21 13:18+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:33+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -46,7 +48,7 @@ msgstr "Visningsnavn" #. module: web_tour #: model:ir.model,name:web_tour.model_ir_http msgid "HTTP Routing" -msgstr "" +msgstr "HTTP-ruting" #. module: web_tour #: model:ir.model.fields,field_description:web_tour.field_web_tour_tour__id diff --git a/addons/web_unsplash/i18n/nb.po b/addons/web_unsplash/i18n/nb.po index 127df67838d..ed878499107 100644 --- a/addons/web_unsplash/i18n/nb.po +++ b/addons/web_unsplash/i18n/nb.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:18+0000\n" -"PO-Revision-Date: 2018-09-21 13:18+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:33+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -53,7 +55,7 @@ msgstr "Bruk" #. module: web_unsplash #: model:ir.model,name:web_unsplash.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: web_unsplash #. openerp-web diff --git a/addons/website/i18n/cs.po b/addons/website/i18n/cs.po index 24208640abe..5c390d2a6ff 100644 --- a/addons/website/i18n/cs.po +++ b/addons/website/i18n/cs.po @@ -782,7 +782,7 @@ msgstr "O nás" #: code:addons/website/controllers/backend.py:46 #, python-format msgid "Access Error" -msgstr "" +msgstr "Chyba přístupu" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_comparisons @@ -1958,7 +1958,7 @@ msgstr "" #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form msgid "GitHub" -msgstr "" +msgstr "GitHub" #. module: website #: model:ir.model.fields,field_description:website.field_res_config_settings__social_github @@ -2021,7 +2021,7 @@ msgstr "Google Analytics" #. module: website #: model:ir.model.fields,field_description:website.field_res_config_settings__has_google_analytics_dashboard msgid "Google Analytics Dashboard" -msgstr "" +msgstr "Dashboard Google Analytics" #. module: website #: model:ir.model.fields,field_description:website.field_res_config_settings__google_analytics_key @@ -2065,7 +2065,7 @@ msgstr "" #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form msgid "Google Plus" -msgstr "" +msgstr "Google Plus" #. module: website #: model:ir.model.fields,field_description:website.field_res_config_settings__social_googleplus @@ -2316,7 +2316,7 @@ msgstr "" #: code:addons/website/controllers/backend.py:53 #, python-format msgid "Incorrect Client ID / Key" -msgstr "" +msgstr "Nesprávný identifikátor / klíč klienta" #. module: website #. openerp-web @@ -4091,7 +4091,7 @@ msgstr "" #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form msgid "Twitter" -msgstr "" +msgstr "Twitter" #. module: website #: model:ir.model.fields,field_description:website.field_res_config_settings__social_twitter @@ -4170,7 +4170,7 @@ msgstr "Url" #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form msgid "Use Google Map on your website (" -msgstr "" +msgstr "Použijte mapu Google na svých webových stránkách (" #. module: website #. openerp-web @@ -4306,7 +4306,7 @@ msgstr "Zobrazit režim dědičnosti" #. module: website #: model:ir.model.fields,field_description:website.field_website_page__inherit_children_ids msgid "Views which inherit from this one" -msgstr "" +msgstr "Pohledy, které z tohoto důvodu dědí" #. module: website #: model_terms:ir.ui.view,arch_db:website.one_page_line @@ -4633,7 +4633,7 @@ msgstr "" #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form msgid "YouTube" -msgstr "" +msgstr "YouTube" #. module: website #. openerp-web diff --git a/addons/website/i18n/es.po b/addons/website/i18n/es.po index d1b980418eb..4d5507a2f97 100644 --- a/addons/website/i18n/es.po +++ b/addons/website/i18n/es.po @@ -3,7 +3,6 @@ # * website # # Translators: -# Pedro M. Baeza <pedro.baeza@gmail.com>, 2018 # Leonardo J. Caballero G. <leonardocaballero@gmail.com>, 2018 # Mateo Tibaquirá Palacios <nestormateo@gmail.com>, 2018 # Jesús Alan Ramos Rodríguez <alan.ramos@jarsa.com.mx>, 2018 @@ -33,6 +32,7 @@ # JOSE ALEJANDRO ECHEVERRI VALENCIA <josealejandroeche@gmail.com>, 2018 # Cris Martin <cristina.marrod@gmail.com>, 2018 # Pilar Marín <pilar@odooperu.pe>, 2018 +# Pedro M. Baeza <pedro.baeza@gmail.com>, 2018 # msgid "" msgstr "" @@ -40,7 +40,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:48+0000\n" "PO-Revision-Date: 2018-08-24 09:33+0000\n" -"Last-Translator: Pilar Marín <pilar@odooperu.pe>, 2018\n" +"Last-Translator: Pedro M. Baeza <pedro.baeza@gmail.com>, 2018\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1437,7 +1437,7 @@ msgstr "" #: code:addons/website/static/src/js/menu/edit.js:81 #, python-format msgid "DRAG BUILDING BLOCKS HERE" -msgstr "" +msgstr "ARRASTRE BLOQUES AQUÍ" #. module: website #: model:ir.ui.menu,name:website.menu_dashboard @@ -1704,7 +1704,7 @@ msgstr "Duplicar" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_features_grid msgid "Duplicate blocks and columns to add more features." -msgstr "" +msgstr "Duplique bloques y columnas para añadir más características." #. module: website #: model_terms:ir.ui.view,arch_db:website.publish_management @@ -4077,6 +4077,9 @@ msgid "" "right icon of each block. Then, duplicate one of the column to create a new " "one as a copy." msgstr "" +"Para añadir una cuarta columna, reduzca el tamaño de estas tres columnas " +"usando el icono adecuado de cada bloque. Entonces, duplique una de las " +"columnas para crear una nueva como copia." #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form diff --git a/addons/website/i18n/it.po b/addons/website/i18n/it.po index 2f59bbb134a..5cf7fad0266 100644 --- a/addons/website/i18n/it.po +++ b/addons/website/i18n/it.po @@ -15,12 +15,12 @@ # Sebastiano Pistore <SebastianoPistore.info@protonmail.ch>, 2018 # Francesco Garganese <francesco.garganese@aeromnia.aero>, 2018 # Pietro Della Notte <pdellanotte@gmail.com>, 2018 -# Sergio Zanchetta <primes2h@gmail.com>, 2018 # Martin Trigaux, 2018 # Giovanni Perteghella <giovanni@perteghella.org>, 2018 # Massimo Bianchi <bianchi.massimo@gmail.com>, 2018 # Paolo Valier, 2018 # Léonie Bouchat <lbo@odoo.com>, 2018 +# Sergio Zanchetta <primes2h@gmail.com>, 2018 # msgid "" msgstr "" @@ -28,7 +28,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:48+0000\n" "PO-Revision-Date: 2018-08-24 09:33+0000\n" -"Last-Translator: Léonie Bouchat <lbo@odoo.com>, 2018\n" +"Last-Translator: Sergio Zanchetta <primes2h@gmail.com>, 2018\n" "Language-Team: Italian (https://www.transifex.com/odoo/teams/41243/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -998,7 +998,7 @@ msgstr "" #. module: website #: model:ir.model.fields,field_description:website.field_website_page__arch_fs msgid "Arch Filename" -msgstr "" +msgstr "Nome file arch" #. module: website #: model:ir.model.fields,help:website.field_res_config_settings__specific_user_account @@ -2431,7 +2431,7 @@ msgstr "Informazioni sul" #. module: website #: model:ir.model.fields,field_description:website.field_website_page__inherit_id msgid "Inherited View" -msgstr "Vista Collegata" +msgstr "Vista ereditata" #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form @@ -2852,7 +2852,7 @@ msgstr "Medio" #: code:addons/website/static/src/js/menu/mobile_view.js:54 #, python-format msgid "Mobile preview" -msgstr "Anteprima mobile" +msgstr "Anteprima dispositivo mobile" #. module: website #: model:ir.model.fields,field_description:website.field_website_page__model @@ -3343,7 +3343,7 @@ msgstr "" #: code:addons/website/static/src/xml/website.facebook_page.xml:63 #, python-format msgid "Please enter valid facebook page URL for preview" -msgstr "Inserisci un URL valido di pagina Facebook per l'anteprima. " +msgstr "Per l'anteprima inserire un URL di pagina Facebook valido " #. module: website #: model_terms:ir.ui.view,arch_db:website.kanban_contain @@ -4444,12 +4444,12 @@ msgstr "Visualizza Architettura" #. module: website #: model:ir.model.fields,field_description:website.field_website_page__name msgid "View Name" -msgstr "Nome Vista" +msgstr "Nome vista" #. module: website #: model:ir.model.fields,field_description:website.field_website_page__type msgid "View Type" -msgstr "Tipo Vista" +msgstr "Tipo vista" #. module: website #: model:ir.model.fields,field_description:website.field_website_page__mode diff --git a/addons/website/i18n/ja.po b/addons/website/i18n/ja.po index 7a6cdfac7c3..e963f14f147 100644 --- a/addons/website/i18n/ja.po +++ b/addons/website/i18n/ja.po @@ -3232,7 +3232,7 @@ msgstr "プレビュー表示" #: model_terms:website.page,arch_db:website.bs_debug_page #, python-format msgid "Previous" -msgstr "" +msgstr "前" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_comparisons @@ -3336,7 +3336,7 @@ msgstr "レコード規則" #. module: website #: model:ir.model.fields,field_description:website.field_website_redirect__url_from msgid "Redirect From" -msgstr "" +msgstr "リダイレクト元" #. module: website #. openerp-web @@ -3348,18 +3348,18 @@ msgstr "" #. module: website #: model:ir.model.fields,field_description:website.field_website_redirect__url_to msgid "Redirect To" -msgstr "" +msgstr "リダイレクト先" #. module: website #: model:ir.model.fields,field_description:website.field_website_redirect__type #: model_terms:ir.ui.view,arch_db:website.view_redirect_search msgid "Redirection Type" -msgstr "" +msgstr "リダイレクションタイプ" #. module: website #: model:ir.ui.menu,name:website.menu_website_redirect_list msgid "Redirects" -msgstr "" +msgstr "リダイレクト" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_references @@ -4433,7 +4433,7 @@ msgstr "" #: model:ir.actions.act_window,name:website.action_website_redirect_list #: model_terms:ir.ui.view,arch_db:website.website_redirect_tree_view msgid "Website Redirects" -msgstr "" +msgstr "ウェブサイトリダイレクト" #. module: website #: model_terms:ir.ui.view,arch_db:website.view_website_form @@ -4687,7 +4687,7 @@ msgstr "例. 会社概要" #. module: website #: model:ir.ui.menu,name:website.menu_website_dashboard msgid "eCommerce Dashboard" -msgstr "" +msgstr "eコマースダッシュボード" #. module: website #. openerp-web diff --git a/addons/website/i18n/nb.po b/addons/website/i18n/nb.po index 0462fcf4570..58e26f58960 100644 --- a/addons/website/i18n/nb.po +++ b/addons/website/i18n/nb.po @@ -3,17 +3,19 @@ # * website # # Translators: +# Andy Schønhaug <odoo@cypodgroup.com>, 2018 +# Jorunn D. Newth, 2018 # Martin Trigaux, 2018 # Aleksander, 2018 -# Jorunn D. Newth, 2018 -# Andy Schønhaug <odoo@cypodgroup.com>, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:48+0000\n" -"PO-Revision-Date: 2018-10-08 06:48+0000\n" -"Last-Translator: Andy Schønhaug <odoo@cypodgroup.com>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:33+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,7 +34,7 @@ msgstr "Legg til bilder" #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view #: model_terms:website.page,arch_db:website.bs_debug_page msgid "\" alert with a" -msgstr "" +msgstr "\" advar med en" #. module: website #: code:addons/website/models/website.py:322 @@ -126,7 +128,7 @@ msgstr "1/5" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "100%" -msgstr "" +msgstr "100%" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options @@ -147,7 +149,7 @@ msgstr "1s" #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view #: model_terms:website.page,arch_db:website.bs_debug_page msgid "2 <span class=\"sr-only\">(current)</span>" -msgstr "" +msgstr "2 <span class=\"sr-only\">(nåværende)</span>" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options @@ -162,7 +164,7 @@ msgstr "Gratis kundestøtte 24/7" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "25%" -msgstr "" +msgstr "25%" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options @@ -202,7 +204,7 @@ msgstr "5/5" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "50%" -msgstr "" +msgstr "50%" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options @@ -212,12 +214,13 @@ msgstr "5s" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "75%" -msgstr "" +msgstr "75%" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_call_to_action msgid "<b>50,000+ companies</b> run Odoo to grow their businesses." msgstr "" +"<b>50 000+ firmaer</b> bruker Odoo for å få virksomhetene sine til å vokse." #. module: website #. openerp-web @@ -246,6 +249,10 @@ msgid "" "story will ring false and be bland. No one will be interested. Write for one" " person. If it’s genuine for the one, it’s genuine for the rest." msgstr "" +"<b>Gode historier er for alle, selv når de kun er skrevet for én person.</b>" +" Hvis du prøver å skrive med et bredt publikum i tankene, vil historiene " +"virke falske og være kjedelige. Ingen vil være interessert. Skriv for én " +"person. Hvis historien virker genuin for én, er den også genuin for resten." #. module: website #: model_terms:ir.ui.view,arch_db:website.s_tabs @@ -257,6 +264,11 @@ msgid "" "quirks like word choices or phrases. Write from your point of view, not from" " someone else's experience." msgstr "" +"<b>Gode historier har personlighet.</b> Vurder å fortelle en historie med " +"personlighet. Å skrive en historie med personlighet til potensielle " +"klienter, vil hjelpe deg å forme en relasjon. Dette vises gjennom små " +"særegenheter, som valg av ord og fraser. Skriv fra ditt perspektiv, ikke fra" +" noen andres opplevelse." #. module: website #. openerp-web @@ -282,6 +294,8 @@ msgid "" "<font style=\"background-color: rgb(255, 255, 255);\">Good writing is " "simple, but not simplistic.</font>" msgstr "" +"<font style=\"background-color: rgb(255, 255, 255);\">God skriving er " +"enkelt, ikke forenklet</font>" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_carousel @@ -289,42 +303,44 @@ msgid "" "<font style=\"font-size: 62px; background-color: rgb(255, 255, 255);\">Edit " "this title</font>" msgstr "" +"<font style=\"font-size: 62px; background-color: rgb(255, 255, " +"255);\">Rediger denne tittelen</font>" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_banner msgid "<font style=\"font-size: 62px;\"><b>Sell Online.</b> Easily.</font>" -msgstr "" +msgstr "<font style=\"font-size: 62px;\"><b>Selg på nett.</b> Lett.</font>" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_picture msgid "<font style=\"font-size: 62px;\">A punchy Headline</font>" -msgstr "" +msgstr "<font style=\"font-size: 62px;\">En punchy Overskrift</font>" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_faq_collapse msgid "<font style=\"font-size: 62px;\">FAQ</font>" -msgstr "" +msgstr "<font style=\"font-size: 62px;\">FAQ</font>" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_comparisons msgid "<font style=\"font-size: 62px;\">Our offers</font>" -msgstr "" +msgstr "<font style=\"font-size: 62px;\">Våre tilbud</font>" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_carousel msgid "<font style=\"font-size: 62px;\">Slide Title</font>" -msgstr "" +msgstr "<font style=\"font-size: 62px;\">Lysbildetittel</font>" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_parallax #: model_terms:ir.ui.view,arch_db:website.s_title msgid "<font style=\"font-size: 62px;\">Your Site Title</font>" -msgstr "" +msgstr "<font style=\"font-size: 62px;\">Din sidetittel</font>" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_card msgid "<i class=\"fa fa-1x fa-clock-o mr8\"/><small>2 days ago</small>" -msgstr "" +msgstr "<i class=\"fa fa-1x fa-clock-o mr8\"/><small>2 dager siden</small>" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_picture @@ -332,11 +348,13 @@ msgid "" "<i class=\"fa fa-1x fa-picture-o mr-2\"/>Add a caption to enhance the " "meaning of this image." msgstr "" +"<i class=\"fa fa-1x fa-picture-o mr-2\"/>Legg til en bildetekst for å " +"forbedre meningen med dette bildet." #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "<i class=\"fa fa-align-left\"/>Alignment" -msgstr "" +msgstr "<i class=\"fa fa-align-left\"/>Justering" #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form @@ -344,6 +362,8 @@ msgid "" "<i class=\"fa fa-arrow-right\"/>\n" " Create a Google Project and Get a Key" msgstr "" +"<i class=\"fa fa-arrow-right\"/>\n" +" Opprett et Google-prosjekt og få en nøkkel" #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form @@ -351,6 +371,8 @@ msgid "" "<i class=\"fa fa-arrow-right\"/>\n" " How to get my Client ID" msgstr "" +"<i class=\"fa fa-arrow-right\"/>\n" +" Hvordan finner jeg min Client ID" #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form @@ -358,6 +380,8 @@ msgid "" "<i class=\"fa fa-arrow-right\"/>\n" " How to get my Tracking ID" msgstr "" +"<i class=\"fa fa-arrow-right\"/>\n" +" Hvordan finner jeg min Tracking ID" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options @@ -367,7 +391,7 @@ msgstr "<i class=\"fa fa-arrows\"/>Størrelse på bakgrunnsbilde" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "<i class=\"fa fa-arrows\"/>Size" -msgstr "" +msgstr "<i class=\"fa fa-arrows\"/>Størrelse" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options @@ -377,12 +401,12 @@ msgstr "<i class=\"fa fa-arrows-h\"/>Mellomrom mellom bilder" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "<i class=\"fa fa-arrows-h\"/>Width" -msgstr "" +msgstr "<i class=\"fa fa-arrows-h\"/>Bredde" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "<i class=\"fa fa-arrows-v\"/>Alignment" -msgstr "" +msgstr "<i class=\"fa fa-arrows-v\"/>Justering" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options @@ -397,17 +421,17 @@ msgstr "<i class=\"fa fa-clock-o\"/>Lysbildevisningshastighet" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "<i class=\"fa fa-clock-o\"/>Speed" -msgstr "" +msgstr "<i class=\"fa fa-clock-o\"/>Hastighet" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "<i class=\"fa fa-clone\"/>Transition" -msgstr "" +msgstr "<i class=\"fa fa-clone\"/>Forløpning" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "<i class=\"fa fa-columns\"/>Number of columns" -msgstr "" +msgstr "<i class=\"fa fa-columns\"/>Antall kolonner" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippets @@ -417,7 +441,7 @@ msgstr "<i class=\"fa fa-diamond\"/> Funksjon" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "<i class=\"fa fa-eye-slash\"/>Transparent" -msgstr "" +msgstr "<i class=\"fa fa-eye-slash\"/>Gjennomsiktig" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options @@ -427,27 +451,27 @@ msgstr "<i class=\"fa fa-eyedropper\"/>Bakgrunnsfarge" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "<i class=\"fa fa-eyedropper\"/>Color" -msgstr "" +msgstr "<i class=\"fa fa-eyedropper\"/>Farge" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "<i class=\"fa fa-eyedropper\"/>Filter" -msgstr "" +msgstr "<i class=\"fa fa-eyedropper\"/>Filter" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "<i class=\"fa fa-facebook\"/>Options" -msgstr "" +msgstr "<i class=\"fa fa-facebook\"/>Alternativer" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "<i class=\"fa fa-font\"/>Typography" -msgstr "" +msgstr "<i class=\"fa fa-font\"/>Typografi" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "<i class=\"fa fa-heart\"/>Hearts" -msgstr "" +msgstr "<i class=\"fa fa-heart\"/>Hjerter" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippets @@ -458,7 +482,7 @@ msgstr "<i class=\"fa fa-indent\"/> Indre innhold" #: model_terms:ir.ui.view,arch_db:website.s_three_columns msgid "" "<i class=\"fa fa-info-circle mr-1\"/> <small>Additional information</small>" -msgstr "" +msgstr "<i class=\"fa fa-info-circle mr-1\"/><small>Tilleggsinformasjon</small>" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippets @@ -473,17 +497,17 @@ msgstr "<i class=\"fa fa-magic\"/>Modus" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "<i class=\"fa fa-magic\"/>Style" -msgstr "" +msgstr "<i class=\"fa fa-magic\"/>Stil" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "<i class=\"fa fa-magic\"/>Styles" -msgstr "" +msgstr "<i class=\"fa fa-magic\"/>Stiler" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "<i class=\"fa fa-minus\"/>Thickness" -msgstr "" +msgstr "<i class=\"fa fa-minus\"/>Tykkelse" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options @@ -493,7 +517,7 @@ msgstr "<i class=\"fa fa-paint-brush\"/>Styling" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "<i class=\"fa fa-pencil\"/>Style" -msgstr "" +msgstr "<i class=\"fa fa-pencil\"/>Stil" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options @@ -527,17 +551,17 @@ msgstr "<i class=\"fa fa-refresh\"/>Omorganiser" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "<i class=\"fa fa-square\"/>Squares" -msgstr "" +msgstr "<i class=\"fa fa-square\"/>Rektangler" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "<i class=\"fa fa-star\"/>Stars" -msgstr "" +msgstr "<i class=\"fa fa-star\"/>Stjerner" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "<i class=\"fa fa-tasks\"/>Progress Bar" -msgstr "" +msgstr "<i class=\"fa fa-tasks\"/>Fremdriftslinje" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options @@ -552,7 +576,7 @@ msgstr "<i class=\"fa fa-th-large\"/> Struktur" #. module: website #: model_terms:ir.ui.view,arch_db:website.user_navbar msgid "<i class=\"fa fa-th-large\"/> WEBSITE" -msgstr "" +msgstr "<i class=\"fa fa-th-large\"/>NETTSIDE" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options @@ -567,7 +591,7 @@ msgstr "<i class=\"fa fa-trash-o\"/>Fjern slide" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_comparisons msgid "<i>Instant setup, satisfied or reimbursed.</i>" -msgstr "" +msgstr "<i>Umiddelbart oppsett, fornøyd eller refundert.</i>" #. module: website #. openerp-web @@ -588,11 +612,13 @@ msgid "" "<small id=\"emailHelp\" class=\"form-text text-muted\">We'll never share " "your email with anyone else.</small>" msgstr "" +"<small id=\"emailHelp\" class=\"form-text text-muted\">Vil vil aldri dele " +"e-postadressen din med andre.</small>" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_comparisons msgid "<small>/ month</small>" -msgstr "" +msgstr "<small>/måned</small>" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_carousel @@ -601,6 +627,8 @@ msgid "" "<span class=\"carousel-control-next-icon\"/>\n" " <span class=\"sr-only\">Next</span>" msgstr "" +"<span class=\"carousel-control-next-icon\"/>\n" +" <span class=\"sr-only\">Neste</span>" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_carousel @@ -609,6 +637,8 @@ msgid "" "<span class=\"carousel-control-prev-icon\"/>\n" " <span class=\"sr-only\">Previous</span>" msgstr "" +"<span class=\"carousel-control-prev-icon\"/>\n" +" <span class=\"sr-only\">Forrige</span>" #. module: website #: model_terms:ir.ui.view,arch_db:website.user_navbar @@ -627,6 +657,9 @@ msgid "" " <i class=\"fa fa-plus-circle\"/> Add Facebook Page\n" " </span>" msgstr "" +"<span class=\"o_add_facebook_page\">\n" +" <i class=\"fa fa-plus-circle\"/> Legg til Facebook-side\n" +" </span>" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_image_gallery @@ -644,6 +677,9 @@ msgid "" " <span class=\"s_comparisons_price\"><b>125</b></span>\n" " <span class=\"s_comparisons_decimal\">.00</span>" msgstr "" +"<span class=\"s_comparisons_currency\">kr</span>\n" +" <span class=\"s_comparisons_price\"><b>125</b></span>\n" +" <span class=\"s_comparisons_decimal\">,00</span>" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_comparisons @@ -652,6 +688,9 @@ msgid "" " <span class=\"s_comparisons_price\"><b>35</b></span>\n" " <span class=\"s_comparisons_decimal\">.00</span>" msgstr "" +"<span class=\"s_comparisons_currency\">kr</span>\n" +" <span class=\"s_comparisons_price\"><b>35</b></span>\n" +" <span class=\"s_comparisons_decimal\">,00</span>" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_comparisons @@ -660,11 +699,14 @@ msgid "" " <span class=\"s_comparisons_price\"><b>65</b></span>\n" " <span class=\"s_comparisons_decimal\">.00</span>" msgstr "" +"<span class=\"s_comparisons_currency\">kr</span>\n" +" <span class=\"s_comparisons_price\"><b>65</b></span>\n" +" <span class=\"s_comparisons_decimal\">,00</span>" #. module: website #: model_terms:ir.ui.view,arch_db:website.user_navbar msgid "<span class=\"sr-only\">Toggle Dropdown</span>" -msgstr "" +msgstr "<span class=\"sr-only\">Vis nedtrekksmeny</span>" #. module: website #: model_terms:ir.ui.view,arch_db:website.user_navbar @@ -673,6 +715,9 @@ msgid "" " <span class=\"css_publish\">Unpublished</span>\n" " <span class=\"css_unpublish\">Published</span>" msgstr "" +"<span/>\n" +" <span class=\"css_publish\">Upublisert</span>\n" +" <span class=\"css_unpublish\">Publisert</span>" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_call_to_action @@ -680,21 +725,23 @@ msgid "" "<span>Contact us</span>\n" " <i class=\"fa fa-1x fa-fw fa-arrow-circle-right ml-1\"/>" msgstr "" +"<span>Kontakt oss</span>\n" +" <i class=\"fa fa-1x fa-fw fa-arrow-circle-right ml-1\"/>" #. module: website #: model_terms:ir.ui.view,arch_db:website.layout_footer_copyright msgid "<span>Copyright &copy;</span>" -msgstr "" +msgstr "<span>Opphavsrett &copy;</span>" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_quotes_carousel msgid "<span>— Jane DOE, CEO of <b>MyCompany</b></span>" -msgstr "" +msgstr "<span>— Kari Nordmann, Daglig leder for <b>MinBedrift</b></span>" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_quotes_carousel msgid "<span>— John DOE, CEO of <b>MyCompany</b></span>" -msgstr "" +msgstr "<span>— Ola Nordmann, Daglig leder for <b>MinBedrift</b></span>" #. module: website #: model_terms:ir.ui.view,arch_db:website.http_error_debug @@ -707,6 +754,9 @@ msgid "" "A CDN helps you serve your website’s content with high availability and high" " performance to any visitor wherever they are located." msgstr "" +"En CDN hjelper deg med å tjene din nettsides innhold med høyere " +"tilgjengelighet og ytelse til enhver besøkende, uansett hvor de er " +"lokalisert." #. module: website #: model_terms:ir.ui.view,arch_db:website.s_text_image @@ -720,6 +770,9 @@ msgid "" "for headers and footers, a wide variety of content, contextual background " "colors, and powerful display options." msgstr "" +"Et kort er en fleksibel og utvidbar innholdsbeholder. Det inkluderer " +"alternativer for topp- og bunntekst, et bredt utvalg av innhold, " +"kontekstuelle farger, og kraftfulle visningsalternativer." #. module: website #: model:ir.model.fields,help:website.field_ir_actions_server__website_published @@ -729,6 +782,10 @@ msgid "" "field as True to allow users to run this action. If it is set to False the " "action cannot be run through the website." msgstr "" +"En kodet tjenerhandling kan kjøres fra nettsiden ved å bruke en dedikert " +"kontroller. Adressen er <base>/website/action/<website_path>. Sett dette " +"feltet til Sann for å tillate brukere å kjøre denne handlingen. Hvis satt " +"til Usann, kan handlingen ikke kjøres fra nettsiden." #. module: website #: model_terms:ir.ui.view,arch_db:website.s_text_block @@ -736,11 +793,13 @@ msgid "" "A great way to catch your reader's attention is to tell a story. " "<br/>Everything you consider writing can be told as a story." msgstr "" +"En god måte å få leserens oppmerksomhet på, er å fortelle en historie. " +"<br/>Alt som skrives, kan fortelles som en historie." #. module: website #: model_terms:ir.ui.view,arch_db:website.s_features msgid "A small explanation of this great <br/>feature, in clear words." -msgstr "" +msgstr "En kort forklaring av denne nyttige<br/>funksjonen, med enkle ord." #. module: website #: model:ir.model.fields,field_description:website.field_res_config_settings__module_website_version @@ -770,7 +829,7 @@ msgstr "Tilgangsfeil" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_comparisons msgid "Account & Sales management" -msgstr "" +msgstr "Regnskap- og Salgsadministrasjon" #. module: website #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view @@ -791,6 +850,9 @@ msgid "" "move columns, select the column and use the top icons to perform your " "action." msgstr "" +"Tilpass disse tre kolonnene for å møte dine designbehov. For å duplisere, " +"slette eller flytte kolonner, velg kolonnen og bruk ikonene på toppen for å " +"utføre handlingen du ønsker." #. module: website #. openerp-web @@ -814,24 +876,24 @@ msgstr "Legg til menyvalg" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_features_grid msgid "Add a great slogan." -msgstr "" +msgstr "Legg til et flott slagord." #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form msgid "Add features" -msgstr "" +msgstr "Legg til funksjoner" #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form msgid "Add links to social media on your website" -msgstr "" +msgstr "Legg til linker til sosiale medier på nettstedet ditt" #. module: website #. openerp-web #: code:addons/website/static/src/js/menu/new_content.js:85 #, python-format msgid "Add to menu" -msgstr "" +msgstr "Legg til i meny" #. module: website #. openerp-web @@ -866,7 +928,7 @@ msgstr "" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_features_grid msgid "All these icons are completely free for commercial use." -msgstr "" +msgstr "Alle disse ikonene kan brukes gratis for kommersiell bruk." #. module: website #: model_terms:ir.ui.view,arch_db:website.s_faq_collapse @@ -875,6 +937,10 @@ msgid "" "or indirectly, implying any approval, association, sponsorship, endorsement," " or affiliation with any linked website, unless specifically stated herein." msgstr "" +"Selv om denne nettsiden kan være linket til andre nettside, antyder vi ikke " +"direkte, eller indirekte, noen form for godkjenning, tilknytning, sponsing, " +"tilslutning eller samarbeid med linkede nettsider, forutsatt at det ikke er " +"spesifikt nevnt her." #. module: website #: model_terms:ir.ui.view,arch_db:website.500 @@ -885,7 +951,7 @@ msgstr "En feil oppsto med visning av malen" #: model:ir.actions.client,name:website.backend_dashboard #: model:ir.ui.menu,name:website.menu_website_google_analytics msgid "Analytics" -msgstr "" +msgstr "Analyse" #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form @@ -896,6 +962,11 @@ msgid "" "Analytics or in Odoo reports where you can see the opportunities and sales " "revenue generated thanks to your links." msgstr "" +"Analyser effektiviteten av dine markedsføringskampanjer ved å bruke sporbare" +" UTM-trackere (kampanjer, medier, kilder). Opprett trackere og følg klikkene" +" fra Promoter-menyen på ditt nettsted. Disse trackerne kan brukes i Google " +"Analytics eller i Odoo-rapporter, hvor du kan se mulighetene og " +"salgsinntekter generert takket være linkene dine." #. module: website #: model:ir.actions.act_window,name:website.action_website_add_features @@ -906,17 +977,17 @@ msgstr "Apper" #. module: website #: model:ir.model.fields,field_description:website.field_website_page__arch_db msgid "Arch Blob" -msgstr "" +msgstr "Arch Blob" #. module: website #: model:ir.model.fields,field_description:website.field_website_page__arch_fs msgid "Arch Filename" -msgstr "" +msgstr "Arch Filnavn" #. module: website #: model:ir.model.fields,help:website.field_res_config_settings__specific_user_account msgid "Are newly created user accounts website specific" -msgstr "" +msgstr "Er nylig opprettede brukerkontoer spesifikke til nettsted" #. module: website #. openerp-web @@ -939,7 +1010,7 @@ msgstr "Omdiriger automatisk til språkversjon" #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view #: model_terms:website.page,arch_db:website.bs_debug_page msgid "Autosizing" -msgstr "" +msgstr "Autostørrelse" #. module: website #: model:ir.model.fields,field_description:website.field_ir_actions_server__website_published @@ -961,7 +1032,7 @@ msgstr "Bakgrunn" #: code:addons/website/static/src/xml/website.editor.xml:39 #, python-format msgid "Background colors" -msgstr "" +msgstr "Bakgrunnsfarger" #. module: website #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view @@ -997,17 +1068,17 @@ msgstr "Brødtekst" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "Border" -msgstr "" +msgstr "Ramme" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "Bordered" -msgstr "" +msgstr "Rammet" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "Bottom" -msgstr "" +msgstr "Bunn" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options @@ -1019,7 +1090,7 @@ msgstr "Avgrenset" #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view #: model_terms:website.page,arch_db:website.bs_debug_page msgid "Breadcrumb" -msgstr "" +msgstr "Brødsmule" #. module: website #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view @@ -1054,30 +1125,30 @@ msgstr "Kanseller" #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view #: model_terms:website.page,arch_db:website.bs_debug_page msgid "Card" -msgstr "" +msgstr "Kort" #. module: website #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view #: model_terms:website.page,arch_db:website.bs_debug_page msgid "Card Body" -msgstr "" +msgstr "Kort-innhold" #. module: website #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view #: model_terms:website.page,arch_db:website.bs_debug_page msgid "Card Footer" -msgstr "" +msgstr "Kort-bunntekst" #. module: website #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view #: model_terms:website.page,arch_db:website.bs_debug_page msgid "Card Header" -msgstr "" +msgstr "Kort-topptekst" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_cover msgid "Catchy Headline" -msgstr "" +msgstr "Fengende Overskrift" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options @@ -1103,7 +1174,7 @@ msgstr "Undermeny" #. module: website #: model_terms:ir.ui.view,arch_db:website.theme_customize msgid "Choose a pattern" -msgstr "" +msgstr "Velg et mønster" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_picture @@ -1111,31 +1182,34 @@ msgid "" "Choose a vibrant image and write an inspiring paragraph about it.<br/> It " "does not have to be long, but it should reinforce your image." msgstr "" +"Velg et bilde med liv i og skriv et inspirerende avsnitt om det.<br/> Det " +"trenger ikke være langt, men det bør forsterke effekten av bildet du har " +"valgt." #. module: website #: model_terms:ir.ui.view,arch_db:website.theme_customize msgid "Choose an image" -msgstr "" +msgstr "Velg et bilde" #. module: website #: model_terms:ir.ui.view,arch_db:website.theme_customize msgid "Choose the theme colors" -msgstr "" +msgstr "Velg temafarger" #. module: website #: model_terms:ir.ui.view,arch_db:website.theme_customize msgid "Choose your colors" -msgstr "" +msgstr "Velg dine farger" #. module: website #: model_terms:ir.ui.view,arch_db:website.theme_customize msgid "Choose your fonts" -msgstr "" +msgstr "Velg dine fonter" #. module: website #: model_terms:ir.ui.view,arch_db:website.theme_customize msgid "Choose your layout" -msgstr "" +msgstr "Velg din layout" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options @@ -1145,7 +1219,7 @@ msgstr "Sirkel" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_carousel msgid "Clever Slogan" -msgstr "" +msgstr "Smart Slagord" #. module: website #. openerp-web @@ -1155,13 +1229,15 @@ msgid "" "Click here to choose your main branding color.<br/>It will recompute the " "palette with suggested matching colors." msgstr "" +"Klikk her for å velge din hovedfarge.<br/>Den vil fylle fargepaletten med " +"foreslåtte farger som matcher." #. module: website #. openerp-web #: code:addons/website/static/src/xml/website.seo.xml:137 #, python-format msgid "Click to choose more images" -msgstr "" +msgstr "Klikk for å velge flere bilder" #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form @@ -1190,7 +1266,7 @@ msgstr "Lukk" #. module: website #: model_terms:ir.ui.view,arch_db:website.theme_customize msgid "Colors" -msgstr "" +msgstr "Farger" #. module: website #: model:ir.model,name:website.model_res_company @@ -1211,7 +1287,7 @@ msgstr "Firmanavn" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_company_team msgid "Company team" -msgstr "" +msgstr "Firma-team" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_comparisons @@ -1227,7 +1303,7 @@ msgstr "Komponenter" #. module: website #: model:ir.model,name:website.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: website #: model:ir.ui.menu,name:website.menu_website_global_configuration @@ -1237,7 +1313,7 @@ msgstr "Konfigurasjon" #. module: website #: model:ir.model.fields,field_description:website.field_res_config_settings__has_social_network msgid "Configure Social Network" -msgstr "" +msgstr "Konfigurer sosialt nettverk" #. module: website #. openerp-web @@ -1282,6 +1358,8 @@ msgid "" "Contact us about anything related to our company or services.<br/>\n" " We'll do our best to get back to you as soon as possible." msgstr "" +"Kontakt oss om alt relatert til vårt firma eller tjenester.<br/>\n" +" Vi vil komme tilbake til deg så snart som mulig." #. module: website #: model:ir.model.fields,field_description:website.field_res_config_settings__cdn_activated @@ -1323,7 +1401,7 @@ msgstr "Opprett" #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form msgid "Create a New Website" -msgstr "" +msgstr "Opprett ny nettside" #. module: website #: model:ir.model.fields,field_description:website.field_website__create_uid @@ -1379,14 +1457,14 @@ msgstr "" #: code:addons/website/static/src/js/widgets/theme.js:32 #, python-format msgid "Customize this theme" -msgstr "" +msgstr "Tilpass dette temaet" #. module: website #. openerp-web #: code:addons/website/static/src/js/menu/edit.js:81 #, python-format msgid "DRAG BUILDING BLOCKS HERE" -msgstr "" +msgstr "DRA BLOKKER HIT" #. module: website #: model:ir.ui.menu,name:website.menu_dashboard @@ -1396,7 +1474,7 @@ msgstr "Dashbord" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "Dashed" -msgstr "" +msgstr "Stiplet" #. module: website #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view @@ -1423,14 +1501,14 @@ msgstr "Standardspråk" #. module: website #: model:website.menu,name:website.main_menu msgid "Default Main Menu" -msgstr "" +msgstr "Standard Hovedmeny" #. module: website #: model:ir.model.fields,field_description:website.field_res_config_settings__social_default_image #: model:ir.model.fields,field_description:website.field_website__social_default_image #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form msgid "Default Social Share Image" -msgstr "" +msgstr "Standard Sosialt Delebilde" #. module: website #: model:ir.model.fields,field_description:website.field_res_config_settings__website_default_lang_id @@ -1461,7 +1539,7 @@ msgstr "Slett side" #: code:addons/website/static/src/xml/website.contentMenu.xml:17 #, python-format msgid "Delete menu" -msgstr "" +msgstr "Slett meny" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_three_columns @@ -1469,6 +1547,8 @@ msgid "" "Delete the above image or replace it with a picture that illustrates your " "message. Click on the picture to change it's <em>rounded corner</em> style." msgstr "" +"Slett bildet over og erstatt det met et bilde som illustrerer ditt buskap. " +"Klikk på bildet for å endre stilen med <em>avrundede hjørner</em>." #. module: website #: model_terms:ir.ui.view,arch_db:website.one_page_line @@ -1509,7 +1589,7 @@ msgstr "Slå av autoavspilling" #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view #: model_terms:website.page,arch_db:website.bs_debug_page msgid "Disabled" -msgstr "" +msgstr "Deaktivert" #. module: website #. openerp-web @@ -1522,7 +1602,7 @@ msgstr "Forkast" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_image_text msgid "Discover more" -msgstr "" +msgstr "Oppdag mer" #. module: website #: model_terms:ir.ui.view,arch_db:website.external_snippets @@ -1545,29 +1625,29 @@ msgstr "Visningsnavn" #: code:addons/website/models/ir_qweb_fields.py:16 #, python-format msgid "Display the badges" -msgstr "" +msgstr "Vis emblemer" #. module: website #: code:addons/website/models/ir_qweb_fields.py:15 #, python-format msgid "Display the biography" -msgstr "" +msgstr "Vis biografien" #. module: website #: code:addons/website/models/ir_qweb_fields.py:14 #, python-format msgid "Display the website description" -msgstr "" +msgstr "Vis nettstedbeskrivelse" #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form msgid "Display this website when users visit this domain" -msgstr "" +msgstr "Viser denne nettsiden når brukeren besøker dette domenet" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_banner msgid "Do something" -msgstr "" +msgstr "Gjør noe" #. module: website #. openerp-web @@ -1581,7 +1661,7 @@ msgstr "Vil du oppdatere firmadata?" #: code:addons/website/static/src/js/menu/new_content.js:28 #, python-format msgid "Do you want to install the \"%s\" App?" -msgstr "" +msgstr "Vil du installere '%s'-appen?" #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form @@ -1598,17 +1678,17 @@ msgstr "Ikke glem å oppdatere alle linker til denne siden." #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "Dotted" -msgstr "" +msgstr "Prikket" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "Double" -msgstr "" +msgstr "Dobbel" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_features_grid msgid "Double click an icon to replace it with one of your choice." -msgstr "" +msgstr "Dobbelklikk på et ikon for å erstatte det med ikonet du ønsker." #. module: website #. openerp-web @@ -1635,14 +1715,14 @@ msgstr "Dra blokken <i>Forsidebilde</i> og slipp den på siden din." #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view #: model_terms:website.page,arch_db:website.bs_debug_page msgid "Dropdown" -msgstr "" +msgstr "Nedtrekksmeny" #. module: website #. openerp-web #: code:addons/website/static/src/xml/website.contentMenu.xml:7 #, python-format msgid "Dropdown menu" -msgstr "" +msgstr "Nedtrekksmeny" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_features_grid @@ -1652,7 +1732,7 @@ msgstr "Dupliser" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_features_grid msgid "Duplicate blocks and columns to add more features." -msgstr "" +msgstr "Dupliser blokker for å legge til flere funksjoner." #. module: website #: model_terms:ir.ui.view,arch_db:website.publish_management @@ -1670,7 +1750,7 @@ msgstr "Rediger meny" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_features_grid msgid "Edit Styles" -msgstr "" +msgstr "Rediger Stiler" #. module: website #: model_terms:ir.ui.view,arch_db:website.user_navbar @@ -1693,7 +1773,7 @@ msgstr "Rediger i backend" #: code:addons/website/static/src/xml/website.contentMenu.xml:16 #, python-format msgid "Edit menu" -msgstr "" +msgstr "Rediger meny" #. module: website #. openerp-web @@ -1727,7 +1807,7 @@ msgstr "Redaktør og formgiver" #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view #: model_terms:website.page,arch_db:website.bs_debug_page msgid "Email address" -msgstr "" +msgstr "E-postadresse" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_comparisons @@ -1738,12 +1818,12 @@ msgstr "Epoststøtte" #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view #: model_terms:website.page,arch_db:website.bs_debug_page msgid "Enter email" -msgstr "" +msgstr "Legg inn e-post" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "Equal height" -msgstr "" +msgstr "Lik høyde" #. module: website #: model_terms:ir.ui.view,arch_db:website.http_error_debug @@ -1768,6 +1848,8 @@ msgid "" "Explain the benefits you offer. <br/>Don't write about products or services " "here, write about solutions." msgstr "" +"Forklar fordelene du har å tilby. <br/>Ikke skriv om produkter eller " +"tjenester her, skriv om løsninger." #. module: website #: model:ir.model.fields,field_description:website.field_ir_actions_server__xml_id @@ -1781,7 +1863,7 @@ msgstr "Ekstern ID" #: code:addons/website/static/src/js/widgets/theme.js:78 #, python-format msgid "Extra Color" -msgstr "" +msgstr "Ekstra farge" #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form @@ -1799,19 +1881,19 @@ msgstr "Facebook-konto" #: code:addons/website/static/src/js/editor/snippets.options.js:557 #, python-format msgid "Facebook Page" -msgstr "" +msgstr "Facebook-side" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "Fade" -msgstr "" +msgstr "Fade" #. module: website #. openerp-web #: code:addons/website/static/src/js/menu/new_content.js:26 #, python-format msgid "Failed to install \"%s\"" -msgstr "" +msgstr "Installasjon av '%s' feilet" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options @@ -1856,13 +1938,13 @@ msgstr "Første funksjon" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_features_grid msgid "First list of Features" -msgstr "" +msgstr "Første liste over funksjonalitet" #. module: website #: model:ir.model.fields,help:website.field_ir_ui_view__first_page_id #: model:ir.model.fields,help:website.field_website_page__first_page_id msgid "First page linked to this view" -msgstr "" +msgstr "Første side linket til denne visningen" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options @@ -1889,17 +1971,17 @@ msgstr "Følg alle" #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form msgid "Follow your website traffic in Odoo." -msgstr "" +msgstr "Følg trafikken til nettsiden i Odoo." #. module: website #: model_terms:ir.ui.view,arch_db:website.theme_customize msgid "Fonts" -msgstr "" +msgstr "Fonter" #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form msgid "Force your user to create an account per website" -msgstr "" +msgstr "Tving brukerne dine til å opprette en konto for hver nettside" #. module: website #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view @@ -1921,12 +2003,12 @@ msgstr "" #. module: website #: selection:website,auth_signup_uninvited:0 msgid "Free sign up" -msgstr "" +msgstr "Åpen registrering" #. module: website #: model_terms:ir.ui.view,arch_db:website.theme_customize msgid "Full" -msgstr "" +msgstr "Full" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_comparisons @@ -1941,7 +2023,7 @@ msgstr "Få tilgang til alle moduler og funksjoner" #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form msgid "GitHub" -msgstr "" +msgstr "GitHub" #. module: website #: model:ir.model.fields,field_description:website.field_res_config_settings__social_github @@ -1994,6 +2076,9 @@ msgid "" "customers. Simple words communicate better than big words and pompous " "language." msgstr "" +"God tekstforfatting starter ved å forstå hvordan dine produkter og tjenester" +" kan hjelpe kundene dine. Enkle ord kommuniserer bedre enn store ord og " +"pompøst språk." #. module: website #. openerp-web @@ -2006,7 +2091,7 @@ msgstr "Google Analytics" #. module: website #: model:ir.model.fields,field_description:website.field_res_config_settings__has_google_analytics_dashboard msgid "Google Analytics Dashboard" -msgstr "" +msgstr "Google Analytics Dashbord" #. module: website #: model:ir.model.fields,field_description:website.field_res_config_settings__google_analytics_key @@ -2052,7 +2137,7 @@ msgstr "Google Maps API-nøkkel" #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form msgid "Google Plus" -msgstr "" +msgstr "Google Plus" #. module: website #: model:ir.model.fields,field_description:website.field_res_config_settings__social_googleplus @@ -2092,14 +2177,14 @@ msgstr "Grupper" #: code:addons/website/static/src/xml/website.seo.xml:106 #, python-format msgid "H1" -msgstr "" +msgstr "H1" #. module: website #. openerp-web #: code:addons/website/static/src/xml/website.seo.xml:107 #, python-format msgid "H2" -msgstr "" +msgstr "H2" #. module: website #: model_terms:ir.ui.view,arch_db:website.user_navbar @@ -2109,66 +2194,66 @@ msgstr "HTML/CSS-editor" #. module: website #: model:ir.model,name:website.model_ir_http msgid "HTTP Routing" -msgstr "" +msgstr "HTTP-ruting" #. module: website #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view #: model_terms:website.page,arch_db:website.bs_debug_page msgid "Header" -msgstr "" +msgstr "Topptekst" #. module: website #: model:ir.model.fields,field_description:website.field_website_page__header_color msgid "Header Color" -msgstr "" +msgstr "Topptekstfarge" #. module: website #: model:ir.model.fields,field_description:website.field_website_page__header_overlay msgid "Header Overlay" -msgstr "" +msgstr "Topptekstoverlegg" #. module: website #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view #: model_terms:website.page,arch_db:website.bs_debug_page msgid "Headings 1" -msgstr "" +msgstr "Overskrift 1" #. module: website #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view #: model_terms:website.page,arch_db:website.bs_debug_page msgid "Headings 2" -msgstr "" +msgstr "Overskrift 2" #. module: website #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view #: model_terms:website.page,arch_db:website.bs_debug_page msgid "Headings 3" -msgstr "" +msgstr "Overskrift 3" #. module: website #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view #: model_terms:website.page,arch_db:website.bs_debug_page msgid "Headings 4" -msgstr "" +msgstr "Overskrift 4" #. module: website #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view #: model_terms:website.page,arch_db:website.bs_debug_page msgid "Headings 5" -msgstr "" +msgstr "Overskrift 5" #. module: website #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view #: model_terms:website.page,arch_db:website.bs_debug_page msgid "Headings 6" -msgstr "" +msgstr "Overskrift 6" #. module: website #. openerp-web #: code:addons/website/static/src/xml/website.facebook_page.xml:42 #, python-format msgid "Hide Cover Photo" -msgstr "" +msgstr "Skjul forsidebilde" #. module: website #. openerp-web @@ -2182,7 +2267,7 @@ msgstr "Gjem denne siden fra søkeresultater" #: code:addons/website/static/src/xml/website.contentMenu.xml:56 #, python-format msgid "Hint: Simply type '#' to create a container menu" -msgstr "" +msgstr "Hint: Skriv inn '#' for å lage en beholdermeny" #. module: website #. openerp-web @@ -2202,7 +2287,7 @@ msgstr "Hjem" #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view #: model_terms:website.page,arch_db:website.bs_debug_page msgid "Home <span class=\"sr-only\">(current)</span>" -msgstr "" +msgstr "Hjem <span class=\"sr-only\">(nåværende)</span>" #. module: website #. openerp-web @@ -2259,7 +2344,7 @@ msgstr "Ikon" #. module: website #: model:ir.model.fields,help:website.field_website__specific_user_account msgid "If True, new accounts will be associated to the current website" -msgstr "" +msgstr "Hvis Sann, vil nye kontoer bli assosiert til den nåværende nettsiden" #. module: website #: model:ir.model.fields,help:website.field_res_config_settings__social_default_image @@ -2267,6 +2352,7 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form msgid "If set, replaces the company logo as the default social share image." msgstr "" +"Hvis satt, vil firmalogoen bli satt som standardbilde ved sosial deling." #. module: website #: model_terms:ir.ui.view,arch_db:website.500 @@ -2295,17 +2381,20 @@ msgid "" "* if False, the view currently does not extend its parent but can be enabled\n" " " msgstr "" +"Hvis denne visningen er arvet,\n" +"* hvis Sann, vil visningen alltid utvide sin overordnede visning\n" +"* hvis Sann, vil visningen ikke utvide sin overordnede visning, men kan skrus på" #. module: website #: model_terms:ir.ui.view,arch_db:website.one_page_line msgid "In main menu" -msgstr "" +msgstr "I hovedmenyen" #. module: website #: code:addons/website/controllers/backend.py:53 #, python-format msgid "Incorrect Client ID / Key" -msgstr "" +msgstr "Feil Klient-ID / Nøkkel" #. module: website #. openerp-web @@ -2367,21 +2456,21 @@ msgstr "Installerte moduler" #. module: website #: model:ir.model.fields,help:website.field_website__theme_id msgid "Installed theme" -msgstr "" +msgstr "Installert tema" #. module: website #. openerp-web #: code:addons/website/static/src/js/menu/new_content.js:29 #, python-format msgid "Installing \"%s\"" -msgstr "" +msgstr "Installerer \"%s\"" #. module: website #. openerp-web #: code:addons/website/static/src/xml/website.facebook_page.xml:62 #, python-format msgid "Invalid Facebook Page Url" -msgstr "" +msgstr "Ugyldig Facebookside-url" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_company_team @@ -2410,7 +2499,7 @@ msgstr "Er synlig" #: model:ir.model.fields,field_description:website.field_website_published_mixin__is_published #: model:ir.model.fields,field_description:website.field_website_published_multi_mixin__is_published msgid "Is published" -msgstr "" +msgstr "Er Publisert" #. module: website #. openerp-web @@ -2434,13 +2523,13 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view #: model_terms:website.page,arch_db:website.bs_debug_page msgid "Item 1" -msgstr "" +msgstr "Punkt 1" #. module: website #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view #: model_terms:website.page,arch_db:website.bs_debug_page msgid "Item 2" -msgstr "" +msgstr "Punkt 2" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_call_to_action @@ -2466,7 +2555,7 @@ msgstr "Nøkkelord" #: code:addons/website/static/src/xml/website.seo.xml:87 #, python-format msgid "Keywords" -msgstr "" +msgstr "Nøkkelord" #. module: website #: model:ir.model.fields,field_description:website.field_res_config_settings__language_ids @@ -2538,13 +2627,13 @@ msgstr "Siste år" #. module: website #: model_terms:ir.ui.view,arch_db:website.theme_customize msgid "Layout" -msgstr "" +msgstr "Layout" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_text_image #: model_terms:ir.ui.view,arch_db:website.s_three_columns msgid "Learn more" -msgstr "" +msgstr "Lær mer" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options @@ -2567,7 +2656,7 @@ msgstr "La oss begynne å designe." #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view #: model_terms:website.page,arch_db:website.bs_debug_page msgid "Library" -msgstr "" +msgstr "Bibliotek" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_comparisons @@ -2588,13 +2677,13 @@ msgstr "Link" #. module: website #: model:ir.model.fields,field_description:website.field_res_config_settings__module_website_links msgid "Link Trackers" -msgstr "" +msgstr "Link Trackere" #. module: website #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view #: model_terms:website.page,arch_db:website.bs_debug_page msgid "Link button" -msgstr "" +msgstr "Link-knapp" #. module: website #. openerp-web @@ -2606,7 +2695,7 @@ msgstr "Tilknytt min Analytics-konto" #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form msgid "LinkedIn" -msgstr "" +msgstr "LinkedIn" #. module: website #: model:ir.model.fields,field_description:website.field_res_config_settings__social_linkedin @@ -2617,7 +2706,7 @@ msgstr "LinkedIn-konto" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_faq_collapse msgid "Links to other Websites" -msgstr "" +msgstr "Linker til andre nettsider" #. module: website #. openerp-web @@ -2641,7 +2730,7 @@ msgstr "Hovedmeny" #: code:addons/website/static/src/xml/website.editor.xml:31 #, python-format msgid "Main colors" -msgstr "" +msgstr "Hovedfarger" #. module: website #: model_terms:ir.ui.view,arch_db:website.user_navbar @@ -2661,7 +2750,7 @@ msgstr "Administrer sidene på nettstedet ditt" #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form msgid "Manage multiple websites" -msgstr "" +msgstr "Administrer flere nettsteder" #. module: website #: model_terms:ir.ui.view,arch_db:website.one_page_line @@ -2737,7 +2826,7 @@ msgstr "" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "Middle" -msgstr "" +msgstr "Midten" #. module: website #. openerp-web @@ -2766,7 +2855,7 @@ msgstr "Modeller" #: code:addons/website/static/src/xml/website.seo.xml:111 #, python-format msgid "Most searched topics related to your keyword, ordered by importance" -msgstr "" +msgstr "Mest søkte emner relatert til dine søkeord, sortert etter viktighet:" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options @@ -2791,33 +2880,33 @@ msgstr "Flytt til forrige" #. module: website #: selection:website.redirect,type:0 msgid "Moved permanently (301)" -msgstr "" +msgstr "Permanent flyttet (301)" #. module: website #: selection:website.redirect,type:0 msgid "Moved temporarily (302)" -msgstr "" +msgstr "Midlertidig flyttet (302)" #. module: website #: model:ir.model,name:website.model_website_multi_mixin msgid "Multi Website Mixin" -msgstr "" +msgstr "Multi Nettsted Mixin" #. module: website #: model:ir.model,name:website.model_website_published_multi_mixin msgid "Multi Website Published Mixin" -msgstr "" +msgstr "Multi Nettsted Publisert Mixin" #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form msgid "Multi-Websites" -msgstr "" +msgstr "Multi-Nettsteder" #. module: website #: model:ir.model.fields,field_description:website.field_res_config_settings__group_multi_website #: model:res.groups,name:website.group_multi_website msgid "Multi-website" -msgstr "" +msgstr "Multi-Nettsted" #. module: website #: model_terms:ir.ui.view,arch_db:website.layout @@ -2843,7 +2932,7 @@ msgstr "Navn og favikon for nettstedet ditt" #: model_terms:ir.ui.view,arch_db:website.theme_customize #: model_terms:website.page,arch_db:website.bs_debug_page msgid "Navbar" -msgstr "" +msgstr "Navigasjonsmeny" #. module: website #: model_terms:ir.ui.view,arch_db:website.user_navbar @@ -2886,7 +2975,7 @@ msgstr "Nytt produkt" #. module: website #: model_terms:ir.ui.view,arch_db:website.user_navbar msgid "New Slide" -msgstr "" +msgstr "Nytt lysbilde" #. module: website #: model:ir.model.fields,field_description:website.field_website_menu__new_window @@ -2896,7 +2985,7 @@ msgstr "Nytt vindu" #. module: website #: model_terms:ir.ui.view,arch_db:website.user_navbar msgid "New page" -msgstr "" +msgstr "Ny side" #. module: website #: model_terms:ir.ui.view,arch_db:website.external_snippets @@ -2940,22 +3029,22 @@ msgstr "Ingen" #. module: website #: model_terms:ir.ui.view,arch_db:website.one_page_line msgid "Not SEO optimized" -msgstr "" +msgstr "Ikke SEO-optimalisert" #. module: website #: model_terms:ir.ui.view,arch_db:website.one_page_line msgid "Not in main menu" -msgstr "" +msgstr "Ikke i hovedmenyen" #. module: website #: model_terms:ir.ui.view,arch_db:website.one_page_line msgid "Not indexed" -msgstr "" +msgstr "Ikke indeksert" #. module: website #: model_terms:ir.ui.view,arch_db:website.one_page_line msgid "Not visible" -msgstr "" +msgstr "Ikke synlig" #. module: website #: model_terms:ir.ui.view,arch_db:website.show_website_info @@ -3000,21 +3089,23 @@ msgid "" "Odoo provides essential platform for our project management. Things are " "better organized and more visible with it." msgstr "" +"Odoo tilbyr en essensiell platform for vår prosjektstyring. Ting er bedre " +"organisert og mer synlig med Odoo." #. module: website #: model_terms:ir.ui.view,arch_db:website.s_picture msgid "Odoo • A picture with a caption" -msgstr "" +msgstr "Odoo • Et bilde med bildetekst" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_image_text msgid "Odoo • Image and Text" -msgstr "" +msgstr "Odoo • Bilde og tekst" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_text_image msgid "Odoo • Text and Image" -msgstr "" +msgstr "Odoo • Tekst og bilde" #. module: website #. openerp-web @@ -3026,7 +3117,7 @@ msgstr "På nettsted" #. module: website #: selection:website,auth_signup_uninvited:0 msgid "On invitation" -msgstr "" +msgstr "Etter invitasjon" #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form @@ -3034,6 +3125,8 @@ msgid "" "Once the selection of available websites by domain is done, you can filter " "by country group." msgstr "" +"Så snar valget av nettsteder etter domene er gjort, kan du filtere etter " +"land-gruppe." #. module: website #: model:ir.model.fields,help:website.field_website_page__mode @@ -3065,7 +3158,7 @@ msgstr "Søkemotoroptimalisering" #. module: website #: model_terms:ir.ui.view,arch_db:website.one_page_line msgid "Optimize SEO of this page" -msgstr "" +msgstr "Optimaliser SEO for denne siden" #. module: website #. openerp-web @@ -3097,6 +3190,8 @@ msgid "" "Our products are designed for small to medium size companies willing to optimize\n" " their performance." msgstr "" +"Våre produkter er laget for små til mellomstore bedrifter som er vil optimalisere\n" +" ytelsen sin." #. module: website #: model_terms:ir.ui.view,arch_db:website.footer_custom @@ -3104,12 +3199,14 @@ msgid "" "Our products are designed for small to medium size companies willing to optimize\n" " their performance." msgstr "" +"Våre produkter er utviklet for små og mellomstore bedrifter som er villig til å optimalisere\n" +" ytelsen sin." #. module: website #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view #: model_terms:website.page,arch_db:website.bs_debug_page msgid "Outline" -msgstr "" +msgstr "Omriss" #. module: website #: code:addons/website/models/website.py:298 @@ -3156,7 +3253,7 @@ msgstr "Sideegenskaper" #. module: website #: model_terms:ir.ui.view,arch_db:website.website_pages_tree_view msgid "Page Published" -msgstr "" +msgstr "Siden er publisert" #. module: website #. openerp-web @@ -3187,7 +3284,7 @@ msgstr "Sider" #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view #: model_terms:website.page,arch_db:website.bs_debug_page msgid "Pagination" -msgstr "" +msgstr "Paginering" #. module: website #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view @@ -3196,6 +3293,8 @@ msgid "" "Paragraph with <strong>bold</strong>, <span class=\"text-" "muted\">muted</span> and <em>italic</em> texts" msgstr "" +"Paragraf med <strong>fet</strong>, <span class=\"text-muted\">dempet</span> " +"og <em>kursiv</em> tekst" #. module: website #: model:ir.model.fields,field_description:website.field_website_menu__parent_id @@ -3205,7 +3304,7 @@ msgstr "Overordnet meny" #. module: website #: model:ir.model.fields,field_description:website.field_website_menu__parent_path msgid "Parent Path" -msgstr "" +msgstr "Overordnet sti" #. module: website #: model:ir.model.fields,help:website.field_website__partner_id @@ -3216,14 +3315,14 @@ msgstr "Partnerrelatert brukerdata" #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view #: model_terms:website.page,arch_db:website.bs_debug_page msgid "Pill" -msgstr "" +msgstr "Pille" #. module: website #. openerp-web #: code:addons/website/static/src/xml/website.facebook_page.xml:63 #, python-format msgid "Please enter valid facebook page URL for preview" -msgstr "" +msgstr "Legg inn gyldig URL til Facebook-siden for å se forhåndsvisning" #. module: website #: model_terms:ir.ui.view,arch_db:website.kanban_contain @@ -3259,7 +3358,7 @@ msgstr "Profesjonell" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_tabs msgid "Profile" -msgstr "" +msgstr "Profil" #. module: website #: model_terms:ir.ui.view,arch_db:website.user_navbar @@ -3294,7 +3393,7 @@ msgstr "Publiser" #: code:addons/website/static/src/xml/website.pageProperties.xml:137 #, python-format msgid "Publish date" -msgstr "" +msgstr "Publiseringsdato" #. module: website #. openerp-web @@ -3333,17 +3432,17 @@ msgstr "Kvalitet" #. module: website #: model:ir.model,name:website.model_ir_qweb msgid "Qweb" -msgstr "" +msgstr "Qweb" #. module: website #: model:ir.model,name:website.model_ir_qweb_field_contact msgid "Qweb Field Contact" -msgstr "" +msgstr "Qweb-felt Kontakt" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_btn msgid "Read more" -msgstr "" +msgstr "Les mer" #. module: website #: model:ir.model,name:website.model_ir_rule @@ -3387,7 +3486,7 @@ msgstr "Referanser" #: model:ir.model.fields,field_description:website.field_res_partner__website_id #: model:ir.model.fields,field_description:website.field_res_users__website_id msgid "Registration Website" -msgstr "" +msgstr "Registrert på nettsted" #. module: website #: model_terms:ir.ui.view,arch_db:website.website_pages_form_view @@ -3409,7 +3508,7 @@ msgstr "Tilknyttet side" #: code:addons/website/static/src/xml/website.seo.xml:111 #, python-format msgid "Related keywords" -msgstr "" +msgstr "Relaterte nøkkelord" #. module: website #. openerp-web @@ -3433,7 +3532,7 @@ msgstr "Nullstill maler" #: model:ir.model.fields,help:website.field_website_page__website_id #: model:ir.model.fields,help:website.field_website_published_multi_mixin__website_id msgid "Restrict publishing to this website." -msgstr "" +msgstr "Begrens publisering til dette nettstedet" #. module: website #: model:res.groups,name:website.group_website_publisher @@ -3453,7 +3552,7 @@ msgstr "Høyre" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "Rounded" -msgstr "" +msgstr "Avrundet" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options @@ -3471,12 +3570,12 @@ msgstr "Metadata for søkemotoroptimalisering" #: model:ir.model.fields,field_description:website.field_website_seo_metadata__is_seo_optimized #: model_terms:ir.ui.view,arch_db:website.one_page_line msgid "SEO optimized" -msgstr "" +msgstr "SEO-optimalisert" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_features_grid msgid "Sample Icons" -msgstr "" +msgstr "Eksempelikoner" #. module: website #. openerp-web @@ -3502,7 +3601,7 @@ msgstr "Søk i menyer" #. module: website #: model_terms:ir.ui.view,arch_db:website.view_redirect_search msgid "Search Redirect" -msgstr "" +msgstr "Søke-omdirigering" #. module: website #: model_terms:ir.ui.view,arch_db:website.website_search_box @@ -3517,12 +3616,12 @@ msgstr "Andre funksjon" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_features_grid msgid "Second list of Features" -msgstr "" +msgstr "Andre liste over funksjonalitet" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_image_text msgid "Section Subtitle" -msgstr "" +msgstr "Undertittel for seksjon" #. module: website #. openerp-web @@ -3536,7 +3635,7 @@ msgstr "Velg en meny" #: code:addons/website/static/src/xml/website.seo.xml:125 #, python-format msgid "Select an image for social share" -msgstr "" +msgstr "Velg et bilde for sosial deling" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_features_grid @@ -3546,7 +3645,7 @@ msgstr "Velg og slett blokker for å fjerne noen funksjoner." #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form msgid "Select the Website to Configure" -msgstr "" +msgstr "Velg nettstedet du vil konfigurere" #. module: website #: model_terms:ir.ui.view,arch_db:website.contactus @@ -3558,7 +3657,7 @@ msgstr "Send oss en epostmelding" #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view #: model_terms:website.page,arch_db:website.bs_debug_page msgid "Separated link" -msgstr "" +msgstr "Separert link" #. module: website #: model:ir.model.fields,field_description:website.field_website_menu__sequence @@ -3581,7 +3680,7 @@ msgstr "Innstillinger" #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form msgid "Settings on this page will apply to this website" -msgstr "" +msgstr "Innstillinger for denne siden vil gjelde for dette nettstedet" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options @@ -3619,7 +3718,7 @@ msgstr "Vis som valgfritt arv" #: code:addons/website/static/src/xml/website.facebook_page.xml:49 #, python-format msgid "Show Friend's Faces" -msgstr "" +msgstr "Vis Venners Ansikter" #. module: website #. openerp-web @@ -3636,14 +3735,14 @@ msgstr "Størrelse" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "Slide" -msgstr "" +msgstr "Lysbilde" #. module: website #. openerp-web #: code:addons/website/static/src/xml/website.gallery.xml:17 #, python-format msgid "Slide image" -msgstr "" +msgstr "Lysbilde-bilde" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options @@ -3665,7 +3764,7 @@ msgstr "Liten" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "Small Caps" -msgstr "" +msgstr "Små store bokstaver" #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form @@ -3675,13 +3774,13 @@ msgstr "Sosiale medier" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "Solid" -msgstr "" +msgstr "Solid" #. module: website #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view #: model_terms:website.page,arch_db:website.bs_debug_page msgid "Something else here" -msgstr "" +msgstr "Noe annet her" #. module: website #: code:addons/website/controllers/main.py:224 @@ -3699,7 +3798,7 @@ msgstr "Sorter på URL" #: model:ir.model.fields,field_description:website.field_res_config_settings__specific_user_account #: model:ir.model.fields,field_description:website.field_website__specific_user_account msgid "Specific User Account" -msgstr "" +msgstr "Spesifikk Brukerkonto" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options @@ -3709,25 +3808,25 @@ msgstr "Kvadrat" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_comparisons msgid "Start now" -msgstr "" +msgstr "Start nå" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_image_text #: model_terms:ir.ui.view,arch_db:website.s_text_image msgid "Start with the customer – find out what they want and give it to them." -msgstr "" +msgstr "Begynn med kundene – finn ut hva de vil ha og gi dem det." #. module: website #: model_terms:ir.ui.view,arch_db:website.s_carousel msgid "Start your journey" -msgstr "" +msgstr "Begynn din reise" #. module: website #. openerp-web #: code:addons/website/static/src/xml/website.editor.xml:51 #, python-format msgid "State colors" -msgstr "" +msgstr "Tilstandsfarger" #. module: website #. openerp-web @@ -3740,6 +3839,8 @@ msgstr "Bli på denne siden" #: model_terms:ir.ui.view,arch_db:website.s_carousel msgid "Storytelling is powerful.<br/> It draws readers in and engages them." msgstr "" +"Historiefortelling er kraftfult.<br/> Det drar kundene inn og engasjerer " +"dem." #. module: website #: model_terms:ir.ui.view,arch_db:website.user_navbar @@ -3768,7 +3869,7 @@ msgstr "Teknisk navn:" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_features msgid "Tell what's the value for the <br/>customer for this feature." -msgstr "" +msgstr "Forklar verdien for kunden<br/>i denne funksjonaliteten." #. module: website #: code:addons/website/models/website.py:314 @@ -3811,18 +3912,19 @@ msgstr "Tjenestevilkår" #: code:addons/website/static/src/xml/website.editor.xml:45 #, python-format msgid "Text colors" -msgstr "" +msgstr "Tekstfarger" #. module: website #: code:addons/website/controllers/backend.py:54 #, python-format msgid "The Google Analytics Client ID or Key you entered seems incorrect." msgstr "" +"Google Analytics Klient-ID eller Nøkkelen du la inn ser ut til å være feil." #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form msgid "The company this website belongs to" -msgstr "" +msgstr "Firmaet dette nettstedet tilhører" #. module: website #. openerp-web @@ -3833,6 +3935,8 @@ msgid "" "The description will be generated by search engines based on page content " "unless you specify one." msgstr "" +"Beskrivelsen vil bli generert av søkemotorer basert på sideinnhold, med " +"mindre du spesifiserer en her." #. module: website #. openerp-web @@ -3842,6 +3946,8 @@ msgid "" "The description will be generated by social media based on page content " "unless you specify one." msgstr "" +"Beskrivelsen vil bli generert av sosiale medier basert på sideinnhold, med " +"mindre du spesifiserer en her." #. module: website #: model_terms:ir.ui.view,arch_db:website.http_error_debug @@ -3870,7 +3976,7 @@ msgstr "Full URL for å få tilgang til server-handlinger gjennom nettstedet." #: code:addons/website/static/src/js/menu/new_content.js:27 #, python-format msgid "The installation of an App is already in progress." -msgstr "" +msgstr "Installasjonen av denne Appen pågår allerede." #. module: website #: model_terms:ir.ui.view,arch_db:website.403 @@ -3899,6 +4005,7 @@ msgstr "De valgte malene vil tilbakestilles til fabrikkinnstillinger." #, python-format msgid "The title will take a default value unless you specify one." msgstr "" +"Tittelen vil få tildelt en standardverdi, med mindre du spesifiserer en." #. module: website #: model:ir.model.fields,field_description:website.field_website__theme_id @@ -3926,11 +4033,16 @@ msgid "" " and conditions of your use of this website and any of its products or " "services (collectively, \"Website\" or \"Services\")." msgstr "" +"Disse tjenestevilkårene (\"Vilkår\", \"Avtale\") er en avtale mellom " +"nettstedet (\"nettstedleverandør\", \"oss\", \"vi\" eller \"vår\") og deg " +"(\"bruker\", \"deg\", \"ditt\"). Avtalen legger frem de generelle vilkårene " +"og betingelsene for bruk av dettenettstedet og dets produkter og tjenester " +"(kollektivt \"nettstedet\" eller \"tjenestene\")." #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "Thin" -msgstr "" +msgstr "Tynn" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_features @@ -3954,7 +4066,7 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view #: model_terms:website.page,arch_db:website.bs_debug_page msgid "This is a \"" -msgstr "" +msgstr "Dette er en \"" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_banner @@ -3962,6 +4074,8 @@ msgid "" "This is a simple hero unit, a simple jumbotron-style component <br/>for " "calling extra attention to featured content or information." msgstr "" +"Dette er en enkel hero-enhet, en enkel komponent i jumbotron-stil <br/>for å" +" få ekstra oppmerksomhet på utvalgt innhold og informasjon." #. module: website #: model_terms:ir.ui.view,arch_db:website.page_404 @@ -3981,7 +4095,7 @@ msgstr "Denne siden er i menyen <b>%s</b>" #. module: website #: model_terms:ir.ui.view,arch_db:website.one_page_line msgid "This page will be visible on {{ date_formatted }}" -msgstr "" +msgstr "Denn siden vil bli synlig den {{ date_formatted }}" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options @@ -3993,7 +4107,7 @@ msgstr "Miniatyrbilder" #: code:addons/website/static/src/xml/website.facebook_page.xml:18 #, python-format msgid "Timeline" -msgstr "" +msgstr "Tidslinje" #. module: website #. openerp-web @@ -4010,6 +4124,9 @@ msgid "" "right icon of each block. Then, duplicate one of the column to create a new " "one as a copy." msgstr "" +"For å legge til en fjerde kolonne, reduser bredden på disse tre kolonnene " +"med ikonet til høyre i hver blokk. Dupliser så én av kolonnene for å " +"opprette en ny kolonne som kopi." #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form @@ -4018,12 +4135,15 @@ msgid "" "list view and click on 'Portal Access Management' option in the dropdown " "menu *Action*." msgstr "" +"For å sende invitasjoner i B2B modus, åpne en kontrakt, eller velg flere i " +"listevisning, og klikk på 'Tilgangsadministrasjon for Portal' i " +"nedtrekksmenyen *Handling\"." #. module: website #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view #: model_terms:website.page,arch_db:website.bs_debug_page msgid "Toggle" -msgstr "" +msgstr "Veksle" #. module: website #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view @@ -4039,7 +4159,7 @@ msgstr "Fred Tangen, CEO" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "Top" -msgstr "" +msgstr "Topp" #. module: website #. openerp-web @@ -4052,7 +4172,7 @@ msgstr "Toppmeny" #: code:addons/website/models/website.py:177 #, python-format msgid "Top Menu for Website %s" -msgstr "" +msgstr "Toppmeny for Nettsted %s" #. module: website #: model_terms:ir.ui.view,arch_db:website.http_error_debug @@ -4062,7 +4182,7 @@ msgstr "Tilbakesporing" #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form msgid "Track clicks on UTM links" -msgstr "" +msgstr "Spor klikk på UTM-linker" #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form @@ -4089,7 +4209,7 @@ msgstr "Gjennomsiktig" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_features_grid msgid "Turn every feature into a benefit for your reader." -msgstr "" +msgstr "Gjør enhver funksjon til en fordel for dine lesere." #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form @@ -4140,7 +4260,7 @@ msgstr "" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "Underlined" -msgstr "" +msgstr "Understreket" #. module: website #: model_terms:ir.ui.view,arch_db:website.index_management @@ -4175,14 +4295,14 @@ msgstr "URL" #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form msgid "Use Google Map on your website (" -msgstr "" +msgstr "Bruk Google Map på ditt nettsted (" #. module: website #. openerp-web #: code:addons/website/static/src/xml/website.facebook_page.xml:35 #, python-format msgid "Use Small Header" -msgstr "" +msgstr "Bruk liten Topptekst" #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form @@ -4199,7 +4319,7 @@ msgstr "Bruk som hjemmeside" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_faq_collapse msgid "Use of Cookies" -msgstr "" +msgstr "Bruk Cookies" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_carousel @@ -4207,47 +4327,49 @@ msgid "" "Use this snippet to presents your content in a slideshow-like format.<br/> " "Don't write about products or services here, write about solutions." msgstr "" +"Bruk denne blokken for å presentere innholdet dit i et lysbildeformat.<br/> " +"Ikke skriv om produkter eller tjenester her, skriv om dine løsninger." #. module: website #. openerp-web #: code:addons/website/static/src/xml/website.seo.xml:110 #, python-format msgid "Used in page content" -msgstr "" +msgstr "Brukt i sideinnhold" #. module: website #. openerp-web #: code:addons/website/static/src/xml/website.seo.xml:109 #, python-format msgid "Used in page description" -msgstr "" +msgstr "Brukt i sidebeskrivelsen" #. module: website #. openerp-web #: code:addons/website/static/src/xml/website.seo.xml:106 #, python-format msgid "Used in page first level heading" -msgstr "" +msgstr "Brukt på siden i overskrift med første nivå" #. module: website #. openerp-web #: code:addons/website/static/src/xml/website.seo.xml:107 #, python-format msgid "Used in page second level heading" -msgstr "" +msgstr "Brukt på siden i overskrift med andre nivå" #. module: website #. openerp-web #: code:addons/website/static/src/xml/website.seo.xml:108 #, python-format msgid "Used in page title" -msgstr "" +msgstr "Brukt i sidetittel" #. module: website #: model:ir.model.fields,help:website.field_res_config_settings__website_country_group_ids #: model:ir.model.fields,help:website.field_website__country_group_ids msgid "Used when multiple websites have the same domain." -msgstr "" +msgstr "Brukes når flere nettsteder har samme domene." #. module: website #: model_terms:ir.ui.view,arch_db:website.robots @@ -4267,7 +4389,7 @@ msgstr "Brukere" #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view #: model_terms:website.page,arch_db:website.bs_debug_page msgid "Utilities & Typography" -msgstr "" +msgstr "Verktøy & Typografi" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options @@ -4308,12 +4430,12 @@ msgstr "Se type" #. module: website #: model:ir.model.fields,field_description:website.field_website_page__mode msgid "View inheritance mode" -msgstr "" +msgstr "Arve-modus for visning" #. module: website #: model:ir.model.fields,field_description:website.field_website_page__inherit_children_ids msgid "Views which inherit from this one" -msgstr "" +msgstr "Visninger som arver fra denne" #. module: website #: model_terms:ir.ui.view,arch_db:website.one_page_line @@ -4325,7 +4447,7 @@ msgstr "Synlig" #: model:ir.model.fields,field_description:website.field_website_published_mixin__website_published #: model:ir.model.fields,field_description:website.field_website_published_multi_mixin__website_published msgid "Visible on current website" -msgstr "" +msgstr "Synlig på gjeldende nettsted" #. module: website #. openerp-web @@ -4349,6 +4471,9 @@ msgid "" " life through disruptive products. We build great products to solve your\n" " business problems." msgstr "" +"Vi er et team av engasjerte mennesker som har som mål å gjøre alles \n" +"liv bedre med banebrytende produkter. Vi skaper gode produkter som \n" +"løser problemer for virksomheten din." #. module: website #: model_terms:ir.ui.view,arch_db:website.footer_custom @@ -4357,6 +4482,9 @@ msgid "" " life through disruptive products. We build great products to solve your\n" " business problems." msgstr "" +"Vi er et team av engasjerte mennesker som har som mål å gjøre alles \n" +"liv bedre med banebrytende produkter. Vi skaper gode produkter som \n" +"løser problemer for virksomheten din." #. module: website #. openerp-web @@ -4384,7 +4512,7 @@ msgstr "Nettsted" #. module: website #: model:ir.model.fields,field_description:website.field_res_config_settings__website_company_id msgid "Website Company" -msgstr "" +msgstr "Nettstedfirma" #. module: website #: model:ir.model.fields,field_description:website.field_res_config_settings__website_domain @@ -4406,7 +4534,7 @@ msgstr "Nettsted-meny" #. module: website #: model_terms:ir.ui.view,arch_db:website.website_menus_form_view msgid "Website Menus Settings" -msgstr "" +msgstr "Nettsted Meny-innstillinger" #. module: website #: model:ir.model.fields,field_description:website.field_res_config_settings__website_name @@ -4418,7 +4546,7 @@ msgstr "Nettsted-navn" #: model:ir.model.fields,field_description:website.field_ir_ui_view__first_page_id #: model:ir.model.fields,field_description:website.field_website_page__first_page_id msgid "Website Page" -msgstr "" +msgstr "Nettsted-side" #. module: website #: model_terms:ir.ui.view,arch_db:website.website_pages_form_view @@ -4439,7 +4567,7 @@ msgstr "Nettsted-filbane" #. module: website #: model:ir.model,name:website.model_website_published_mixin msgid "Website Published Mixin" -msgstr "" +msgstr "Nettsted Publisert Mixin" #. module: website #: model:ir.model,name:website.model_website_redirect @@ -4487,6 +4615,9 @@ msgid "" "the User by this site. The User may configure his / her browser to notify " "and reject the installation of the cookies sent by us." msgstr "" +"Nettstedet kan bruke cookies for å tilpasse og legge til rette for best " +"mulig navigasjon for brukeren. Brukeren kan konfigurere sin nettleser til å " +"gi beskjed og avvise installasjonen av cookies sendt av oss. " #. module: website #: model_terms:ir.ui.view,arch_db:website.menu_tree @@ -4560,6 +4691,8 @@ msgid "" "Write a quote here from one of your customers. Quotes are a great way to " "build confidence in your products or services." msgstr "" +"Skriv et sitat fra en av dine kunder her. Kundesitater er en flott måte å " +"bygge tillit til produkter og tjenester på." #. module: website #: model_terms:ir.ui.view,arch_db:website.s_image_text @@ -4568,6 +4701,8 @@ msgid "" "Write one or two paragraphs describing your product or services. <br/>To be " "successful your content needs to be useful to your readers." msgstr "" +"Skriv én eller to paragrafer som beskriver dine produkter og tjenester. " +"<br/>For å være effektivt, må innholdet være nyttig for leserne dine." #. module: website #: model_terms:ir.ui.view,arch_db:website.s_cover @@ -4576,17 +4711,19 @@ msgid "" "feature.<br/> To be successful your content needs to be useful to your " "readers." msgstr "" +"Skriv én eller to paragrafer som beskriver dine produkter og tjenester. " +"<br/>For å være effektivt, må innholdet være nyttig for leserne dine." #. module: website #: model_terms:ir.ui.view,arch_db:website.s_features msgid "" "Write what the customer would like to know, <br/>not what you want to show." -msgstr "" +msgstr "Skriv det kunden gjerne vil vite, <br/>ikke det du vil vise frem." #. module: website #: model_terms:ir.ui.view,arch_db:website.s_features_grid msgid "You can edit colors and background to highlight features." -msgstr "" +msgstr "Du kan redigere farger og bakgrunn for å fremheve egenskaper." #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form @@ -4594,17 +4731,19 @@ msgid "" "You can have 2 websites with same domain AND a condition on country group to" " select wich website use." msgstr "" +"Du kan ha 2 nettsteder med samme domene, OG en betingelse på land-gruppe for" +" å velge hvilket nettsted som skal brukes." #. module: website #: sql_constraint:res.users:0 msgid "You can not have two users with the same login!" -msgstr "" +msgstr "Du kan ikke ha to brukere med samme brukernavn!" #. module: website #: code:addons/website/controllers/backend.py:47 #, python-format msgid "You do not have sufficient rights to perform that action." -msgstr "" +msgstr "Du har ikke rettigheter til å utføre denne handlingen." #. module: website #. openerp-web @@ -4621,6 +4760,8 @@ msgid "" "You have hidden this page from search results. It won't be indexed by search" " engines." msgstr "" +"Du har skjult denne siden fra søkeresultater. Den vil ikke bli indeksert av " +"søkemotorer." #. module: website #. openerp-web @@ -4636,11 +4777,14 @@ msgid "" " of any website which you access through a link from this Website. Your " "linking to any other off-site pages or other websites is at your own risk." msgstr "" +"Du bør nøye vurdere juridiske utsagn og andre vilkår for bruk av nettsteder " +"som man har tilgang til via en lenke fra denne nettstedet. Dine koblinger " +"til andre nettsteder er på egen risiko." #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form msgid "YouTube" -msgstr "" +msgstr "YouTube" #. module: website #. openerp-web @@ -4668,14 +4812,14 @@ msgstr "Endringene du har gjort, vil lagres automatisk." #: code:addons/website/static/src/js/menu/seo.js:393 #, python-format msgid "Your description looks too long." -msgstr "" +msgstr "Beskrivelsen din ser ut til å være for lang." #. module: website #. openerp-web #: code:addons/website/static/src/js/menu/seo.js:395 #, python-format msgid "Your description looks too short." -msgstr "" +msgstr "Beskrivelsen din ser ut til å være for kort." #. module: website #: model_terms:ir.ui.view,arch_db:website.list_website_pages @@ -4697,7 +4841,7 @@ msgstr "og vurderer følgende uttrykk:" #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view #: model_terms:website.page,arch_db:website.bs_debug_page msgid "breadcrumb" -msgstr "" +msgstr "brødsmule" #. module: website #. openerp-web @@ -4709,14 +4853,14 @@ msgstr "for eksempel Om oss" #. module: website #: model:ir.ui.menu,name:website.menu_website_dashboard msgid "eCommerce Dashboard" -msgstr "" +msgstr "Nettbutikk Dashbord" #. module: website #. openerp-web #: code:addons/website/static/src/xml/website.xml:41 #, python-format msgid "found(s)" -msgstr "" +msgstr "fant" #. module: website #: model_terms:ir.ui.view,arch_db:website.brand_promotion @@ -4732,7 +4876,7 @@ msgstr "instans av Odoo," #: model_terms:ir.ui.view,arch_db:website.bs_debug_page_ir_ui_view #: model_terms:website.page,arch_db:website.bs_debug_page msgid "link" -msgstr "" +msgstr "link" #. module: website #: model_terms:ir.ui.view,arch_db:website.menu_search @@ -4752,7 +4896,7 @@ msgstr "" #. module: website #: model_terms:ir.ui.view,arch_db:website.snippet_options msgid "px" -msgstr "" +msgstr "px" #. module: website #. openerp-web @@ -4785,7 +4929,7 @@ msgstr "med" #. module: website #: model_terms:ir.ui.view,arch_db:website.res_config_settings_view_form msgid "www.odoo.com" -msgstr "" +msgstr "www.odoo.com" #. module: website #: model_terms:ir.ui.view,arch_db:website.500 @@ -4795,4 +4939,4 @@ msgstr "ja" #. module: website #: model_terms:ir.ui.view,arch_db:website.s_tabs msgid "— Jane DOE, CEO of <b>MyCompany</b>" -msgstr "" +msgstr "— Kari Nordmann, Daglig leder for <b>MinBedrift</b>" diff --git a/addons/website_blog/i18n/cs.po b/addons/website_blog/i18n/cs.po index 1c0bf2b9f40..564124001ef 100644 --- a/addons/website_blog/i18n/cs.po +++ b/addons/website_blog/i18n/cs.po @@ -9,7 +9,7 @@ # Jakub Lohnisky <jakub@lepremier.cz>, 2018 # Jan Horzinka <jan.horzinka@centrum.cz>, 2018 # Michal Veselý <michal@veselyberanek.net>, 2018 -# J. Podhorecky <j.podhorecky@volny.cz>, 2018 +# trendspotter <j.podhorecky@volny.cz>, 2018 # msgid "" msgstr "" @@ -17,7 +17,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" "PO-Revision-Date: 2018-08-24 09:33+0000\n" -"Last-Translator: J. Podhorecky <j.podhorecky@volny.cz>, 2018\n" +"Last-Translator: trendspotter <j.podhorecky@volny.cz>, 2018\n" "Language-Team: Czech (https://www.transifex.com/odoo/teams/41243/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -271,7 +271,7 @@ msgstr "" #: model:ir.model.fields,field_description:website_blog.field_blog_blog__message_attachment_count #: model:ir.model.fields,field_description:website_blog.field_blog_post__message_attachment_count msgid "Attachment Count" -msgstr "" +msgstr "Počet příloh" #. module: website_blog #: model:ir.model.fields,field_description:website_blog.field_blog_post__author_id @@ -579,7 +579,7 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:website_blog.blog_post_short #: model_terms:ir.ui.view,arch_db:website_blog.opt_blog_rc_follow_us msgid "Google Plus" -msgstr "" +msgstr "Google Plus" #. module: website_blog #: model_terms:ir.ui.view,arch_db:website_blog.website_blog @@ -1203,7 +1203,7 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:website_blog.blog_post_short #: model_terms:ir.ui.view,arch_db:website_blog.opt_blog_rc_follow_us msgid "Twitter" -msgstr "" +msgstr "Twitter" #. module: website_blog #: model_terms:ir.ui.view,arch_db:website_blog.opt_blog_rc_status diff --git a/addons/website_blog/i18n/nb.po b/addons/website_blog/i18n/nb.po index 3fed063fd2e..b461d030423 100644 --- a/addons/website_blog/i18n/nb.po +++ b/addons/website_blog/i18n/nb.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" -"PO-Revision-Date: 2018-10-08 06:49+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:33+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -582,7 +584,7 @@ msgstr "GitHub" #: model_terms:ir.ui.view,arch_db:website_blog.blog_post_short #: model_terms:ir.ui.view,arch_db:website_blog.opt_blog_rc_follow_us msgid "Google Plus" -msgstr "" +msgstr "Google Plus" #. module: website_blog #: model_terms:ir.ui.view,arch_db:website_blog.website_blog @@ -665,7 +667,7 @@ msgstr "Er følger" #. module: website_blog #: model:ir.model.fields,field_description:website_blog.field_blog_post__is_published msgid "Is published" -msgstr "" +msgstr "Er Publisert" #. module: website_blog #: model_terms:blog.post,content:website_blog.blog_post_1 @@ -725,7 +727,7 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:website_blog.blog_post_short #: model_terms:ir.ui.view,arch_db:website_blog.opt_blog_rc_follow_us msgid "LinkedIn" -msgstr "" +msgstr "LinkedIn" #. module: website_blog #: model_terms:ir.ui.view,arch_db:website_blog.website_blog @@ -1004,14 +1006,14 @@ msgstr "Rød" #: model:ir.model.fields,help:website_blog.field_blog_blog__website_id #: model:ir.model.fields,help:website_blog.field_blog_post__website_id msgid "Restrict publishing to this website." -msgstr "" +msgstr "Begrens publisering til dette nettstedet" #. module: website_blog #: model:ir.model.fields,field_description:website_blog.field_blog_blog__is_seo_optimized #: model:ir.model.fields,field_description:website_blog.field_blog_post__is_seo_optimized #: model:ir.model.fields,field_description:website_blog.field_blog_tag__is_seo_optimized msgid "SEO optimized" -msgstr "" +msgstr "SEO-optimalisert" #. module: website_blog #. openerp-web @@ -1251,7 +1253,7 @@ msgstr "Brukt i:" #. module: website_blog #: model:ir.model.fields,field_description:website_blog.field_blog_post__website_published msgid "Visible on current website" -msgstr "" +msgstr "Synlig på nåværende nettsted" #. module: website_blog #: model:ir.model,name:website_blog.model_website diff --git a/addons/website_blog/i18n/zh_TW.po b/addons/website_blog/i18n/zh_TW.po index c9379a4d1db..e18fa5117f1 100644 --- a/addons/website_blog/i18n/zh_TW.po +++ b/addons/website_blog/i18n/zh_TW.po @@ -810,11 +810,10 @@ msgid "" " of your daily emails. Use the \"To: me\" menu\n" " for these." msgstr "" -"「用於行動」的消息：這些消息\n" -"都需要您的立即注意\n" -"和處理。您的日常電子信件中有 10%\n" -"屬於此類消息。針對這些內容使用「收件人：我」\n" -"選單。" +"標為「需要處理」的訊息：\n" +" 這些訊息需要您立即檢視並處理。這大概會\n" +" 佔每天電子郵件的 10% 。用「寄給：我」\n" +" 選單項目來處理這些訊息。" #. module: website_blog #: model_terms:blog.post,content:website_blog.blog_post_1 @@ -826,12 +825,11 @@ msgid "" " to follow.This accounts for 90% of your daily\n" " emails.Use the \"Inbox\" menu for these." msgstr "" -"「用於參考」的消息：\n" -"現在您可以在需要指定信息時才\n" -"獲取這些消息；這些消息不必\n" -"每天閱讀。只有當您決定\n" -"關注時才會接受此類消息。這佔了您日常\n" -"電子信件的 90%。針對這些使用「收件箱」選單。" +"標為「參考資訊」的訊息：\n" +" 您可以在需要特定資訊的時候再拉出這些訊息。\n" +" 這些訊息不需每天閱讀。你只會收到你決定要關\n" +" 注的訊息。這大概會佔每天電子郵件的 90% 。用\n" +" 「收件匣」選單項目來處理這些訊息。" #. module: website_blog #: model_terms:ir.ui.view,arch_db:website_blog.website_blog @@ -876,12 +874,12 @@ msgstr "無封面" #: code:addons/website_blog/static/src/js/s_latest_posts_frontend.js:44 #, python-format msgid "No blog post was found. Make sure your posts are published." -msgstr "" +msgstr "找不到部落格貼文。請確認您的貼文已發佈。" #. module: website_blog #: model_terms:ir.ui.view,arch_db:website_blog.blog_post_short msgid "No blog post yet." -msgstr "尚未發佈博文。" +msgstr "尚無部落格貼文。" #. module: website_blog #: model:ir.model.fields,field_description:website_blog.field_blog_post__visits @@ -891,7 +889,7 @@ msgstr "瀏覽數量" #. module: website_blog #: model_terms:ir.ui.view,arch_db:website_blog.latest_blogs msgid "No tags defined!" -msgstr "" +msgstr "沒有定義任何標籤！" #. module: website_blog #: model_terms:ir.ui.view,arch_db:website_blog.website_blog @@ -902,7 +900,7 @@ msgstr "無" #: model:ir.model.fields,field_description:website_blog.field_blog_blog__message_needaction_counter #: model:ir.model.fields,field_description:website_blog.field_blog_post__message_needaction_counter msgid "Number of Actions" -msgstr "行動數量" +msgstr "動作數量" #. module: website_blog #: model:ir.model.fields,field_description:website_blog.field_blog_blog__message_has_error_counter @@ -914,24 +912,24 @@ msgstr "錯誤數量" #: model:ir.model.fields,help:website_blog.field_blog_blog__message_needaction_counter #: model:ir.model.fields,help:website_blog.field_blog_post__message_needaction_counter msgid "Number of messages which requires an action" -msgstr "需要行動消息的數量" +msgstr "需要處理的消息數量" #. module: website_blog #: model:ir.model.fields,help:website_blog.field_blog_blog__message_has_error_counter #: model:ir.model.fields,help:website_blog.field_blog_post__message_has_error_counter msgid "Number of messages with delivery error" -msgstr "發送錯誤的郵件數" +msgstr "有發送錯誤的郵件數量" #. module: website_blog #: model_terms:ir.ui.view,arch_db:website_blog.s_latest_posts_options msgid "Number of posts" -msgstr "" +msgstr "貼文數量" #. module: website_blog #: model:ir.model.fields,help:website_blog.field_blog_blog__message_unread_counter #: model:ir.model.fields,help:website_blog.field_blog_post__message_unread_counter msgid "Number of unread messages" -msgstr "未讀消息的數量" +msgstr "未讀訊息的數量" #. module: website_blog #: model_terms:blog.post,content:website_blog.blog_post_2 diff --git a/addons/website_crm/i18n/nb.po b/addons/website_crm/i18n/nb.po index 472e3d03bf5..aaa8d175176 100644 --- a/addons/website_crm/i18n/nb.po +++ b/addons/website_crm/i18n/nb.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:17+0000\n" -"PO-Revision-Date: 2018-09-21 13:17+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:33+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -38,7 +40,7 @@ msgstr "Kommunikasjon" #. module: website_crm #: model:ir.model,name:website_crm.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: website_crm #: model_terms:ir.ui.view,arch_db:website_crm.res_config_settings_view_form diff --git a/addons/website_crm_partner_assign/i18n/nb.po b/addons/website_crm_partner_assign/i18n/nb.po index c7c4ed22f4d..82f47bdb101 100644 --- a/addons/website_crm_partner_assign/i18n/nb.po +++ b/addons/website_crm_partner_assign/i18n/nb.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" -"PO-Revision-Date: 2018-10-08 06:49+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:33+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -631,7 +633,7 @@ msgstr "Fakturakontodato" #. module: website_crm_partner_assign #: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_grade__is_published msgid "Is published" -msgstr "" +msgstr "Er Publisert" #. module: website_crm_partner_assign #: model:ir.model.fields,field_description:website_crm_partner_assign.field_crm_lead_assignation____last_update @@ -1147,7 +1149,7 @@ msgstr "Bruker" #. module: website_crm_partner_assign #: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_grade__website_published msgid "Visible on current website" -msgstr "" +msgstr "Synlig på nåværende nettsted" #. module: website_crm_partner_assign #: model:ir.model.fields,field_description:website_crm_partner_assign.field_res_partner_grade__website_url diff --git a/addons/website_customer/i18n/nb.po b/addons/website_customer/i18n/nb.po index 8d4b1d838c7..d484da35fa2 100644 --- a/addons/website_customer/i18n/nb.po +++ b/addons/website_customer/i18n/nb.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:18+0000\n" -"PO-Revision-Date: 2018-09-21 13:18+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:34+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -99,7 +101,7 @@ msgstr "Implementert av" #. module: website_customer #: model:ir.model.fields,field_description:website_customer.field_res_partner_tag__is_published msgid "Is published" -msgstr "" +msgstr "Er Publisert" #. module: website_customer #: model:ir.model.fields,field_description:website_customer.field_res_partner_tag____last_update @@ -190,7 +192,7 @@ msgstr "Stoles på av millioner verden over" #. module: website_customer #: model:ir.model.fields,field_description:website_customer.field_res_partner_tag__website_published msgid "Visible on current website" -msgstr "" +msgstr "Synlig på nåværende nettsted" #. module: website_customer #: model:ir.actions.act_window,name:website_customer.action_partner_tag_form diff --git a/addons/website_event/i18n/nb.po b/addons/website_event/i18n/nb.po index a7c0f8b94a9..f7605de2efb 100644 --- a/addons/website_event/i18n/nb.po +++ b/addons/website_event/i18n/nb.po @@ -3,15 +3,17 @@ # * website_event # # Translators: -# Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Martin Trigaux, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-02 10:07+0000\n" -"PO-Revision-Date: 2018-10-02 10:07+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:34+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -415,7 +417,7 @@ msgstr "Deltar" #. module: website_event #: model:ir.model.fields,field_description:website_event.field_event_event__is_published msgid "Is published" -msgstr "" +msgstr "Er Publisert" #. module: website_event #: code:addons/website_event/models/event.py:71 diff --git a/addons/website_event_track/controllers/main.py b/addons/website_event_track/controllers/main.py index 48447342976..ce7fa9fbf94 100644 --- a/addons/website_event_track/controllers/main.py +++ b/addons/website_event_track/controllers/main.py @@ -64,6 +64,7 @@ class WebsiteEventTrackController(http.Controller): locations[location][-1][3] -= 1 locations[location].append([track, start_date, end_date, 1]) dates[-1][1][location] = locations[location][-1] + locations = collections.OrderedDict(sorted(locations.items(), key=lambda t: t[0].id if t[0] else 0)) return { 'locations': locations, 'dates': dates @@ -77,7 +78,7 @@ class WebsiteEventTrackController(http.Controller): event = event.with_context(tz=event.date_tz or 'UTC') local_tz = pytz.timezone(event.date_tz or 'UTC') days_tracks = collections.defaultdict(lambda: []) - for track in event.track_ids.sorted(lambda track: (track.date or '', bool(track.location_id))): + for track in event.track_ids.sorted(lambda track: (bool(track.date), track.date, bool(track.location_id))): if not track.date: continue date = fields.Datetime.from_string(track.date).replace(tzinfo=pytz.utc).astimezone(local_tz) diff --git a/addons/website_event_track/i18n/cs.po b/addons/website_event_track/i18n/cs.po index 3ccae84edf7..01409534128 100644 --- a/addons/website_event_track/i18n/cs.po +++ b/addons/website_event_track/i18n/cs.po @@ -9,7 +9,7 @@ # Jan Horzinka <jan.horzinka@centrum.cz>, 2018 # Michal Veselý <michal@veselyberanek.net>, 2018 # Martin Trigaux, 2018 -# J. Podhorecky <j.podhorecky@volny.cz>, 2018 +# trendspotter <j.podhorecky@volny.cz>, 2018 # msgid "" msgstr "" @@ -17,7 +17,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" "PO-Revision-Date: 2018-08-24 09:34+0000\n" -"Last-Translator: J. Podhorecky <j.podhorecky@volny.cz>, 2018\n" +"Last-Translator: trendspotter <j.podhorecky@volny.cz>, 2018\n" "Language-Team: Czech (https://www.transifex.com/odoo/teams/41243/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -214,7 +214,7 @@ msgstr "Archivováno" #. module: website_event_track #: model:ir.model.fields,field_description:website_event_track.field_event_track__message_attachment_count msgid "Attachment Count" -msgstr "" +msgstr "Počet příloh" #. module: website_event_track #: model:ir.model.fields,field_description:website_event_track.field_event_event__allowed_track_tag_ids diff --git a/addons/website_event_track/i18n/nb.po b/addons/website_event_track/i18n/nb.po index 3ca4ba44442..56ea3e23cd5 100644 --- a/addons/website_event_track/i18n/nb.po +++ b/addons/website_event_track/i18n/nb.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" -"PO-Revision-Date: 2018-10-08 06:49+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:34+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -340,7 +342,7 @@ msgstr "Dokumenter" #. module: website_event_track #: model_terms:ir.ui.view,arch_db:website_event_track.view_event_track_kanban msgid "Dropdown menu" -msgstr "" +msgstr "Nedtrekksmeny" #. module: website_event_track #: model:ir.model.fields,field_description:website_event_track.field_event_track__duration @@ -617,7 +619,7 @@ msgstr "Er følger" #. module: website_event_track #: model:ir.model.fields,field_description:website_event_track.field_event_track__is_published msgid "Is published" -msgstr "" +msgstr "Er Publisert" #. module: website_event_track #: model:ir.model.fields,field_description:website_event_track.field_event_track__kanban_state @@ -922,7 +924,7 @@ msgstr "Rom" #. module: website_event_track #: model:ir.model.fields,field_description:website_event_track.field_event_track__is_seo_optimized msgid "SEO optimized" -msgstr "" +msgstr "SEO-optimalisert" #. module: website_event_track #: model:ir.model.fields,field_description:website_event_track.field_event_sponsor__sequence @@ -1270,7 +1272,7 @@ msgstr "Se spor" #. module: website_event_track #: model:ir.model.fields,field_description:website_event_track.field_event_track__website_published msgid "Visible on current website" -msgstr "" +msgstr "Synlig på nåværende nettsted" #. module: website_event_track #: model_terms:ir.ui.view,arch_db:website_event_track.event_track_proposal diff --git a/addons/website_form/i18n/nb.po b/addons/website_form/i18n/nb.po index 1a7e7df92e3..dab635302d8 100644 --- a/addons/website_form/i18n/nb.po +++ b/addons/website_form/i18n/nb.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:18+0000\n" -"PO-Revision-Date: 2018-09-21 13:18+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:34+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -64,7 +66,7 @@ msgstr "Svartelistet i webskjemaer" #. module: website_form #: model:ir.model,name:website_form.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: website_form #: code:addons/website_form/controllers/main.py:54 diff --git a/addons/website_forum/i18n/cs.po b/addons/website_forum/i18n/cs.po index 7fdb4c86525..ae11774e855 100644 --- a/addons/website_forum/i18n/cs.po +++ b/addons/website_forum/i18n/cs.po @@ -699,7 +699,7 @@ msgstr "" #: model:ir.model.fields,field_description:website_forum.field_forum_post__message_attachment_count #: model:ir.model.fields,field_description:website_forum.field_forum_tag__message_attachment_count msgid "Attachment Count" -msgstr "" +msgstr "Počet příloh" #. module: website_forum #: model_terms:ir.ui.view,arch_db:website_forum.view_forum_post_search diff --git a/addons/website_forum/i18n/nb.po b/addons/website_forum/i18n/nb.po index 336f46e0d75..fb93df7650c 100644 --- a/addons/website_forum/i18n/nb.po +++ b/addons/website_forum/i18n/nb.po @@ -5,6 +5,7 @@ # Translators: # Jorunn D. Newth, 2018 # Martin Trigaux, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 # msgid "" msgstr "" @@ -12,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-02 10:06+0000\n" "PO-Revision-Date: 2018-08-24 09:34+0000\n" -"Last-Translator: Martin Trigaux, 2018\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -499,7 +500,7 @@ msgstr "Legg til kommentar" #: code:addons/website_forum/static/src/js/website_forum.editor.js:45 #, python-format msgid "Add to menu" -msgstr "" +msgstr "Legg til i meny" #. module: website_forum #: model:ir.model.fields,help:website_forum.field_forum_forum__allow_share @@ -1308,7 +1309,7 @@ msgstr "Gi det nye forumet ditt et navn." #. module: website_forum #: model_terms:ir.ui.view,arch_db:website_forum.display_post_question_block msgid "External link" -msgstr "" +msgstr "Ekstern link" #. module: website_forum #: model:gamification.badge,name:website_forum.badge_q_3 @@ -2477,7 +2478,7 @@ msgstr "Svar på eget spørsmål" #: model:ir.model.fields,help:website_forum.field_forum_forum__website_id #: model:ir.model.fields,help:website_forum.field_forum_post__website_id msgid "Restrict publishing to this website." -msgstr "" +msgstr "Begrens publisering til dette nettstedet" #. module: website_forum #: model_terms:ir.ui.view,arch_db:website_forum.404 @@ -2495,7 +2496,7 @@ msgstr "Vurdert av" #: model:ir.model.fields,field_description:website_forum.field_forum_post__is_seo_optimized #: model:ir.model.fields,field_description:website_forum.field_forum_tag__is_seo_optimized msgid "SEO optimized" -msgstr "" +msgstr "SEO-optimalisert" #. module: website_forum #: model_terms:ir.ui.view,arch_db:website_forum.edit_post diff --git a/addons/website_forum/i18n/pt_BR.po b/addons/website_forum/i18n/pt_BR.po index b146cb15c13..e2d5471251c 100644 --- a/addons/website_forum/i18n/pt_BR.po +++ b/addons/website_forum/i18n/pt_BR.po @@ -16,6 +16,7 @@ # grazziano <gra.negocia@gmail.com>, 2018 # Martin Trigaux, 2018 # Silmar <pinheirosilmar@gmail.com>, 2018 +# Emanuel Martins <emanuel.breno@gmail.com>, 2018 # msgid "" msgstr "" @@ -23,7 +24,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-02 10:06+0000\n" "PO-Revision-Date: 2018-08-24 09:34+0000\n" -"Last-Translator: Silmar <pinheirosilmar@gmail.com>, 2018\n" +"Last-Translator: Emanuel Martins <emanuel.breno@gmail.com>, 2018\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/odoo/teams/41243/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -91,7 +92,7 @@ msgstr "" #: code:addons/website_forum/static/src/xml/website_forum_share_templates.xml:29 #, python-format msgid "45% of questions shared" -msgstr "45% de perguntas partilhada" +msgstr "45% de perguntas compartilhada" #. module: website_forum #. openerp-web @@ -101,6 +102,8 @@ msgid "" "65% more chance to get an\n" " answer" msgstr "" +"65% a mais de chances de\n" +"obter uma resposta" #. module: website_forum #: model_terms:ir.ui.view,arch_db:website_forum.display_post_question_block @@ -119,12 +122,12 @@ msgstr "<b> [Apagado]</b>" #: model_terms:ir.ui.view,arch_db:website_forum.moderation_display_post_answer #: model_terms:ir.ui.view,arch_db:website_forum.post_description_full msgid "<b> [Offensive]</b>" -msgstr "" +msgstr "<b>[Ofensivo]</b>" #. module: website_forum #: model_terms:ir.ui.view,arch_db:website_forum.users msgid "<b> badges:</b>" -msgstr "emblemas." +msgstr "<b>distintivos:</b>" #. module: website_forum #: model_terms:forum.forum,faq:website_forum.forum_help @@ -212,7 +215,7 @@ msgstr "" #. module: website_forum #: model_terms:ir.ui.view,arch_db:website_forum.user_badges msgid "<b>No badge yet!</b><br/>" -msgstr "" +msgstr "<b>Nenhum distintivo ainda!</b><br/>" #. module: website_forum #: model_terms:ir.ui.view,arch_db:website_forum.user_votes @@ -745,7 +748,7 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:website_forum.header #: model_terms:ir.ui.view,arch_db:website_forum.user_detail_full msgid "Badges" -msgstr "Medalhas" +msgstr "Distintivos" #. module: website_forum #: model_terms:ir.ui.view,arch_db:website_forum.badge @@ -755,8 +758,8 @@ msgid "" " appear on your profile page, and your posts." msgstr "" "Além de ganhar reputação com suas perguntas e respostas,\n" -"você receberá medalhas por ser especialmente útil. As medalhas\n" -"aparecem na sua página de perfil, e suas mensagens." +"você receberá distintivos por ser especialmente útil. Os distintivos\n" +"aparecem na sua página de perfil e nas suas mensagens." #. module: website_forum #: model_terms:ir.ui.view,arch_db:website_forum.edit_profile @@ -767,12 +770,12 @@ msgstr "Biografia" #: model_terms:ir.ui.view,arch_db:website_forum.badge #: model_terms:ir.ui.view,arch_db:website_forum.user_badges msgid "Bronze badge" -msgstr "" +msgstr "Distintivos de bronze" #. module: website_forum #: model:ir.model.fields,field_description:website_forum.field_res_users__bronze_badge msgid "Bronze badges count" -msgstr "" +msgstr "Número de distintivos de bronze" #. module: website_forum #: model:ir.model.fields,field_description:website_forum.field_forum_post__bump_date @@ -864,7 +867,7 @@ msgstr "Alterar marcadores de pergunta" #. module: website_forum #: model_terms:ir.ui.view,arch_db:website_forum.user_badges msgid "Check available badges" -msgstr "Cheque Medalhas Disponíveis" +msgstr "Verificar distintivos disponíveis" #. module: website_forum #: model:ir.model.fields,help:website_forum.field_forum_forum__allow_bump @@ -952,7 +955,7 @@ msgstr "" #. module: website_forum #: model:ir.model.fields,field_description:website_forum.field_forum_forum__karma_close_all msgid "Close all posts" -msgstr "Fechar todos Posts" +msgstr "Fechar todas as postagens" #. module: website_forum #: model:ir.model.fields,field_description:website_forum.field_forum_forum__karma_close_own @@ -991,7 +994,7 @@ msgstr "Comentário" #. module: website_forum #: model:ir.model.fields,field_description:website_forum.field_forum_forum__karma_comment_all msgid "Comment all posts" -msgstr "Comentar todos posts" +msgstr "Comentar todas as postagens" #. module: website_forum #: model:ir.model.fields,field_description:website_forum.field_forum_forum__karma_comment_own @@ -1001,7 +1004,7 @@ msgstr "" #. module: website_forum #: model_terms:ir.ui.view,arch_db:website_forum.post_comment msgid "Comment this post..." -msgstr "Comentar este post..." +msgstr "Comentar esta postagem..." #. module: website_forum #: model:gamification.badge,name:website_forum.badge_p_2 @@ -1154,7 +1157,7 @@ msgstr "" #. module: website_forum #: model:ir.model.fields,field_description:website_forum.field_forum_forum__default_post_type msgid "Default Post" -msgstr "" +msgstr "Postagem padrão" #. module: website_forum #: model:ir.model.fields,help:website_forum.field_gamification_challenge__category @@ -1171,7 +1174,7 @@ msgstr "Excluir" #. module: website_forum #: model:ir.model.fields,field_description:website_forum.field_forum_forum__karma_unlink_all msgid "Delete all posts" -msgstr "Apagar todos posts" +msgstr "Apagar todas as postagens" #. module: website_forum #: model:ir.model.fields,field_description:website_forum.field_forum_forum__karma_unlink_own @@ -1480,7 +1483,7 @@ msgstr "Fórum" #: model:ir.model.fields,field_description:website_forum.field_gamification_badge__level #: model:ir.model.fields,field_description:website_forum.field_gamification_badge_user__level msgid "Forum Badge Level" -msgstr "Nível de medalhas no fórum" +msgstr "Nível de distintivos no fórum" #. module: website_forum #: model_terms:ir.ui.view,arch_db:website_forum.res_users_view_form_preference @@ -1551,12 +1554,12 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:website_forum.badge #: model_terms:ir.ui.view,arch_db:website_forum.user_badges msgid "Gold badge" -msgstr "" +msgstr "Distintivo de ouro" #. module: website_forum #: model:ir.model.fields,field_description:website_forum.field_res_users__gold_badge msgid "Gold badges count" -msgstr "" +msgstr "Número de distintivos de ouro" #. module: website_forum #: model:gamification.badge,name:website_forum.badge_a_3 @@ -2213,7 +2216,7 @@ msgstr "Lançar" #: model_terms:ir.ui.view,arch_db:website_forum.post_answer #: model_terms:ir.ui.view,arch_db:website_forum.post_reply msgid "Post Answer" -msgstr "" +msgstr "Postar resposta" #. module: website_forum #: model:ir.model,name:website_forum.model_forum_post_reason @@ -2229,12 +2232,12 @@ msgstr "" #. module: website_forum #: model_terms:ir.ui.view,arch_db:website_forum.new_link msgid "Post Title" -msgstr "" +msgstr "Título da postagem" #. module: website_forum #: model_terms:ir.ui.view,arch_db:website_forum.view_forum_forum_form msgid "Post Types" -msgstr "" +msgstr "Tipos de postagem" #. module: website_forum #: model:ir.model,name:website_forum.model_forum_post_vote @@ -2244,7 +2247,7 @@ msgstr "" #. module: website_forum #: model_terms:ir.ui.view,arch_db:website_forum.new_question msgid "Post Your Question" -msgstr "Poste Sua Pergunta" +msgstr "Postar pergunta" #. module: website_forum #: model_terms:ir.ui.view,arch_db:website_forum.new_discussion @@ -2520,7 +2523,7 @@ msgstr "estudioso" #. module: website_forum #: model_terms:ir.ui.view,arch_db:website_forum.view_forum_post_search msgid "Search in Post" -msgstr "Pesquisa na mensagem" +msgstr "Pesquisar na postagem" #. module: website_forum #: model:ir.model.fields,field_description:website_forum.field_forum_forum__relevancy_time_decay @@ -2605,12 +2608,12 @@ msgstr "Opções de Compartilhamento" #: model_terms:ir.ui.view,arch_db:website_forum.badge #: model_terms:ir.ui.view,arch_db:website_forum.user_badges msgid "Silver badge" -msgstr "" +msgstr "Distintivo de prata" #. module: website_forum #: model:ir.model.fields,field_description:website_forum.field_res_users__silver_badge msgid "Silver badges count" -msgstr "" +msgstr "Número de distintivos de prata" #. module: website_forum #. openerp-web @@ -2683,7 +2686,7 @@ msgstr "Estudante" #: model_terms:ir.ui.view,arch_db:website_forum.header #: model_terms:ir.ui.view,arch_db:website_forum.new_link msgid "Submit a Link" -msgstr "" +msgstr "Enviar um link" #. module: website_forum #: model:gamification.badge,name:website_forum.badge_31 @@ -2705,7 +2708,7 @@ msgstr "Marcador" #. module: website_forum #: sql_constraint:forum.tag:0 msgid "Tag name already exists !" -msgstr "Essa tag já existe !" +msgstr "Esse marcador já existe!" #. module: website_forum #: model:ir.model.fields,field_description:website_forum.field_forum_post__tag_ids @@ -2816,26 +2819,26 @@ msgstr "" #: code:addons/website_forum/models/forum.py:411 #, python-format msgid "This forum does not allow %s" -msgstr "" +msgstr "Este fórum não permite %s" #. module: website_forum #: model_terms:ir.ui.view,arch_db:website_forum.header msgid "This forum has been archived." -msgstr "" +msgstr "Este fórum foi arquivado." #. module: website_forum #. openerp-web #: code:addons/website_forum/static/src/js/website_forum.js:111 #, python-format msgid "This post can not be flagged" -msgstr "" +msgstr "Esta postagem não pode ser marcada" #. module: website_forum #. openerp-web #: code:addons/website_forum/static/src/js/website_forum.js:106 #, python-format msgid "This post is already flagged" -msgstr "" +msgstr "Esta postagem já está marcada" #. module: website_forum #: model_terms:ir.ui.view,arch_db:website_forum.post_description_full @@ -2870,7 +2873,7 @@ msgstr "" #: code:addons/website_forum/controllers/main.py:414 #, python-format msgid "Title should not be empty." -msgstr "" +msgstr "Informe um título." #. module: website_forum #: model:ir.model.fields,field_description:website_forum.field_forum_post_vote__recipient_id @@ -2917,7 +2920,7 @@ msgstr "" #. module: website_forum #: model_terms:ir.ui.view,arch_db:website_forum.new_link msgid "URL to Share" -msgstr "" +msgstr "URL para compartilhar" #. module: website_forum #: model_terms:ir.ui.view,arch_db:website_forum.forum_index @@ -2932,7 +2935,7 @@ msgstr "Desvincular todos os comentários" #. module: website_forum #: model:ir.model.fields,field_description:website_forum.field_forum_forum__karma_comment_unlink_own msgid "Unlink own comments" -msgstr "" +msgstr "Desvincular os próprios comentários" #. module: website_forum #: model:ir.model.fields,field_description:website_forum.field_forum_forum__message_unread @@ -2946,7 +2949,7 @@ msgstr "Mensagens não lidas" #: model:ir.model.fields,field_description:website_forum.field_forum_post__message_unread_counter #: model:ir.model.fields,field_description:website_forum.field_forum_tag__message_unread_counter msgid "Unread Messages Counter" -msgstr "Contador de Mensagens Não Lidas" +msgstr "Contador de mensagens não lidas" #. module: website_forum #: model_terms:ir.ui.view,arch_db:website_forum.edit_profile @@ -3017,27 +3020,27 @@ msgstr "Validar" #. module: website_forum #: model_terms:ir.ui.view,arch_db:website_forum.forum_post_template_validation msgid "Validate question" -msgstr "" +msgstr "Validar pergunta" #. module: website_forum #: model_terms:ir.ui.view,arch_db:website_forum.display_post_question_block msgid "View" -msgstr "Visão" +msgstr "Visualizações" #. module: website_forum #: model_terms:ir.ui.view,arch_db:website_forum.header msgid "View Your Badges" -msgstr "Ver Suas Medalhas" +msgstr "Ver os seus distintivos" #. module: website_forum #: model_terms:ir.ui.view,arch_db:website_forum.display_post_question_block msgid "Views" -msgstr "Visões" +msgstr "Visualizações" #. module: website_forum #: model:ir.model.fields,field_description:website_forum.field_forum_post_vote__vote msgid "Vote" -msgstr "Vote" +msgstr "Votar" #. module: website_forum #: model:ir.model.fields,field_description:website_forum.field_forum_post__vote_ids @@ -3048,17 +3051,17 @@ msgstr "Votos" #. module: website_forum #: selection:forum.post,state:0 msgid "Waiting Validation" -msgstr "" +msgstr "Esperando validação" #. module: website_forum #: model_terms:ir.ui.view,arch_db:website_forum.post_description_full msgid "Waiting for validation" -msgstr "" +msgstr "Esperando pela validação" #. module: website_forum #: model:ir.model.fields,field_description:website_forum.field_res_users__forum_waiting_posts_count msgid "Waiting post" -msgstr "" +msgstr "Esperando postagem" #. module: website_forum #: model_terms:ir.ui.view,arch_db:website_forum.new_link @@ -3077,21 +3080,21 @@ msgstr "Site" #. module: website_forum #: selection:gamification.challenge,category:0 msgid "Website / Forum" -msgstr "" +msgstr "Site/fórum" #. module: website_forum #: model:ir.model.fields,field_description:website_forum.field_forum_forum__website_message_ids #: model:ir.model.fields,field_description:website_forum.field_forum_post__website_message_ids #: model:ir.model.fields,field_description:website_forum.field_forum_tag__website_message_ids msgid "Website Messages" -msgstr "Mensagens do Site" +msgstr "Mensagens do site" #. module: website_forum #: model:ir.model.fields,help:website_forum.field_forum_forum__website_message_ids #: model:ir.model.fields,help:website_forum.field_forum_post__website_message_ids #: model:ir.model.fields,help:website_forum.field_forum_tag__website_message_ids msgid "Website communication history" -msgstr "Histórico de Comunicação do Site" +msgstr "Histórico de comunicação do site" #. module: website_forum #: model:ir.model.fields,field_description:website_forum.field_forum_forum__website_meta_description @@ -3129,7 +3132,7 @@ msgstr "Mensagem de Boas Vindas" #. module: website_forum #: model_terms:forum.forum,welcome_message:website_forum.forum_help msgid "Welcome!" -msgstr "" +msgstr "Bem vindo!" #. module: website_forum #: model_terms:forum.forum,faq:website_forum.forum_help @@ -3313,7 +3316,7 @@ msgstr "" #. module: website_forum #: model:forum.post.reason,name:website_forum.reason_1 msgid "duplicate post" -msgstr "" +msgstr "duplicar postagem" #. module: website_forum #: model_terms:ir.ui.view,arch_db:website_forum.new_link diff --git a/addons/website_forum/i18n/zh_CN.po b/addons/website_forum/i18n/zh_CN.po index 9b66cebbbc3..7634eff3700 100644 --- a/addons/website_forum/i18n/zh_CN.po +++ b/addons/website_forum/i18n/zh_CN.po @@ -25,6 +25,7 @@ # liAnGjiA <liangjia@qq.com>, 2018 # 演奏王 <wangwhai@qq.com>, 2018 # snow wang <147156565@qq.com>, 2018 +# jian liu <lj1989419@gmail.com>, 2018 # msgid "" msgstr "" @@ -32,7 +33,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-02 10:06+0000\n" "PO-Revision-Date: 2018-08-24 09:34+0000\n" -"Last-Translator: snow wang <147156565@qq.com>, 2018\n" +"Last-Translator: jian liu <lj1989419@gmail.com>, 2018\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2686,7 +2687,7 @@ msgstr "自我学习者" #. module: website_forum #: model_terms:ir.ui.view,arch_db:website_forum.post_answers msgid "Accept answer" -msgstr "" +msgstr "接受" #. module: website_forum #: model_terms:ir.ui.view,arch_db:website_forum.new_question diff --git a/addons/website_hr/i18n/nb.po b/addons/website_hr/i18n/nb.po index 3a5abb045c6..d6498743199 100644 --- a/addons/website_hr/i18n/nb.po +++ b/addons/website_hr/i18n/nb.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-08-24 09:05+0000\n" -"PO-Revision-Date: 2018-08-24 09:05+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"POT-Creation-Date: 2018-09-18 09:49+0000\n" +"PO-Revision-Date: 2018-08-24 09:34+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,7 +30,7 @@ msgstr "Ansatt" #. module: website_hr #: model:ir.model.fields,field_description:website_hr.field_hr_employee__is_published msgid "Is published" -msgstr "" +msgstr "Er Publisert" #. module: website_hr #: model_terms:ir.ui.view,arch_db:website_hr.aboutus @@ -43,7 +45,7 @@ msgstr "Offentlig informasjon" #. module: website_hr #: model:ir.model.fields,help:website_hr.field_hr_employee__website_id msgid "Restrict publishing to this website." -msgstr "" +msgstr "Begrens publisering til dette nettstedet" #. module: website_hr #: model:ir.model.fields,help:website_hr.field_hr_employee__website_url @@ -53,7 +55,7 @@ msgstr "Fullstendig URL for å nå dokumentet via nettstedet." #. module: website_hr #: model:ir.model.fields,field_description:website_hr.field_hr_employee__website_published msgid "Visible on current website" -msgstr "" +msgstr "Synlig på nåværende nettsted" #. module: website_hr #: model:ir.model.fields,field_description:website_hr.field_hr_employee__website_id diff --git a/addons/website_hr_recruitment/i18n/nb.po b/addons/website_hr_recruitment/i18n/nb.po index 6c72f266bb4..7661e8ef13f 100644 --- a/addons/website_hr_recruitment/i18n/nb.po +++ b/addons/website_hr_recruitment/i18n/nb.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-18 09:50+0000\n" -"PO-Revision-Date: 2018-09-18 09:50+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:34+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -248,7 +250,7 @@ msgstr "I mellomtiden," #. module: website_hr_recruitment #: model:ir.model.fields,field_description:website_hr_recruitment.field_hr_job__is_published msgid "Is published" -msgstr "" +msgstr "Er Publisert" #. module: website_hr_recruitment #: model_terms:ir.ui.view,arch_db:website_hr_recruitment.apply @@ -379,7 +381,7 @@ msgstr "Lønnsomt" #. module: website_hr_recruitment #: model:ir.model.fields,help:website_hr_recruitment.field_hr_job__website_id msgid "Restrict publishing to this website." -msgstr "" +msgstr "Begrens publisering til dette nettstedet" #. module: website_hr_recruitment #: model_terms:ir.ui.view,arch_db:website_hr_recruitment.apply @@ -389,7 +391,7 @@ msgstr "CV" #. module: website_hr_recruitment #: model:ir.model.fields,field_description:website_hr_recruitment.field_hr_job__is_seo_optimized msgid "SEO optimized" -msgstr "" +msgstr "SEO-optimalisert" #. module: website_hr_recruitment #: model_terms:ir.ui.view,arch_db:website_hr_recruitment.default_website_description @@ -476,7 +478,7 @@ msgstr "Jobbvariasjon:" #. module: website_hr_recruitment #: model:ir.model.fields,field_description:website_hr_recruitment.field_hr_job__website_published msgid "Visible on current website" -msgstr "" +msgstr "Synlig på nåværende nettsted" #. module: website_hr_recruitment #: model:ir.model.fields,field_description:website_hr_recruitment.field_hr_job__website_id diff --git a/addons/website_livechat/i18n/nb.po b/addons/website_livechat/i18n/nb.po index d2fe46a7538..fcf815ca2ec 100644 --- a/addons/website_livechat/i18n/nb.po +++ b/addons/website_livechat/i18n/nb.po @@ -3,15 +3,17 @@ # * website_livechat # # Translators: -# Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Martin Trigaux, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-02 10:06+0000\n" -"PO-Revision-Date: 2018-10-02 10:06+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:34+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -39,7 +41,7 @@ msgstr "Kanal" #. module: website_livechat #: model:ir.model,name:website_livechat.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: website_livechat #: model:ir.model.fields,help:website_livechat.field_im_livechat_channel__website_description diff --git a/addons/website_mass_mailing/i18n/cs.po b/addons/website_mass_mailing/i18n/cs.po index 748b260b5bc..86bdaa8e127 100644 --- a/addons/website_mass_mailing/i18n/cs.po +++ b/addons/website_mass_mailing/i18n/cs.po @@ -5,14 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jan Horzinka <jan.horzinka@centrum.cz>, 2018 -# trendspotter, 2018 +# trendspotter <j.podhorecky@volny.cz>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:18+0000\n" -"PO-Revision-Date: 2018-09-21 13:18+0000\n" -"Last-Translator: trendspotter, 2018\n" +"PO-Revision-Date: 2018-08-24 09:35+0000\n" +"Last-Translator: trendspotter <j.podhorecky@volny.cz>, 2018\n" "Language-Team: Czech (https://www.transifex.com/odoo/teams/41243/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -75,7 +76,7 @@ msgstr "Facebook" #. module: website_mass_mailing #: model_terms:ir.ui.view,arch_db:website_mass_mailing.social_links msgid "Google Plus" -msgstr "" +msgstr "Google Plus" #. module: website_mass_mailing #: model_terms:ir.ui.view,arch_db:website_mass_mailing.s_newsletter_subscribe_popup @@ -136,7 +137,7 @@ msgstr "" #. module: website_mass_mailing #: model_terms:ir.ui.view,arch_db:website_mass_mailing.social_links msgid "Twitter" -msgstr "" +msgstr "Twitter" #. module: website_mass_mailing #. openerp-web diff --git a/addons/website_mass_mailing/i18n/nb.po b/addons/website_mass_mailing/i18n/nb.po index 5ba2e80b3f6..c27c7434788 100644 --- a/addons/website_mass_mailing/i18n/nb.po +++ b/addons/website_mass_mailing/i18n/nb.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:18+0000\n" -"PO-Revision-Date: 2018-09-21 13:18+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:35+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -55,7 +57,7 @@ msgstr "Endre nyhetsbrev" #. module: website_mass_mailing #: model:ir.model,name:website_mass_mailing.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: website_mass_mailing #: model_terms:ir.ui.view,arch_db:website_mass_mailing.s_mail_block_footer_social @@ -76,7 +78,7 @@ msgstr "Facebook" #. module: website_mass_mailing #: model_terms:ir.ui.view,arch_db:website_mass_mailing.social_links msgid "Google Plus" -msgstr "" +msgstr "Google Plus" #. module: website_mass_mailing #: model_terms:ir.ui.view,arch_db:website_mass_mailing.s_newsletter_subscribe_popup @@ -91,7 +93,7 @@ msgstr "Instagram" #. module: website_mass_mailing #: model_terms:ir.ui.view,arch_db:website_mass_mailing.social_links msgid "LinkedIn" -msgstr "" +msgstr "LinkedIn" #. module: website_mass_mailing #: model:ir.model,name:website_mass_mailing.model_mail_mass_mailing_list diff --git a/addons/website_membership/controllers/main.py b/addons/website_membership/controllers/main.py index f0cf843ace9..f67918569cb 100644 --- a/addons/website_membership/controllers/main.py +++ b/addons/website_membership/controllers/main.py @@ -103,7 +103,7 @@ class WebsiteMembership(http.Controller): # get google maps localization of partners google_map_partner_ids = [] - if request.env.ref('website_membership.opt_index_google_map').customize_show: + if request.env.ref('website_membership.opt_index_google_map').active: google_map_partner_ids = MembershipLine.search(line_domain).get_published_companies(limit=2000) search_domain = [('membership_state', '=', 'free'), ('website_published', '=', True)] diff --git a/addons/website_membership/models/membership.py b/addons/website_membership/models/membership.py index 8e93d5f067e..794c9732fd9 100644 --- a/addons/website_membership/models/membership.py +++ b/addons/website_membership/models/membership.py @@ -15,5 +15,5 @@ class MembershipLine(models.Model): SELECT DISTINCT p.id FROM res_partner p INNER JOIN membership_membership_line m ON p.id = m.partner - WHERE website_published AND is_company AND m.id IN %s """ + limit_clause, (tuple(self.ids),)) + WHERE is_published AND is_company AND m.id IN %s """ + limit_clause, (tuple(self.ids),)) return [partner_id[0] for partner_id in self.env.cr.fetchall()] diff --git a/addons/website_partner/i18n/nb.po b/addons/website_partner/i18n/nb.po index a81c6268525..c0a69ef3e85 100644 --- a/addons/website_partner/i18n/nb.po +++ b/addons/website_partner/i18n/nb.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-18 09:49+0000\n" -"PO-Revision-Date: 2018-09-18 09:49+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:35+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,13 +30,13 @@ msgstr "Kontakt" #: model:ir.model.fields,field_description:website_partner.field_res_partner__is_published #: model:ir.model.fields,field_description:website_partner.field_res_users__is_published msgid "Is published" -msgstr "" +msgstr "Er Publisert" #. module: website_partner #: model:ir.model.fields,field_description:website_partner.field_res_partner__is_seo_optimized #: model:ir.model.fields,field_description:website_partner.field_res_users__is_seo_optimized msgid "SEO optimized" -msgstr "" +msgstr "SEO-optimalisert" #. module: website_partner #: model_terms:ir.ui.view,arch_db:website_partner.partner_detail @@ -51,7 +53,7 @@ msgstr "Fullstendig URL for å nå dokumentet via nettstedet." #: model:ir.model.fields,field_description:website_partner.field_res_partner__website_published #: model:ir.model.fields,field_description:website_partner.field_res_users__website_published msgid "Visible on current website" -msgstr "" +msgstr "Synlig på nåværende nettsted" #. module: website_partner #: model:ir.model.fields,field_description:website_partner.field_res_partner__website_description diff --git a/addons/website_payment/i18n/it.po b/addons/website_payment/i18n/it.po index ab7c06afa8d..81cc2147afc 100644 --- a/addons/website_payment/i18n/it.po +++ b/addons/website_payment/i18n/it.po @@ -22,7 +22,7 @@ msgstr "" #. module: website_payment #: model:ir.model,name:website_payment.model_payment_acquirer msgid "Payment Acquirer" -msgstr "Servizio di pagamento" +msgstr "Sistema di pagamento" #. module: website_payment #: model:ir.model.fields,field_description:website_payment.field_payment_acquirer__website_id diff --git a/addons/website_sale/i18n/cs.po b/addons/website_sale/i18n/cs.po index af8ad08be73..48df6794be7 100644 --- a/addons/website_sale/i18n/cs.po +++ b/addons/website_sale/i18n/cs.po @@ -893,7 +893,7 @@ msgstr "Zákazníci" #. module: website_sale #: model_terms:ir.ui.view,arch_db:website_sale.res_config_settings_view_form msgid "DHL" -msgstr "" +msgstr "DHL" #. module: website_sale #: model:ir.model.fields,field_description:website_sale.field_website__currency_id diff --git a/addons/website_sale/i18n/es.po b/addons/website_sale/i18n/es.po index 9f95d83cf6d..837924ff7b9 100644 --- a/addons/website_sale/i18n/es.po +++ b/addons/website_sale/i18n/es.po @@ -3,33 +3,34 @@ # * website_sale # # Translators: -# e2f <projects@e2f.com>, 2018 -# Daniel Santibáñez Polanco <dansanti@gmail.com>, 2018 -# Martin Trigaux, 2018 -# Pedro M. Baeza <pedro.baeza@gmail.com>, 2018 -# Mateo Tibaquirá Palacios <nestormateo@gmail.com>, 2018 -# Luis M. Ontalba <luis.martinez@tecnativa.com>, 2018 # Paloma Yazmin Reyes Morales <paloma.reyes@jarsa.com.mx>, 2018 -# Eric Antones <eantones@users.noreply.github.com>, 2018 -# RGB Consulting <odoo@rgbconsulting.com>, 2018 -# e2f_EPV Translator <e2f_EPV@outlook.com>, 2018 # Raquel Iciarte <ric@odoo.com>, 2018 # Manuel Isaac <manuel.aih@hotmail.com>, 2018 -# Nicolás Broggi <rnbroggi@gmail.com>, 2018 +# Daniel Santibáñez Polanco <dansanti@gmail.com>, 2018 # Jesús Alan Ramos Rodríguez <alan.ramos@jarsa.com.mx>, 2018 # Lina Maria Avendaño Carvajal <lina8823@gmail.com>, 2018 # Rick Hunter <rick_hunter_ec@yahoo.com>, 2018 # José Vicente <txusev@gmail.com>, 2018 +# Eric Antones <eantones@users.noreply.github.com>, 2018 +# Pedro M. Baeza <pedro.baeza@gmail.com>, 2018 +# Mateo Tibaquirá Palacios <nestormateo@gmail.com>, 2018 +# Luis M. Ontalba <luis.martinez@tecnativa.com>, 2018 +# Nicolás Broggi <rnbroggi@gmail.com>, 2018 # Manuel De los Reyes <manuel9410z@gmail.com>, 2018 -# Cristopher Cravioto <ccr@odoo.com>, 2018 +# e2f_EPV Translator <e2f_EPV@outlook.com>, 2018 # Gelo Joga Landoo <gj@landoo.es>, 2018 +# e2f <projects@e2f.com>, 2018 +# Martin Trigaux, 2018 +# RGB Consulting <odoo@rgbconsulting.com>, 2018 +# Cristopher Cravioto <ccr@odoo.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:48+0000\n" -"PO-Revision-Date: 2018-10-08 06:48+0000\n" -"Last-Translator: Gelo Joga Landoo <gj@landoo.es>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:35+0000\n" +"Last-Translator: Cristopher Cravioto <ccr@odoo.com>, 2018\n" "Language-Team: Spanish (https://www.transifex.com/odoo/teams/41243/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1876,22 +1877,22 @@ msgstr "Publicado" #. module: website_sale #: model_terms:ir.ui.view,arch_db:website_sale.website_sale msgid "Push down" -msgstr "Mover hacia abajo" +msgstr "Mover al final" #. module: website_sale #: model_terms:ir.ui.view,arch_db:website_sale.website_sale msgid "Push to bottom" -msgstr "Mover hacia abajo" +msgstr "Mover uno detrás" #. module: website_sale #: model_terms:ir.ui.view,arch_db:website_sale.website_sale msgid "Push to top" -msgstr "Mover hacia arriba" +msgstr "Mover al inicio" #. module: website_sale #: model_terms:ir.ui.view,arch_db:website_sale.website_sale msgid "Push up" -msgstr "Mover hacia arriba" +msgstr "Mover uno adelante" #. module: website_sale #: model_terms:ir.ui.view,arch_db:website_sale.cart_popover diff --git a/addons/website_sale/i18n/ja.po b/addons/website_sale/i18n/ja.po index c5fda0b5cbb..0692be519dd 100644 --- a/addons/website_sale/i18n/ja.po +++ b/addons/website_sale/i18n/ja.po @@ -4,20 +4,21 @@ # # Translators: # SHIMIZU Taku <shimizu.taku@gmail.com>, 2018 -# Martin Trigaux, 2018 -# Yoshi Tashiro <tashiro@roomsfor.hk>, 2018 # Manami Hashi <manami@roomsfor.hk>, 2018 # NOKA Shigekazu <shigekazu.noka@gmail.com>, 2018 -# Norimichi Sugimoto <norimichi.sugimoto@tls-ltd.co.jp>, 2018 -# 森岡広道 <hiromichi.morioka@pro-spire.co.jp>, 2018 # 高木正勝 <masakatsu.takagi@pro-spire.co.jp>, 2018 +# 森岡広道 <hiromichi.morioka@pro-spire.co.jp>, 2018 +# Martin Trigaux, 2018 +# Norimichi Sugimoto <norimichi.sugimoto@tls-ltd.co.jp>, 2018 +# Yoshi Tashiro <tashiro@roomsfor.hk>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:48+0000\n" -"PO-Revision-Date: 2018-10-08 06:48+0000\n" -"Last-Translator: 高木正勝 <masakatsu.takagi@pro-spire.co.jp>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:35+0000\n" +"Last-Translator: Yoshi Tashiro <tashiro@roomsfor.hk>, 2018\n" "Language-Team: Japanese (https://www.transifex.com/odoo/teams/41243/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1667,7 +1668,7 @@ msgstr "先週" #: code:addons/website_sale/controllers/backend.py:115 #, python-format msgid "Previous Year" -msgstr "" +msgstr "昨年" #. module: website_sale #: model_terms:ir.ui.view,arch_db:website_sale.cart_lines diff --git a/addons/website_sale/i18n/nb.po b/addons/website_sale/i18n/nb.po index 2d16d95fb50..7e5c681e38d 100644 --- a/addons/website_sale/i18n/nb.po +++ b/addons/website_sale/i18n/nb.po @@ -3,17 +3,19 @@ # * website_sale # # Translators: -# Martin Trigaux, 2018 -# Jorunn D. Newth, 2018 # Aleksander, 2018 # Viktor Basso <viktor@voit.no>, 2018 +# Martin Trigaux, 2018 +# Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:48+0000\n" -"PO-Revision-Date: 2018-10-08 06:48+0000\n" -"Last-Translator: Viktor Basso <viktor@voit.no>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:35+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -786,7 +788,7 @@ msgstr "Beregn fraktkostnad på ordrer" #. module: website_sale #: model:ir.model,name:website_sale.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: website_sale #: model_terms:ir.ui.view,arch_db:website_sale.wizard_checkout @@ -1113,7 +1115,7 @@ msgstr "HTML-klasser" #. module: website_sale #: model:ir.model,name:website_sale.model_ir_http msgid "HTTP Routing" -msgstr "" +msgstr "HTTP-ruting" #. module: website_sale #: model_terms:ir.ui.view,arch_db:website_sale.payment_sale_note @@ -1879,7 +1881,7 @@ msgstr "Rapportering" #: model:ir.model.fields,help:website_sale.field_product_product__website_id #: model:ir.model.fields,help:website_sale.field_product_public_category__website_id msgid "Restrict publishing to this website." -msgstr "" +msgstr "Begrens publisering til dette nettstedet" #. module: website_sale #: model_terms:ir.ui.view,arch_db:website_sale.404 @@ -1894,7 +1896,7 @@ msgstr "" #. module: website_sale #: model:ir.model.fields,field_description:website_sale.field_product_public_category__is_seo_optimized msgid "SEO optimized" -msgstr "" +msgstr "SEO-optimalisert" #. module: website_sale #: model_terms:ir.ui.view,arch_db:website_sale.products_item diff --git a/addons/website_sale/i18n/nl.po b/addons/website_sale/i18n/nl.po index bfc64eccefb..bcc5553f0a0 100644 --- a/addons/website_sale/i18n/nl.po +++ b/addons/website_sale/i18n/nl.po @@ -1764,7 +1764,7 @@ msgstr "Betaal met een andere betalingsverwerker" #. module: website_sale #: selection:website.sale.payment.acquirer.onboarding.wizard,payment_method:0 msgid "Pay with credit card (via Stripe)" -msgstr "Betaal met credit card (via Stripe)" +msgstr "Betaal met creditcard (via Stripe)" #. module: website_sale #: model:ir.model.fields,field_description:website_sale.field_website_sale_payment_acquirer_onboarding_wizard__paypal_email_account diff --git a/addons/website_sale/i18n/pt_BR.po b/addons/website_sale/i18n/pt_BR.po index 1faaaf986dc..ca399e36cd4 100644 --- a/addons/website_sale/i18n/pt_BR.po +++ b/addons/website_sale/i18n/pt_BR.po @@ -3,32 +3,34 @@ # * website_sale # # Translators: -# Rodrigo de Almeida Sottomaior Macedo <rmsolucoeseminformatic4@gmail.com>, 2018 -# danimaribeiro <danimaribeiro@gmail.com>, 2018 -# Rui Andrada <shingonoide@gmail.com>, 2018 -# Martin Trigaux, 2018 -# Mateus Lopes <mateus1@gmail.com>, 2018 # Peter Leaf <pablleaf@gmail.com>, 2018 -# grazziano <gra.negocia@gmail.com>, 2018 -# Marcos Abreu <marcoos.abreu@gmail.com>, 2018 # Hélio Dias de Brito Teixeira <helio.dbt@gmail.com>, 2018 -# Silmar <pinheirosilmar@gmail.com>, 2018 # Diego Bittencourt <diegomb86@gmail.com>, 2018 -# Luiz Carlos de Lima <luiz.carlos@akretion.com.br>, 2018 +# Rodrigo de Almeida Sottomaior Macedo <rmsolucoeseminformatic4@gmail.com>, 2018 +# Rui Andrada <shingonoide@gmail.com>, 2018 # falexandresilva <falexandresilva@gmail.com>, 2018 # André Augusto Firmino Cordeiro <a.cordeito@gmail.com>, 2018 # mariana rodrigues <mariana12v@gmail.com>, 2018 +# Luiz Carlos de Lima <luiz.carlos@akretion.com.br>, 2018 # Danilo Rodrigues, 2018 # Hildeberto Abreu Magalhães <hildeberto@gmail.com>, 2018 +# Silmar <pinheirosilmar@gmail.com>, 2018 +# danimaribeiro <danimaribeiro@gmail.com>, 2018 +# Martin Trigaux, 2018 +# Mateus Lopes <mateus1@gmail.com>, 2018 +# grazziano <gra.negocia@gmail.com>, 2018 +# Marcos Abreu <marcoos.abreu@gmail.com>, 2018 # Yannick Belot <yannickbh@gmail.com>, 2018 -# Brenno Martins <emanuel.breno@gmail.com>, 2018 +# Emanuel Martins <emanuel.breno@gmail.com>, 2018 +# Rafael H L Moretti <rafael.moretti@gmail.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:48+0000\n" -"PO-Revision-Date: 2018-10-08 06:48+0000\n" -"Last-Translator: Brenno Martins <emanuel.breno@gmail.com>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:35+0000\n" +"Last-Translator: Rafael H L Moretti <rafael.moretti@gmail.com>, 2018\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/odoo/teams/41243/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2638,6 +2640,8 @@ msgid "" "if you want to restore your previous cart. Your current cart will be " "replaced with your previous cart." msgstr "" +"Se você quiser restaurar seu carrinho anterior. Seu carrinho atual será " +"substituído pelo seu carrinho anterior." #. module: website_sale #: model_terms:ir.ui.view,arch_db:website_sale.cart_popover diff --git a/addons/website_sale/i18n/uk.po b/addons/website_sale/i18n/uk.po index d0fffc3dc79..6762de4e5cc 100644 --- a/addons/website_sale/i18n/uk.po +++ b/addons/website_sale/i18n/uk.po @@ -1667,7 +1667,7 @@ msgstr "Оплати для отримання" #. module: website_sale #: model:ir.model.fields,field_description:website_sale.field_website_sale_payment_acquirer_onboarding_wizard__paypal_seller_account msgid "Paypal Merchant ID" -msgstr "ID мерчанта Paypal " +msgstr "ID продавця Paypal " #. module: website_sale #: model:ir.model.fields,field_description:website_sale.field_website_sale_payment_acquirer_onboarding_wizard__paypal_pdt_token @@ -1721,14 +1721,14 @@ msgstr "Ціновий список доступний для цієї елек #. module: website_sale #: model:ir.model,name:website_sale.model_product_pricelist msgid "Pricelist" -msgstr "Прайс-лист" +msgstr "Прайслист" #. module: website_sale #: model:ir.actions.act_window,name:website_sale.website_product_pricelist3 #: model:ir.ui.menu,name:website_sale.menu_catalog_pricelists #: model_terms:ir.ui.view,arch_db:website_sale.res_config_settings_view_form msgid "Pricelists" -msgstr "Прайс-листи" +msgstr "Прайслисти" #. module: website_sale #: model_terms:ir.ui.view,arch_db:website_sale.res_config_settings_view_form diff --git a/addons/website_sale/views/product_views.xml b/addons/website_sale/views/product_views.xml index 8d3ff588bb3..d3f3fbd2a81 100644 --- a/addons/website_sale/views/product_views.xml +++ b/addons/website_sale/views/product_views.xml @@ -61,15 +61,23 @@ </field> </record> + <record model="ir.ui.view" id="product_template_form_view_invoice_policy"> + <field name="name">product.template.invoice.policy</field> + <field name="model">product.template</field> + <field name="inherit_id" ref="sale.product_template_form_view_invoice_policy"/> + <field name="arch" type="xml"> + <xpath expr="//group[@name='invoicing']" position="attributes"> + <attribute name="invisible">0</attribute> + </xpath> + </field> + </record> + <record model="ir.ui.view" id="product_template_form_view"> <field name="name">product.template.product.website.form</field> <field name="model">product.template</field> <field name="inherit_id" ref="product.product_template_form_view"/> <field name="arch" type="xml"> <!-- add state field in header --> - <xpath expr="//group[@name='invoicing']" position="attributes"> - <attribute name="invisible">0</attribute> - </xpath> <xpath expr="//group[@name='email_template_and_project']" position="attributes"> <attribute name="invisible">0</attribute> </xpath> diff --git a/addons/website_sale/views/templates.xml b/addons/website_sale/views/templates.xml index 527ea5c862d..4ff612c0941 100644 --- a/addons/website_sale/views/templates.xml +++ b/addons/website_sale/views/templates.xml @@ -957,7 +957,7 @@ </t> <span t-field="product.website_price" style="white-space: nowrap;" t-options="{'widget': 'monetary','display_currency': website.currency_id}" /> </td> - <td class="col-lg-2 col-md-3 col-4 text-center"> + <td class="w-25 text-center"> <input class="js_quantity" name="product_id" t-att-data-product-id="product.id" type="hidden" /> <a role="button" class="btn btn-link js_add_suggested_products"> <strong>Add to Cart</strong> diff --git a/addons/website_sale_comparison/controllers/main.py b/addons/website_sale_comparison/controllers/main.py index 18c98f639e2..24edf750d49 100644 --- a/addons/website_sale_comparison/controllers/main.py +++ b/addons/website_sale_comparison/controllers/main.py @@ -26,7 +26,8 @@ class WebsiteSaleProductComparison(WebsiteSale): continue res.setdefault(cat_name, {}).setdefault(att_name, [' - '] * len(products)) val = product.attribute_value_ids.filtered(lambda x: x.attribute_id == var.attribute_id) - res[cat_name][att_name][num] = val[0].name + if val: + res[cat_name][att_name][num] = val[0].name values['specs'] = res values['compute_currency'] = self._get_compute_currency_and_context()[0] return request.render("website_sale_comparison.product_compare", values) diff --git a/addons/website_sale_delivery/i18n/nb.po b/addons/website_sale_delivery/i18n/nb.po index 6e1c784ab8b..94c3725d96d 100644 --- a/addons/website_sale_delivery/i18n/nb.po +++ b/addons/website_sale_delivery/i18n/nb.po @@ -3,16 +3,18 @@ # * website_sale_delivery # # Translators: -# Martin Trigaux, 2018 # Aleksander, 2018 # Jorunn D. Newth, 2018 +# Martin Trigaux, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:18+0000\n" -"PO-Revision-Date: 2018-09-21 13:18+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:35+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -116,7 +118,7 @@ msgstr "Har leveranse" #. module: website_sale_delivery #: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier__is_published msgid "Is published" -msgstr "" +msgstr "Er Publisert" #. module: website_sale_delivery #: code:addons/website_sale_delivery/controllers/main.py:44 @@ -150,7 +152,7 @@ msgstr "Publisert" #. module: website_sale_delivery #: model:ir.model.fields,help:website_sale_delivery.field_delivery_carrier__website_id msgid "Restrict publishing to this website." -msgstr "" +msgstr "Begrens publisering til dette nettstedet" #. module: website_sale_delivery #: model:ir.model,name:website_sale_delivery.model_sale_order @@ -191,7 +193,7 @@ msgstr "USPS-leveransemetoder" #. module: website_sale_delivery #: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier__website_published msgid "Visible on current website" -msgstr "" +msgstr "Synlig på nåværende nettsted" #. module: website_sale_delivery #: model:ir.model.fields,field_description:website_sale_delivery.field_delivery_carrier__website_id diff --git a/addons/website_sale_stock/i18n/nb.po b/addons/website_sale_stock/i18n/nb.po index 5991069166e..ebfb727507d 100644 --- a/addons/website_sale_stock/i18n/nb.po +++ b/addons/website_sale_stock/i18n/nb.po @@ -3,15 +3,17 @@ # * website_sale_stock # # Translators: -# Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Martin Trigaux, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:18+0000\n" -"PO-Revision-Date: 2018-09-21 13:18+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:35+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -51,7 +53,7 @@ msgstr "Antall i handlevogn" #. module: website_sale_stock #: model:ir.model,name:website_sale_stock.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: website_sale_stock #: model:ir.model.fields,field_description:website_sale_stock.field_product_product__custom_message diff --git a/addons/website_sale_wishlist/i18n/cs.po b/addons/website_sale_wishlist/i18n/cs.po index 66a05165a95..18d1a6e28b0 100644 --- a/addons/website_sale_wishlist/i18n/cs.po +++ b/addons/website_sale_wishlist/i18n/cs.po @@ -3,16 +3,17 @@ # * website_sale_wishlist # # Translators: -# Martin Trigaux, 2018 # Jan Horzinka <jan.horzinka@centrum.cz>, 2018 -# trendspotter, 2018 +# Martin Trigaux, 2018 +# trendspotter <j.podhorecky@volny.cz>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:18+0000\n" -"PO-Revision-Date: 2018-09-21 13:18+0000\n" -"Last-Translator: trendspotter, 2018\n" +"PO-Revision-Date: 2018-08-24 09:35+0000\n" +"Last-Translator: trendspotter <j.podhorecky@volny.cz>, 2018\n" "Language-Team: Czech (https://www.transifex.com/odoo/teams/41243/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -58,7 +59,7 @@ msgstr "" #. module: website_sale_wishlist #: model:ir.model,name:website_sale_wishlist.model_ir_autovacuum msgid "Automatic Vacuum" -msgstr "" +msgstr "Automatické vysávání" #. module: website_sale_wishlist #: model:ir.model,name:website_sale_wishlist.model_res_partner diff --git a/addons/website_slides/i18n/cs.po b/addons/website_slides/i18n/cs.po index fbf3ec84d71..27953feabd0 100644 --- a/addons/website_slides/i18n/cs.po +++ b/addons/website_slides/i18n/cs.po @@ -334,7 +334,7 @@ msgstr "Archivováno" #: model:ir.model.fields,field_description:website_slides.field_slide_channel__message_attachment_count #: model:ir.model.fields,field_description:website_slides.field_slide_slide__message_attachment_count msgid "Attachment Count" -msgstr "" +msgstr "Počet příloh" #. module: website_slides #: selection:slide.slide,download_security:0 diff --git a/addons/website_slides/i18n/nb.po b/addons/website_slides/i18n/nb.po index f5fb529b3d3..be830e1f24c 100644 --- a/addons/website_slides/i18n/nb.po +++ b/addons/website_slides/i18n/nb.po @@ -5,13 +5,15 @@ # Translators: # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" -"PO-Revision-Date: 2018-10-08 06:49+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:35+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -449,7 +451,7 @@ msgstr "Firmakultur" #. module: website_slides #: model:ir.model,name:website_slides.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: website_slides #: model:ir.model.fields,field_description:website_slides.field_slide_slide__datas @@ -843,7 +845,7 @@ msgstr "Er følger" #: model:ir.model.fields,field_description:website_slides.field_slide_channel__is_published #: model:ir.model.fields,field_description:website_slides.field_slide_slide__is_published msgid "Is published" -msgstr "" +msgstr "Er Publisert" #. module: website_slides #: model:ir.model.fields,field_description:website_slides.field_slide_category____last_update @@ -1227,7 +1229,7 @@ msgstr "Tilknyttet" #: model:ir.model.fields,help:website_slides.field_slide_channel__website_id #: model:ir.model.fields,help:website_slides.field_slide_slide__website_id msgid "Restrict publishing to this website." -msgstr "" +msgstr "Begrens publisering til dette nettstedet" #. module: website_slides #: model_terms:ir.ui.view,arch_db:website_slides.home @@ -1247,7 +1249,7 @@ msgstr "" #: model:ir.model.fields,field_description:website_slides.field_slide_channel__is_seo_optimized #: model:ir.model.fields,field_description:website_slides.field_slide_slide__is_seo_optimized msgid "SEO optimized" -msgstr "" +msgstr "SEO-optimalisert" #. module: website_slides #. openerp-web @@ -1359,7 +1361,7 @@ msgstr "Vis kanal, men avgrens presentasjoner" #. module: website_slides #: model_terms:ir.ui.view,arch_db:website_slides.view_slide_slide_form msgid "Slide" -msgstr "" +msgstr "Lysbilde" #. module: website_slides #: model:ir.model,name:website_slides.model_slide_channel @@ -1375,7 +1377,7 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:website_slides.embed_slide #: model_terms:ir.ui.view,arch_db:website_slides.slide_detail_view msgid "Slide image" -msgstr "" +msgstr "Lysbilde-bilde" #. module: website_slides #: model:ir.model.fields,field_description:website_slides.field_slide_channel__custom_slide_id @@ -1618,7 +1620,7 @@ msgstr "Synlighet" #: model:ir.model.fields,field_description:website_slides.field_slide_channel__website_published #: model:ir.model.fields,field_description:website_slides.field_slide_slide__website_published msgid "Visible on current website" -msgstr "" +msgstr "Synlig på nåværende nettsted" #. module: website_slides #: model_terms:ir.ui.view,arch_db:website_slides.view_slide_slide_search diff --git a/addons/website_slides/i18n/pt_BR.po b/addons/website_slides/i18n/pt_BR.po index bff8a763701..05949ebaccd 100644 --- a/addons/website_slides/i18n/pt_BR.po +++ b/addons/website_slides/i18n/pt_BR.po @@ -4,26 +4,28 @@ # # Translators: # Rodrigo de Almeida Sottomaior Macedo <rmsolucoeseminformatic4@gmail.com>, 2018 -# Hildeberto Abreu Magalhães <hildeberto@gmail.com>, 2018 -# danimaribeiro <danimaribeiro@gmail.com>, 2018 # Rui Andrada <shingonoide@gmail.com>, 2018 -# Martin Trigaux, 2018 # Clemilton Clementino <clemylton@hotmail.com>, 2018 -# Mateus Lopes <mateus1@gmail.com>, 2018 # Peter Leaf <pablleaf@gmail.com>, 2018 # Luiz Carlos de Lima <luiz.carlos@akretion.com.br>, 2018 -# Adriel Kotviski <kotviski@gmail.com>, 2018 # falexandresilva <falexandresilva@gmail.com>, 2018 +# Hildeberto Abreu Magalhães <hildeberto@gmail.com>, 2018 +# danimaribeiro <danimaribeiro@gmail.com>, 2018 +# Adriel Kotviski <kotviski@gmail.com>, 2018 # grazziano <gra.negocia@gmail.com>, 2018 -# Silmar <pinheirosilmar@gmail.com>, 2018 # André Augusto Firmino Cordeiro <a.cordeito@gmail.com>, 2018 +# Martin Trigaux, 2018 +# Mateus Lopes <mateus1@gmail.com>, 2018 +# Silmar <pinheirosilmar@gmail.com>, 2018 +# Emanuel Martins <emanuel.breno@gmail.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server 12.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-10-08 06:49+0000\n" -"PO-Revision-Date: 2018-10-08 06:49+0000\n" -"Last-Translator: André Augusto Firmino Cordeiro <a.cordeito@gmail.com>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:35+0000\n" +"Last-Translator: Emanuel Martins <emanuel.breno@gmail.com>, 2018\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/odoo/teams/41243/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1624,7 +1626,7 @@ msgstr "" #. module: website_slides #: model_terms:ir.ui.view,arch_db:website_slides.view_slide_slide_search msgid "Waiting for validation" -msgstr "" +msgstr "Esperando pela validação" #. module: website_slides #: model:slide.slide,description:website_slides.slide_7 diff --git a/addons/website_theme_install/i18n/ja.po b/addons/website_theme_install/i18n/ja.po index 7a9dd34cfab..1582c613ac4 100644 --- a/addons/website_theme_install/i18n/ja.po +++ b/addons/website_theme_install/i18n/ja.po @@ -4,16 +4,17 @@ # # Translators: # Martin Trigaux, 2018 -# Yoshi Tashiro <tashiro@roomsfor.hk>, 2018 # Manami Hashi <manami@roomsfor.hk>, 2018 # Norimichi Sugimoto <norimichi.sugimoto@tls-ltd.co.jp>, 2018 +# Yoshi Tashiro <tashiro@roomsfor.hk>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:18+0000\n" -"PO-Revision-Date: 2018-09-21 13:18+0000\n" -"Last-Translator: Norimichi Sugimoto <norimichi.sugimoto@tls-ltd.co.jp>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:35+0000\n" +"Last-Translator: Yoshi Tashiro <tashiro@roomsfor.hk>, 2018\n" "Language-Team: Japanese (https://www.transifex.com/odoo/teams/41243/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -181,7 +182,7 @@ msgstr "最終更新日" #. module: website_theme_install #: model_terms:ir.ui.view,arch_db:website_theme_install.onboarding_website_theme_step msgid "Let's start!" -msgstr "" +msgstr "はじめましょう" #. module: website_theme_install #: model_terms:ir.ui.view,arch_db:website_theme_install.theme_view_kanban diff --git a/addons/website_theme_install/i18n/nb.po b/addons/website_theme_install/i18n/nb.po index fabdafa98d7..49fa6bf0848 100644 --- a/addons/website_theme_install/i18n/nb.po +++ b/addons/website_theme_install/i18n/nb.po @@ -3,15 +3,17 @@ # * website_theme_install # # Translators: -# Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Martin Trigaux, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:18+0000\n" -"PO-Revision-Date: 2018-09-21 13:18+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"PO-Revision-Date: 2018-08-24 09:35+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -83,7 +85,7 @@ msgstr "Firmaer" #. module: website_theme_install #: model:ir.model,name:website_theme_install.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: website_theme_install #: model:ir.actions.server,name:website_theme_install.theme_install_todo_action diff --git a/addons/website_twitter/i18n/nb.po b/addons/website_twitter/i18n/nb.po index dfdb0a4b984..bdef0715d72 100644 --- a/addons/website_twitter/i18n/nb.po +++ b/addons/website_twitter/i18n/nb.po @@ -6,13 +6,15 @@ # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 # Jan Pedro Tumusok <jpt@eyenetworks.no>, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 +# msgid "" msgstr "" "Project-Id-Version: Odoo Server saas~11.5\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-21 13:18+0000\n" -"PO-Revision-Date: 2018-09-21 13:18+0000\n" -"Last-Translator: Jan Pedro Tumusok <jpt@eyenetworks.no>, 2018\n" +"PO-Revision-Date: 2018-08-24 09:35+0000\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -86,7 +88,7 @@ msgstr "" #. module: website_twitter #: model:ir.model,name:website_twitter.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: website_twitter #: model_terms:ir.ui.view,arch_db:website_twitter.res_config_settings_view_form @@ -379,11 +381,6 @@ msgstr "" #. module: website_twitter #: model_terms:ir.ui.view,arch_db:website_twitter.res_config_settings_view_form -msgid "api_key.png" -msgstr "" - -#. module: website_twitter -#: model_terms:ir.ui.view,arch_db:website_twitter.res_config_settings_view_form msgid "https://apps.twitter.com/app/new" msgstr "" diff --git a/odoo/addons/base/i18n/cs.po b/odoo/addons/base/i18n/cs.po index 5d0196724d6..2dd0c2f49a0 100644 --- a/odoo/addons/base/i18n/cs.po +++ b/odoo/addons/base/i18n/cs.po @@ -6374,7 +6374,7 @@ msgstr "" #. module: base #: model:ir.model,name:base.model_ir_actions_act_window_view msgid "Action Window View" -msgstr "" +msgstr "Zobrazení okna akcí" #. module: base #: model:ir.actions.act_window,name:base.ir_sequence_actions @@ -7183,7 +7183,7 @@ msgstr "Průvodce automatickým sloučením" #. module: base #: model:ir.model,name:base.model_ir_autovacuum msgid "Automatic Vacuum" -msgstr "" +msgstr "Automatické vysávání" #. module: base #: code:addons/base/models/ir_module.py:725 @@ -17885,7 +17885,7 @@ msgstr "Datum vypršení platnosti produktu" #. module: base #: model:ir.module.module,summary:base.module_documents_product msgid "Products from Documents" -msgstr "" +msgstr "Produkty z dokumentů" #. module: base #: model:res.partner.title,shortcut:base.res_partner_title_prof @@ -18071,7 +18071,7 @@ msgstr "" #. module: base #: model:ir.module.module,summary:base.module_website_membership msgid "Publish your members directory" -msgstr "" +msgstr "Zveřejnit svůj adresář členů" #. module: base #: model:ir.module.module,summary:base.module_website_crm_partner_assign @@ -18203,7 +18203,7 @@ msgstr "" #. module: base #: model:ir.module.module,summary:base.module_web_settings_dashboard msgid "Quick actions for installing new app, adding users, etc." -msgstr "" +msgstr "Rychlé akce pro instalaci nové aplikace, přidávání uživatelů atd." #. module: base #: model:ir.module.module,shortdesc:base.module_sale_quotation_builder @@ -18214,7 +18214,7 @@ msgstr "" #: model:ir.module.module,summary:base.module_sale_expense #: model:ir.module.module,summary:base.module_sale_stock msgid "Quotation, Sales Orders, Delivery & Invoicing Control" -msgstr "" +msgstr "Nabídky, objednávky, kontrola doručení a fakturace" #. module: base #: model:ir.model,name:base.model_ir_qweb @@ -18740,13 +18740,13 @@ msgstr "Faktor zaokrouhlení" #: code:addons/base/models/ir_qweb_fields.py:161 #, python-format msgid "Rounding precision" -msgstr "" +msgstr "Přesnost zaokrouhlení" #. module: base #: code:addons/base/models/ir_qweb_fields.py:512 #, python-format msgid "Rounding unit" -msgstr "" +msgstr "Zaokrouhlovací jednotka" #. module: base #: model_terms:ir.ui.view,arch_db:base.view_rule_form @@ -18813,7 +18813,7 @@ msgstr "S OSTATNÍ SERVISNÍ ČINNOSTI" #. module: base #: model:ir.module.module,shortdesc:base.module_account_sepa msgid "SEPA Credit Transfer" -msgstr "" +msgstr "SEPA Credit Transfer" #. module: base #: model:ir.module.module,shortdesc:base.module_account_sepa_direct_debit @@ -20287,7 +20287,7 @@ msgstr "" #. module: base #: model:ir.module.module,description:base.module_test_converter msgid "Tests of field conversions" -msgstr "" +msgstr "Testy konverzí polí" #. module: base #: selection:ir.actions.report,report_type:0 selection:ir.property,type:0 @@ -20370,6 +20370,8 @@ msgid "" "The Tax Identification Number. Complete it if the contact is subjected to " "government taxes. Used in some legal statements." msgstr "" +"Daňové identifikační číslo. Dokončete jej, pokud je kontakt podroben daním. " +"Používá se v některých právních prohlášeních." #. module: base #: code:addons/base/models/ir_module.py:753 @@ -20454,7 +20456,7 @@ msgstr "Měnová sazba musí být pouze kladná." #. module: base #: model:ir.model.fields,help:base.field_ir_attachment__res_model msgid "The database object this attachment will be attached to." -msgstr "" +msgstr "Databáze, jíž bude tato příloha připojena." #. module: base #: model_terms:ir.ui.view,arch_db:base.demo_failures_dialog @@ -20530,7 +20532,7 @@ msgstr "Celé jméno země." #: model:ir.model.fields,help:base.field_res_partner__user_id #: model:ir.model.fields,help:base.field_res_users__user_id msgid "The internal user in charge of this contact." -msgstr "" +msgstr "Interní uživatel odpovědný za tento kontakt." #. module: base #: model:ir.model.fields,help:base.field_ir_model__inherited_model_ids @@ -21629,6 +21631,8 @@ msgstr "" msgid "" "Unrecognized extension: must be one of .csv, .po, or .tgz (received .%s)." msgstr "" +"Nerozpoznaná koncovka souboru: musí být jedna z koncovek .csv, .po nebo .tgz" +" (přijato %s)." #. module: base #: model:ir.module.module,shortdesc:base.module_web_unsplash @@ -21686,7 +21690,7 @@ msgstr "Podmínky aktualizace" #. module: base #: model:ir.model,name:base.model_base_update_translations msgid "Update Translations" -msgstr "" +msgstr "Aktualizace překladů" #. module: base #: selection:ir.actions.server,state:0 @@ -21757,6 +21761,7 @@ msgstr "Zadejte '1' pro ano a '0' pro ne" #: model:ir.model.fields,help:base.field_res_users__barcode msgid "Use a barcode to identify this contact from the Point of Sale." msgstr "" +"Použijte čárový kód pro identifikaci tohoto kontaktu z prodejního místa." #. module: base #: model:ir.module.module,summary:base.module_stock_barcode @@ -21896,7 +21901,7 @@ msgstr "Typy uživatelů" #. module: base #: model:ir.model,name:base.model_change_password_user msgid "User, Change Password Wizard" -msgstr "" +msgstr "Průvodce změnou hesla Uživatele" #. module: base #: model:ir.actions.act_window,name:base.ir_default_menu_action @@ -22220,7 +22225,7 @@ msgstr "" #. module: base #: model:ir.model.fields,field_description:base.field_ir_ui_view__inherit_children_ids msgid "Views which inherit from this one" -msgstr "" +msgstr "Pohledy, které z tohoto důvodu dědí" #. module: base #: model:res.country,name:base.vg @@ -22260,7 +22265,7 @@ msgstr "Sklad" #. module: base #: model:ir.module.module,shortdesc:base.module_stock_picking_batch msgid "Warehouse Management: Batch Picking" -msgstr "" +msgstr "Správa skladu: dávkové vybírání" #. module: base #: code:addons/base/models/ir_mail_server.py:499 @@ -22297,7 +22302,7 @@ msgstr "Web" #. module: base #: model:ir.module.module,shortdesc:base.module_web_editor msgid "Web Editor" -msgstr "" +msgstr "Webový Editor" #. module: base #: model:ir.module.module,shortdesc:base.module_web_enterprise @@ -22379,7 +22384,7 @@ msgstr "" #. module: base #: model:ir.module.module,summary:base.module_website_mail msgid "Website Module for Mail" -msgstr "" +msgstr "Modul webových stránek pro poštu" #. module: base #: model:ir.module.module,shortdesc:base.module_website_partner @@ -22394,7 +22399,7 @@ msgstr "" #. module: base #: model:ir.module.module,shortdesc:base.module_website_rating msgid "Website Rating" -msgstr "" +msgstr "Hodnocení webových stránek" #. module: base #: model:ir.module.module,shortdesc:base.module_website_sale_dashboard @@ -22568,7 +22573,7 @@ msgstr "Jemen" #. module: base #: model_terms:ir.ui.view,arch_db:base.demo_force_install_form msgid "Yes, I understand the risks" -msgstr "" +msgstr "Ano, chápu rizika" #. module: base #: model:ir.module.module,shortdesc:base.module_account_yodlee @@ -22647,7 +22652,7 @@ msgstr "" #: code:addons/base/models/res_users.py:435 #, python-format msgid "You cannot activate the superuser." -msgstr "" +msgstr "Superusera nemůžete aktivovat." #. module: base #: code:addons/base/models/res_partner.py:509 diff --git a/odoo/addons/base/i18n/fr.po b/odoo/addons/base/i18n/fr.po index e465ae08866..c982bcb68ea 100644 --- a/odoo/addons/base/i18n/fr.po +++ b/odoo/addons/base/i18n/fr.po @@ -5296,11 +5296,11 @@ msgid "" " " msgstr "" "\n" -"Module de gestion du plan comptable pour la Belgique dans Pdpp.\n" +"Module de gestion du plan comptable pour la Belgique dans Odoo.\n" "================================================== ============================\n" "\n" "Après l'installation de ce module, l'assistant de configuration de la comptabilité est lancé.\n" -" * Nous avons les modèles de compte qui peut être utile pour générer des graphiques de comptes.\n" +" * Nous avons les modèles de compte, ce qui peut être utile pour générer des graphiques de comptes.\n" " * Sur cet assistant, vous serez invité à saisir le nom de la société, le modèle de tableau à suivre, le nombre de chiffres à générer, le code du compte et le compte bancaire, la monnaie pour créer les journaux.\n" "\n" "Ainsi, la copie pure du modèle de tableau est générée.\n" diff --git a/odoo/addons/base/i18n/it.po b/odoo/addons/base/i18n/it.po index 2917f4f206b..d13a6646e7d 100644 --- a/odoo/addons/base/i18n/it.po +++ b/odoo/addons/base/i18n/it.po @@ -3895,6 +3895,12 @@ msgid "" "Then it can be made specific at the product level.\n" " " msgstr "" +"\n" +"Gestisci l'inventario dei tuoi prodotti e visualizza la loro disponibilità nel tuo magazzino eCommerce.\n" +"In caso di esaurimento, puoi decidere di bloccare ulteriori vendite o di continuare a vendere.\n" +"Un comportamento predefinito può essere selezionato nelle impostazioni del sito Web.\n" +"Questo comportamento può anche essere specifico al livello del prodotto.\n" +" " #. module: base #: model:ir.module.module,description:base.module_mass_mailing_event @@ -4301,6 +4307,26 @@ msgid "" "* In a module, so that administrators and users of Odoo who do not\n" " need or want an online import can avoid it being available to users.\n" msgstr "" +"\n" +"Nuova importazione di file estensibile per Odoo\n" +"======================================\n" +"\n" +"Reimplementazione del sistema di importazione di file di Odoo:\n" +"\n" +"* Lato server: il sistema precedente effettuava principalmente elaborazioni\n" +" lato client. Il lavoro era così duplicato (tra i client), era molto più difficile\n" +" usare il sistema di importazione senza un client (RPC diretto o\n" +" altre forme di automazione) e era molto più difficile controllare il\n" +" sistema di importazione/esportazione in quanto era distribuito\n" +" su più di 3 progetti diversi.\n" +"\n" +"* Più in generale: gli utenti e i partner possono creare la propria interfaccia\n" +" front-end per importare altri formati di file (ad esempio, dei file\n" +" OpenDocument) che possono essere più facili da gestire nel loro flusso di\n" +" lavoro o dalle loro fonti di produzione di dati.\n" +"\n" +"* In un modulo: gli amministratori di Odoo e gli utenti, secondo le loro\n" +" esigenze o desideri, possono evitare che un'importazione online sia disponibile per gli utenti.\n" #. module: base #: model:ir.module.module,description:base.module_l10n_sa @@ -4330,6 +4356,13 @@ msgid "" "chatter messages and channel.\n" " " msgstr "" +"\n" +"Odoo Cloud Notifications (OCN)\n" +"===============================\n" +"\n" +"Questo modulo consente di inviare notifiche push ai dispositivi registrati per messaggi diretti,\n" +"messaggi di chat e canali.\n" +" " #. module: base #: model:ir.module.module,description:base.module_web_dashboard @@ -4415,6 +4448,14 @@ msgid "" "\n" " " msgstr "" +"\n" +"Dashboard Odoo\n" +"==============\n" +"* Accesso rapido per installare delle app\n" +"* Aggiunta rapida di utenti\n" +"* Accesso rapido all'\"App Store\" e al \"Theme Store\"\n" +"\n" +" " #. module: base #: model:ir.module.module,description:base.module_web_gantt @@ -4644,6 +4685,9 @@ msgid "" "Publish your customers as business references on your website to attract new potential prospects.\n" " " msgstr "" +"\n" +"Pubblica i tuoi clienti come riferimenti commerciali sul tuo sito Web per attirare nuovi potenziali clienti.\n" +" " #. module: base #: model:ir.module.module,description:base.module_website_hr @@ -4652,6 +4696,9 @@ msgid "" "Publish your employees public information on About Us website page.\n" " " msgstr "" +"\n" +"Pubblica le informazioni pubbliche dei tuoi dipendenti nella pagina \"Chi siamo\".\n" +" " #. module: base #: model:ir.module.module,description:base.module_website_membership @@ -4660,6 +4707,9 @@ msgid "" "Publish your members/association directory publicly.\n" " " msgstr "" +"\n" +"Pubblica il tuo elenco di membri/associazioni.\n" +" " #. module: base #: model:ir.module.module,description:base.module_sale_ebay @@ -4706,6 +4756,15 @@ msgid "" "* Possibility to add a measure to the quality check with a min/max tolerance\n" "* Define your stages for the quality alerts\n" msgstr "" +"\n" +"Base della qualità\n" +"===============\n" +"\n" +"* Definisci i livelli di qualità che genereranno controlli di qualità per i prelievi,\n" +" gli ordini di produzione o gli ordini di lavoro (quality_mrp)\n" +"* Si possono creare avvisi di qualità distinti o collegati ai controlli di qualità\n" +"* Si può aggiungere una misura di controllo di qualità con una tolleranza minima/massima\n" +"* Definisci le fasi da seguire per gli avvisi di qualità\n" #. module: base #: model:ir.module.module,description:base.module_quality_control @@ -4719,6 +4778,15 @@ msgid "" "* Possibility to add a measure to the quality check with a min/max tolerance\n" "* Define your stages for the quality alerts\n" msgstr "" +"\n" +"Controllo della qualità\n" +"===============\n" +"\n" +"* Definisci i livelli di qualità che genereranno controlli di qualità per i prelievi,\n" +" gli ordini di produzione o gli ordini di lavoro (quality_mrp)\n" +"* Si possono creare avvisi di qualità distinti o collegati ai controlli di qualità\n" +"* Si può aggiungere una misura di controllo di qualità con una tolleranza minima/massima\n" +"* Definisci le fasi da seguire per gli avvisi di qualità\n" #. module: base #: model:ir.module.module,description:base.module_sale_expense @@ -4769,6 +4837,34 @@ msgid "" "(technically: Server Actions) to be triggered for each incoming mail.\n" " " msgstr "" +"\n" +"Recupera le email in arrivo sui server POP/IMAP.\n" +"============================================\n" +"\n" +"Inserisci i parametri dei tuoi account POP/IMAP, e tutte le email che arrivano su\n" +"questi account saranno scaricate automaticamente nel tuo sistema Odoo. Sono\n" +"supportati tutti i server compatibili POP3/IMAP, compresi quelli che richiedono\n" +"una connessione SSL/TLS criptata.\n" +"\n" +"Puoi così creare facilmente flussi di lavoro basati su email per molti documenti Odoo utilizzando le funzioni email, ad esempio:\n" +"----------------------------------------------------------------------------------------------------------\n" +" * Lead/Opportunità CRM\n" +" * Richieste CRM\n" +" * Domande di progetto\n" +" * Compiti di progetto\n" +" * Assunzioni in risorse umane (candidati)\n" +"\n" +"Basta installare l'applicazione in questione per poter assegnare uno qualsiasi\n" +"di questi tipi di documenti (lead, domande di progetto) al proprio account di posta elettronica in arrivo. Le nuove email\n" +"genereranno automaticamente nuovi documenti del tipo scelto, quindi è molto veloce per creare\n" +"un'integrazione email-verso-Odoo. Ancora meglio: questi documenti funzionano direttamente come mini\n" +"conversazioni sincronizzate per email. Puoi rispondere da Odoo e\n" +"le risposte saranno raccolte automaticamente al loro ritorno, e allegate\n" +"allo stesso documento di *conversazione*.\n" +"\n" +"Per esigenze più specifiche, è anche possibile assegnare azioni personalizzate\n" +"(tecnicamente: Azioni Server) da attivare per ogni email in arrivo.\n" +" " #. module: base #: model:ir.module.module,description:base.module_sale_subscription_dashboard @@ -4810,6 +4906,11 @@ msgid "" "Once the order is paid, the file is made available in the order confirmation page and in the customer portal.\n" " " msgstr "" +"\n" +"Vendi beni digitali nel tuo negozio eCommerce (es. webinar, articoli, e-book, video tutorial).\n" +"Per farlo, crea il prodotto e allega il file da condividere tramite il pulsante *File* della scheda prodotto.\n" +"Una volta pagato l'ordine, il file viene reso disponibile nella pagina di conferma dell'ordine e nel portale clienti.\n" +" " #. module: base #: model:ir.module.module,description:base.module_website_event_sale @@ -4818,6 +4919,9 @@ msgid "" "Sell event tickets through eCommerce app.\n" " " msgstr "" +"\n" +"Vendi biglietti per eventi con l'app eCommerce.\n" +" " #. module: base #: model:ir.module.module,description:base.module_digest @@ -4911,6 +5015,9 @@ msgid "" "Show your company address/partner address on Google Maps. Configure an API key in the Website settings.\n" " " msgstr "" +"\n" +"Mostra l'indirizzo della tua azienda/indirizzo del tuo partner su Google Maps. Configura una chiave API nelle impostazioni del sito Web.\n" +" " #. module: base #: model:ir.module.module,description:base.module_sign @@ -5283,6 +5390,9 @@ msgid "" "This is a bridge module which integrates payment acquirers with Website app.\n" " " msgstr "" +"\n" +"Modulo intermedio che integra gli intermediari di pagamento con l'applicazione Sito Web.\n" +" " #. module: base #: model:ir.module.module,description:base.module_calendar @@ -5319,6 +5429,10 @@ msgid "" "========================================================================\n" " " msgstr "" +"\n" +"Modulo di base per la gestione delle unità di misura.\n" +"========================================================================\n" +" " #. module: base #: model:ir.module.module,description:base.module_product @@ -5398,6 +5512,35 @@ msgid "" "\n" " " msgstr "" +"\n" +"Modulo di gestione del piano dei conti per il Belgio in Odoo.\n" +"==============================================================================\n" +"\n" +"Dopo l'installazione di questo modulo, viene avviata il wizard di configurazione per la contabilità.\n" +" * Abbiamo i modelli di conto che possono essere utili per generare i piani dei conti.\n" +" * Su questo particolare wizard, ti sarà chiesto di inserire il nome dell'azienda,\n" +" il modello del piano da seguire, il numero di cifre da generare, il codice\n" +" dell'account e il conto bancario e la valuta per creare i sezionali.\n" +"\n" +"Così, la copia pura del modello di piano viene generata.\n" +"\n" +"Wizard forniti da questo modulo:\n" +"--------------------------------\n" +" * Partner IVA Intra: Registra i partner con la loro partita IVA e gli importi\n" +" fatturati. Prepara un formato di file XML.\n" +" \n" +" **Percorso di accesso:** Fatturazione/Analisi/Rapporti legali/Dichiarazioni del Belgio /Partner IVA Intra\n" +" * Dichiarazione periodica dell'IVA: Prepara un file XML per la dichiarazione dell'IVA\n" +" dell'azienda principale dell'utente attualmente connesso.\n" +" \n" +" **Percorso di accesso:** Fatturazione/Analisi/Rapporti legali/Dichiarazioni del Belgio/Dichiarazioni periodiche dell'IVA\n" +" * Elenco annuale dei clienti assoggettati all'IVA: Prepara un file XML per la dichiarazione\n" +" dell'IVA dell'azienda principale dell'utente attualmente connesso in base\n" +" all'anno fiscale.\n" +" \n" +" **Percorso di accesso :** Fatturazione/Analisi/Rapporti legali/Dichiarazioni del Belgio/Elenco annuale dei clienti assoggettati all'IVA.\n" +"\n" +" " #. module: base #: model:ir.module.module,description:base.module_l10n_do_reports @@ -5769,6 +5912,13 @@ msgid "" "Finally, the module comes with an option to display an attribute summary table in product web pages (available in Customize menu).\n" " " msgstr "" +"\n" +"Questo modulo aggiunge uno strumento di confronto al tuo negozio eCommerce, in modo che i tuoi clienti possano confrontare facilmente i prodotti in base alle loro caratteristiche. Questo accelererà notevolmente la loro decisione di acquisto.\n" +"\n" +"Per configurare gli attributi dei prodotti, attiva *Attributi e varianti* nelle impostazioni del sito Web. Questo aggiungerà una sezione dedicata nella scheda prodotto. Nella configurazione, questo modulo aggiunge un campo categoria agli attributi del prodotto per strutturare la tabella di confronto dell'acquirente.\n" +"\n" +"Infine, il modulo è dotato di un'opzione per visualizzare una tabella riassuntiva degli attributi nelle pagine Web dei prodotti (disponibile nel menu Personalizza).\n" +" " #. module: base #: model:ir.module.module,description:base.module_website_sale_dashboard @@ -5820,6 +5970,15 @@ msgid "" "of this module is to allow the display of a customer portal without having\n" "a dependency towards website edition and customization capabilities." msgstr "" +"\n" +"Questo modulo aggiunge il codice di base richiesto per un portale clienti completamente integrato.\n" +"Contiene la classe di controller di base e modelli di base. I moduli aziendali\n" +"aggiungono i propri modelli e controller per sviluppare il portale\n" +"clienti.\n" +"\n" +"Questo modulo contiene essenzialmente il codice del website_portale versione 10 di Odoo. L'obiettivo\n" +"di questo modulo è quello di consentire la visualizzazione di un portale clienti senza\n" +"dipendere dalle funzionalità di modifica e di personalizzazione del sito Web." #. module: base #: model:ir.module.module,description:base.module_l10n_fr_sale_closing @@ -7623,8 +7782,7 @@ msgstr "A AGRICOLTURA, SILVICOLTURA E PESCA" #: code:addons/models.py:2986 #, python-format msgid "A document was modified since you last viewed it (%s:%d)" -msgstr "" -"Un documento è stato modificato dall'ultima tua visualizzazione (%s:%d)" +msgstr "Un documento è stato modificato dall'ultima visualizzazione (%s:%d)" #. module: base #: model_terms:ir.actions.act_window,help:base.action_res_groups @@ -7646,7 +7804,7 @@ msgstr "" #. module: base #: model:ir.module.module,summary:base.module_hw_posbox_homepage msgid "A homepage for the IoT Box" -msgstr "" +msgstr "Una pagina iniziale per il box IoT" #. module: base #: model:ir.module.module,description:base.module_test_exceptions @@ -7812,7 +7970,7 @@ msgstr "Menu Accesso" #: model_terms:ir.ui.view,arch_db:base.view_view_form #: model:res.groups,name:base.group_erp_manager msgid "Access Rights" -msgstr "Autorizzazioni Accesso" +msgstr "Diritti di accesso" #. module: base #: model:ir.model.fields,field_description:base.field_ir_attachment__access_token @@ -7905,7 +8063,7 @@ msgstr "Contabilità" #. module: base #: model:ir.module.category,name:base.module_category_accounting_and_finance msgid "Accounting & Finance" -msgstr "Contabilità & Finanza" +msgstr "Contabilità e finanza" #. module: base #: model:ir.module.category,name:base.module_category_accounting_andamp;_finance @@ -7915,7 +8073,7 @@ msgstr "" #. module: base #: model:ir.module.module,shortdesc:base.module_mrp_account msgid "Accounting - MRP" -msgstr "Contabilità -MRP" +msgstr "Contabilità - MRP" #. module: base #: model:ir.module.module,shortdesc:base.module_account_test @@ -7925,7 +8083,7 @@ msgstr "Prove di coerenza della contabilità" #. module: base #: model:ir.module.module,shortdesc:base.module_account_reports msgid "Accounting Reports" -msgstr "Reports di contabilità" +msgstr "Rendiconti contabili" #. module: base #: model:ir.module.module,description:base.module_l10n_nl @@ -7990,7 +8148,7 @@ msgstr "Descrizione dell'Azione" #: model:ir.model.fields,field_description:base.field_ir_actions_server__name #: model:ir.model.fields,field_description:base.field_ir_cron__name msgid "Action Name" -msgstr "Nome Azione" +msgstr "Nome azione" #. module: base #: model:ir.model.fields,field_description:base.field_ir_actions_act_url__target @@ -8001,7 +8159,7 @@ msgstr "Obiettivo Azione" #: model:ir.model.fields,field_description:base.field_ir_actions_server__state #: model:ir.model.fields,field_description:base.field_ir_cron__state msgid "Action To Do" -msgstr "Azione Da Fare" +msgstr "Azione da svolgere" #. module: base #: model:ir.model.fields,field_description:base.field_ir_actions_act_url__type @@ -8040,7 +8198,7 @@ msgstr "" #. module: base #: model:ir.model,name:base.model_ir_actions_act_window_view msgid "Action Window View" -msgstr "" +msgstr "Vista finestra azione" #. module: base #: model:ir.actions.act_window,name:base.ir_sequence_actions @@ -8120,7 +8278,7 @@ msgstr "" #. module: base #: model:ir.module.module,summary:base.module_base_address_extended msgid "Add extra fields on addresses" -msgstr "Aggiungi campi aggiuntivi agli indirizzi" +msgstr "Aggiunta di campi supplementari negli indirizzi" #. module: base #: model_terms:ir.ui.view,arch_db:base.act_report_xml_view @@ -8287,7 +8445,7 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:base.view_model_fields_form #: model_terms:ir.ui.view,arch_db:base.view_model_form msgid "Advanced Properties" -msgstr "Proprietà Avanzate" +msgstr "Proprietà avanzate" #. module: base #: model:ir.module.module,summary:base.module_crm_enterprise @@ -8552,7 +8710,7 @@ msgstr "Applicazione" #: model_terms:ir.ui.view,arch_db:base.user_groups_view #, python-format msgid "Application Accesses" -msgstr "Accessi all'Applicazione" +msgstr "Permessi applicazione" #. module: base #: model:ir.ui.menu,name:base.menu_translation_app @@ -8645,7 +8803,7 @@ msgstr "" #. module: base #: model:ir.model.fields,field_description:base.field_ir_ui_view__arch_fs msgid "Arch Filename" -msgstr "" +msgstr "Nome file arch" #. module: base #: model_terms:ir.ui.view,arch_db:base.view_view_form @@ -8851,7 +9009,7 @@ msgstr "Procedura guidata della fusione automatica" #. module: base #: model:ir.model,name:base.model_ir_autovacuum msgid "Automatic Vacuum" -msgstr "Vuoto automatico" +msgstr "Pulizia automatica" #. module: base #: code:addons/base/models/ir_module.py:725 @@ -9040,7 +9198,7 @@ msgstr "Barcode" #. module: base #: model:ir.module.module,shortdesc:base.module_hw_scanner msgid "Barcode Scanner Hardware Driver" -msgstr "Driver Hardware del Lettore dei Codici a Barre" +msgstr "Driver hardware lettore barcode" #. module: base #: model:ir.module.module,shortdesc:base.module_barcodes_mobile @@ -9098,7 +9256,7 @@ msgstr "Oggetto Base" #: model_terms:ir.ui.view,arch_db:base.view_model_fields_form #: model_terms:ir.ui.view,arch_db:base.view_model_form msgid "Base Properties" -msgstr "Proprietà Base" +msgstr "Proprietà base" #. module: base #: model:ir.model.fields,field_description:base.field_ir_ui_view__arch_base @@ -9125,7 +9283,7 @@ msgstr "Vista base" #: model:ir.cron,cron_name:base.autovacuum_job #: model:ir.cron,name:base.autovacuum_job msgid "Base: Auto-vacuum internal data" -msgstr "" +msgstr "Base: pulizia automatica dati interni" #. module: base #: model:ir.module.module,summary:base.module_web_grid @@ -9288,7 +9446,7 @@ msgstr "Tipo di Collegamento" #. module: base #: model:ir.module.module,shortdesc:base.module_hw_blackbox_be msgid "Blackbox Hardware Driver" -msgstr "Driver Hardware Blackbox" +msgstr "Driver hardware blackbox" #. module: base #: model:ir.module.module,shortdesc:base.module_website_blog @@ -9785,7 +9943,7 @@ msgstr "Aziende Figlie" #. module: base #: model:ir.model.fields,field_description:base.field_ir_ui_view__field_parent msgid "Child Field" -msgstr "Campo Collegato" +msgstr "Campo figlio" #. module: base #: model:ir.model.fields,field_description:base.field_ir_ui_menu__child_id @@ -10023,8 +10181,8 @@ msgid "" "Comma-separated list of allowed view modes, such as 'form', 'tree', " "'calendar', etc. (Default: tree,form)" msgstr "" -"Lista delle modalità di visualizzazione consentite separate da virgola come:" -" 'form', 'tree', 'calendar', ... (Default: tree,form)" +"Elenco delle modalità consentite per la vista, separate da virgola, come: " +"\"modulo\", \"albero\", \"calendario\" ecc. (predefinito: albero, modulo)" #. module: base #: model:ir.model.fields,field_description:base.field_res_groups__comment @@ -10112,13 +10270,13 @@ msgstr "Nome azienda" #: model:ir.model.fields,field_description:base.field_res_partner__commercial_company_name #: model:ir.model.fields,field_description:base.field_res_users__commercial_company_name msgid "Company Name Entity" -msgstr "Entità Nome Azienda" +msgstr "Ente nome azienda" #. module: base #: model:ir.actions.act_window,name:base.ir_property_form #: model:ir.ui.menu,name:base.menu_ir_property_form_all msgid "Company Properties" -msgstr "Proprietà dell'Azienda" +msgstr "Proprietà azienda" #. module: base #: model:ir.model,name:base.model_ir_property @@ -10128,7 +10286,7 @@ msgstr "" #. module: base #: model:ir.model.fields,field_description:base.field_res_company__company_registry msgid "Company Registry" -msgstr "Registro delle Imprese" +msgstr "Registro impresa" #. module: base #: model:ir.model.fields,field_description:base.field_res_company__report_header @@ -10232,7 +10390,7 @@ msgstr "Passaggi Procedura guidata di configurazione" #. module: base #: model:ir.actions.server,name:base.action_run_ir_action_todo msgid "Config: Run Remaining Action Todo" -msgstr "Configurazione: Esegui le Azioni Rimanenti" +msgstr "Configurazione: eseguire le azioni rimanenti" #. module: base #: model:ir.ui.menu,name:base.menu_reporting_config @@ -10272,7 +10430,7 @@ msgstr "Congo" #: model:ir.module.module,summary:base.module_hw_drivers #: model:ir.module.module,summary:base.module_hw_proxy msgid "Connect the Web Client to Hardware Peripherals" -msgstr "Connetti il Client Web alle Periferiche Hardware" +msgstr "Connette il client web alle periferiche hardware" #. module: base #: model_terms:ir.ui.view,arch_db:base.ir_mail_server_form @@ -10346,7 +10504,7 @@ msgstr "Creazione contatti" #. module: base #: model:ir.module.module,shortdesc:base.module_website_crm msgid "Contact Form" -msgstr "Form di Contatto" +msgstr "Modulo contatto" #. module: base #: model:ir.module.module,shortdesc:base.module_website_crm_phone_validation @@ -10539,7 +10697,7 @@ msgstr "Crea Diritto di Accesso" #. module: base #: model_terms:ir.ui.view,arch_db:base.view_server_action_form msgid "Create Contextual Action" -msgstr "Creare un'Azione Contestuale" +msgstr "Crea azione contestuale" #. module: base #: model:ir.model.fields,field_description:base.field_ir_logging__create_date @@ -10590,7 +10748,7 @@ msgstr "" #. module: base #: selection:ir.actions.server,state:0 msgid "Create a new Record" -msgstr "Crea un nuovo Record" +msgstr "Creare un nuovo record" #. module: base #: model_terms:ir.actions.act_window,help:base.action_res_bank_form @@ -10675,7 +10833,7 @@ msgstr "Creazione sondaggi e analisi delle risposte" #: model:ir.model.fields,field_description:base.field_ir_actions_server__crud_model_id #: model:ir.model.fields,field_description:base.field_ir_cron__crud_model_id msgid "Create/Write Target Model" -msgstr "Crea/Scrivi Modello Obiettivo" +msgstr "Modello obiettivo di creazione/salvataggio" #. module: base #: model_terms:ir.ui.view,arch_db:base.module_form @@ -10856,7 +11014,7 @@ msgstr "Fido Accordato" #. module: base #: model:ir.module.module,summary:base.module_pos_mercury msgid "Credit card support for Point Of Sale" -msgstr "Supporto per carte di credito per il Punto Vendita" +msgstr "Supporto per carta di credito nel punto vendita" #. module: base #: model:ir.module.module,shortdesc:base.module_crm_phone_validation @@ -11014,7 +11172,7 @@ msgstr "Posizione del Nome del Cliente" #: model:ir.module.module,shortdesc:base.module_portal #: model:ir.module.module,summary:base.module_portal msgid "Customer Portal" -msgstr "Portale Clienti" +msgstr "Portale clienti" #. module: base #: model:ir.module.module,shortdesc:base.module_rating @@ -11102,7 +11260,7 @@ msgstr "Dati per i test di conversione XML" #. module: base #: model_terms:ir.ui.view,arch_db:base.view_server_action_form msgid "Data to Write" -msgstr "Dati da Inserire" +msgstr "Dati da salvare" #. module: base #: model_terms:ir.ui.view,arch_db:base.ir_logging_search_view @@ -11131,7 +11289,7 @@ msgstr "Nome del Database" #. module: base #: model:ir.ui.menu,name:base.next_id_9 msgid "Database Structure" -msgstr "Struttura Database" +msgstr "Struttura database" #. module: base #: code:addons/models.py:2916 @@ -11767,7 +11925,7 @@ msgstr "" #: code:addons/base/models/ir_model.py:1231 #, python-format msgid "Document model" -msgstr "Modello Documento" +msgstr "Modello documento" #. module: base #: model:ir.module.module,shortdesc:base.module_test_documentation_examples @@ -11914,7 +12072,7 @@ msgstr "" #. module: base #: model:ir.module.module,shortdesc:base.module_hw_escpos msgid "ESC/POS Hardware Driver" -msgstr "Driver Hardware ESC/POS " +msgstr "Driver hardware ESC/POS" #. module: base #: model:ir.module.module,shortdesc:base.module_l10n_eu_service @@ -12068,7 +12226,7 @@ msgstr "Impiegato" #. module: base #: model:ir.module.module,shortdesc:base.module_hr_contract msgid "Employee Contracts" -msgstr "Contratti Dipendente" +msgstr "Contratti dipendente" #. module: base #: model:ir.actions.act_window,name:base.action_partner_employee_form @@ -12217,7 +12375,7 @@ msgstr "Eventi" #. module: base #: model:ir.module.module,shortdesc:base.module_event msgid "Events Organization" -msgstr "Organizzazione Eventi" +msgstr "Organizzazione eventi" #. module: base #: model:ir.module.module,shortdesc:base.module_event_enterprise @@ -12227,7 +12385,7 @@ msgstr "" #. module: base #: model:ir.module.module,shortdesc:base.module_event_sale msgid "Events Sales" -msgstr "Vendite Eventi" +msgstr "Vendite eventi" #. module: base #: model_terms:ir.ui.view,arch_db:base.view_server_action_form @@ -12286,12 +12444,12 @@ msgstr "Eseguire Ogni" #. module: base #: selection:ir.actions.server,state:0 msgid "Execute Python Code" -msgstr "Eseguire Codice Python" +msgstr "Eseguire codice Python" #. module: base #: selection:ir.actions.server,state:0 msgid "Execute several actions" -msgstr "Esegui diverse azioni" +msgstr "Eseguire alcune azioni" #. module: base #: model_terms:ir.ui.view,arch_db:base.ir_cron_view_search @@ -12415,13 +12573,13 @@ msgstr "" #: model:ir.model.fields,field_description:base.field_ir_ui_view__xml_id #: model_terms:ir.ui.view,arch_db:base.view_window_action_form msgid "External ID" -msgstr "ID Esterno" +msgstr "ID esterno" #. module: base #: model:ir.model.fields,field_description:base.field_ir_model_data__name #: model_terms:ir.ui.view,arch_db:base.view_model_data_search msgid "External Identifier" -msgstr "Identificatore Esterno" +msgstr "Identificatore esterno" #. module: base #: model:ir.actions.act_window,name:base.action_model_data @@ -12430,7 +12588,7 @@ msgstr "Identificatore Esterno" #: model_terms:ir.ui.view,arch_db:base.view_model_data_list #: model_terms:ir.ui.view,arch_db:base.view_model_data_search msgid "External Identifiers" -msgstr "Identificatori Esterni" +msgstr "Identificatori esterni" #. module: base #: model:ir.model.fields,help:base.field_ir_model_data__name @@ -12665,7 +12823,7 @@ msgstr "Fax" #: model:ir.model.fields,field_description:base.field_res_bank__state #: model:ir.model.fields,field_description:base.field_res_company__state_id msgid "Fed. State" -msgstr "Stato fed." +msgstr "Provincia" #. module: base #: model:ir.actions.act_window,name:base.action_country_state @@ -12888,7 +13046,7 @@ msgstr "File" #. module: base #: model:ir.model.fields,field_description:base.field_ir_attachment__datas msgid "File Content" -msgstr "Contenuto File" +msgstr "Contenuto file" #. module: base #: model:ir.model.fields,field_description:base.field_base_language_export__format @@ -13498,7 +13656,7 @@ msgstr "Vai al pannello di configurazione" #. module: base #: model:ir.module.module,shortdesc:base.module_google_calendar msgid "Google Calendar" -msgstr "Google Calendar" +msgstr "Calendario Google" #. module: base #: model:ir.module.module,description:base.module_google_calendar @@ -13565,12 +13723,12 @@ msgstr "Integrazione Google Drive™" #. module: base #: model:ir.module.module,shortdesc:base.module_website_google_map msgid "Google Maps" -msgstr "Google Maps" +msgstr "Mappe Google" #. module: base #: model:ir.module.module,shortdesc:base.module_google_spreadsheet msgid "Google Spreadsheet" -msgstr "Fogli di Calcolo Google" +msgstr "Foglio di calcolo Google" #. module: base #: model:ir.module.module,shortdesc:base.module_google_account @@ -13779,27 +13937,27 @@ msgstr "Gestione ordini mensa dei dipendenti" #. module: base #: model:ir.module.module,summary:base.module_hw_scanner msgid "Hardware Driver for Barcode Scanners" -msgstr "Driver Hardware per la Lettura di Codici a Barre" +msgstr "Driver hardware per lettori barcode" #. module: base #: model:ir.module.module,summary:base.module_hw_blackbox_be msgid "Hardware Driver for Belgian Fiscal Data Modules" -msgstr "Driver Hardware per i Moduli di Dati Fiscali Belghi" +msgstr "Driver hardware per i moduli dei dati fiscali belgi" #. module: base #: model:ir.module.module,summary:base.module_hw_escpos msgid "Hardware Driver for ESC/POS Printers and Cashdrawers" -msgstr "Driver hardware per Stampanti ESC/POS e Registratori di cassa" +msgstr "Driver hardware per stampanti ESC/POS e registratori di cassa" #. module: base #: model:ir.module.module,summary:base.module_hw_scale msgid "Hardware Driver for Weighing Scales" -msgstr "Driver Hardware per Bilance" +msgstr "Driver hardware per bilance" #. module: base #: model:ir.module.category,name:base.module_category_hardware_drivers msgid "Hardware Drivers" -msgstr "Driver Hardware" +msgstr "Driver hardware" #. module: base #: model:ir.module.module,shortdesc:base.module_hw_drivers @@ -14033,7 +14191,7 @@ msgstr "Santa Sede (Stato della Città del Vaticano)" #. module: base #: model:ir.model.fields,field_description:base.field_res_users__action_id msgid "Home Action" -msgstr "Azione Home" +msgstr "Azione pagina iniziale" #. module: base #: model:ir.actions.act_url,name:base.action_open_website @@ -14259,7 +14417,7 @@ msgstr "" #. module: base #: model:ir.module.category,name:base.module_category_iot msgid "IOT" -msgstr "" +msgstr "IOT" #. module: base #: model:ir.model.fields,field_description:base.field_base_language_import__code @@ -14371,8 +14529,8 @@ msgid "" "If specified, this action will be opened at log on for this user, in " "addition to the standard menu." msgstr "" -"Se specificato, questa azione sarà aperta all'accesso di questo utente, in " -"aggiunta al menu standard." +"Se specificata, questa azione verrà resa disponibile all'utente dopo " +"l'accesso in aggiunta al menù standard." #. module: base #: model:ir.model.fields,help:base.field_ir_ui_view__groups_id @@ -14586,7 +14744,7 @@ msgstr "Inattivo" #. module: base #: model_terms:ir.ui.view,arch_db:base.view_users_search msgid "Inactive Users" -msgstr "Utenti Inattivi" +msgstr "Utenti inattivi" #. module: base #: model:ir.model.fields,field_description:base.field_ir_model_fields__index @@ -14683,7 +14841,7 @@ msgstr "Ereditato" #. module: base #: model:ir.model.fields,field_description:base.field_ir_ui_view__inherit_id msgid "Inherited View" -msgstr "Vista Collegata" +msgstr "Vista ereditata" #. module: base #: model_terms:ir.ui.view,arch_db:base.view_view_form @@ -14747,7 +14905,7 @@ msgstr "Installazione lingua" #. module: base #: model:ir.actions.server,name:base.action_server_module_immediate_install msgid "Install Modules" -msgstr "" +msgstr "Installare moduli" #. module: base #: selection:ir.module.module,state:0 @@ -14827,7 +14985,7 @@ msgstr "Gruppi Interni" #. module: base #: model_terms:ir.ui.view,arch_db:base.view_partner_form msgid "Internal Notes" -msgstr "Note interne" +msgstr "Appunti" #. module: base #: model:ir.model.fields,field_description:base.field_res_partner__ref @@ -14843,12 +15001,12 @@ msgstr "Fonte Interna" #. module: base #: model:res.groups,name:base.group_user msgid "Internal User" -msgstr "" +msgstr "Utente interno" #. module: base #: model_terms:ir.ui.view,arch_db:base.view_users_search msgid "Internal Users" -msgstr "Utenti Interni" +msgstr "Utenti interni" #. module: base #: model_terms:ir.ui.view,arch_db:base.view_partner_form @@ -15048,7 +15206,7 @@ msgstr "Gestione fatturazione" #. module: base #: model:ir.module.module,shortdesc:base.module_hw_posbox_homepage msgid "IoT Box Homepage" -msgstr "" +msgstr "Pagina principale box IoT" #. module: base #: model:ir.module.module,shortdesc:base.module_quality_mrp_iot @@ -15787,13 +15945,13 @@ msgstr "Link Tracker" #. module: base #: model:ir.module.module,summary:base.module_pos_sale msgid "Link module between Point of Sale and Sales" -msgstr "Modulo di collegamento tra il Punto di Vendita e le Vendite" +msgstr "Modulo di collegamento tra il punto vendita e le vendite" #. module: base #: model:ir.model.fields,field_description:base.field_ir_actions_server__link_field_id #: model:ir.model.fields,field_description:base.field_ir_cron__link_field_id msgid "Link using field" -msgstr "Link che usa un campo" +msgstr "Campo usato dal collegamento" #. module: base #: model:ir.module.module,summary:base.module_pos_iot @@ -16202,7 +16360,7 @@ msgstr "" #. module: base #: model:ir.module.module,summary:base.module_hr_payroll msgid "Manage your employee payroll records" -msgstr "Gestisci i documenti delle retribuzioni dei dipendenti" +msgstr "Gestione dei libri paga dei dipendenti" #. module: base #: model:ir.module.module,summary:base.module_fleet @@ -16248,7 +16406,7 @@ msgstr "Il Many2one %s sul modello %s non esiste!" #: model_terms:ir.ui.view,arch_db:base.view_model_relation_form #: model_terms:ir.ui.view,arch_db:base.view_model_relation_list msgid "ManyToMany Relations" -msgstr "Relazioni MoltiAMolti" +msgstr "Relazioni molti a molti" #. module: base #: model:ir.module.module,shortdesc:base.module_product_margin @@ -16398,7 +16556,7 @@ msgstr "Menu" #: model:ir.actions.act_window,name:base.grant_menu_access #: model:ir.ui.menu,name:base.menu_grant_menu_access msgid "Menu Items" -msgstr "Elementi del Menu" +msgstr "Voci di menù" #. module: base #: model:ir.model.fields,field_description:base.field_wizard_ir_model_menu_create__name @@ -16414,12 +16572,12 @@ msgstr "Menu" #. module: base #: model_terms:ir.ui.view,arch_db:base.view_users_form msgid "Menus Customization" -msgstr "Personalizzazione Menu" +msgstr "Personalizzazione menù" #. module: base #: model:ir.module.module,shortdesc:base.module_pos_mercury msgid "Mercury Payment Services" -msgstr "Servizio pagamento Mercury " +msgstr "Servizi di pagamento Mercury " #. module: base #: model_terms:ir.ui.view,arch_db:base.base_partner_merge_automatic_wizard_form @@ -16465,7 +16623,7 @@ msgstr "Messaggio" #. module: base #: model_terms:ir.ui.view,arch_db:base.view_users_form msgid "Messaging and Social" -msgstr "Messagi e Social" +msgstr "Messaggistica e social" #. module: base #: code:addons/base/models/res_config.py:548 @@ -16640,13 +16798,13 @@ msgstr "" #: model_terms:ir.ui.view,arch_db:base.view_model_constraint_form #: model_terms:ir.ui.view,arch_db:base.view_model_constraint_list msgid "Model Constraints" -msgstr "Vincoli del Modello" +msgstr "Vincoli modello" #. module: base #: model:ir.model,name:base.model_ir_model_data #: model:ir.model.fields,field_description:base.field_ir_ui_view__model_data_id msgid "Model Data" -msgstr "Data Modello" +msgstr "Dati modello" #. module: base #: model:ir.model.fields,field_description:base.field_ir_actions_server__crud_model_name @@ -16701,7 +16859,7 @@ msgstr "Modello non trovato: %(model)s" #: model:ir.model.fields,help:base.field_ir_actions_server__model_id #: model:ir.model.fields,help:base.field_ir_cron__model_id msgid "Model on which the server action runs." -msgstr "Modello su cui viene eseguita l'azione del server." +msgstr "Modello sul quale viene eseguita l'azione server." #. module: base #: model:ir.actions.act_window,name:base.action_model_model @@ -16865,17 +17023,17 @@ msgstr "Dott.ssa" #: model_terms:ir.ui.view,arch_db:base.view_users_form #: model:res.groups,name:base.group_multi_company msgid "Multi Companies" -msgstr "Multi Aziende" +msgstr "Multi azienda" #. module: base #: model:res.groups,name:base.group_multi_currency msgid "Multi Currencies" -msgstr "Multi Valuta" +msgstr "Multi valuta" #. module: base #: model:ir.module.module,shortdesc:base.module_l10n_multilang msgid "Multi Language Chart of Accounts" -msgstr "Piano dei Conti Multilingua" +msgstr "Piano dei conti multilingua" #. module: base #: model_terms:ir.ui.view,arch_db:base.view_res_partner_filter @@ -17086,7 +17244,7 @@ msgstr "Nessun Record Trovato" #: code:addons/models.py:1425 #, python-format msgid "No default view of type '%s' could be found !" -msgstr "Non è stato trovata alcuna vista predefinita di tipo '%s' !" +msgstr "Impossibile trovare una vista predefinita di tipo \"%s\"." #. module: base #: selection:ir.sequence,implementation:0 @@ -19123,8 +19281,8 @@ msgstr "" msgid "" "Only users with the following access level are currently allowed to do that" msgstr "" -"Solamente gli utenti con il seguente grado di accesso sono abilitati a fare " -"questo" +"Al momento l'operazione è consentita solo agli utenti con il seguente grado " +"di accesso" #. module: base #: model_terms:ir.ui.view,arch_db:base.demo_force_install_form @@ -19597,7 +19755,7 @@ msgstr "Panama - Contabilità" #: model:ir.model.fields,field_description:base.field_ir_actions_report__paperformat_id #: model:ir.ui.menu,name:base.paper_format_menuitem msgid "Paper Format" -msgstr "Formato Carta" +msgstr "Formato carta" #. module: base #: model:ir.model,name:base.model_report_paperformat @@ -19607,7 +19765,7 @@ msgstr "" #. module: base #: model:ir.actions.act_window,name:base.paper_format_action msgid "Paper Format General Configuration" -msgstr "Configurazione generale formato carta" +msgstr "Configurazione generale del formato carta" #. module: base #: model:ir.model.fields,field_description:base.field_res_company__paperformat_id @@ -19982,7 +20140,7 @@ msgstr "Sconti punto vendita" #. module: base #: model:ir.module.module,shortdesc:base.module_pos_reprint msgid "Point of Sale Receipt Reprinting" -msgstr "Ristampa Ricevute Punto Vendita" +msgstr "Ristampa ricevuta del punto vendita" #. module: base #: model:res.country,name:base.pl @@ -20106,7 +20264,7 @@ msgstr "" #. module: base #: model:ir.model.fields,field_description:base.field_ir_actions_report__print_report_name msgid "Printed Report Name" -msgstr "Nome del Report Stampato" +msgstr "Nome resoconto stampato" #. module: base #: model:ir.model.fields,field_description:base.field_ir_cron__priority @@ -20117,7 +20275,7 @@ msgstr "Priorità" #. module: base #: selection:res.partner,type:0 msgid "Private Address" -msgstr "Indirizzo Privato" +msgstr "Indirizzo privato" #. module: base #: model_terms:ir.ui.view,arch_db:base.res_partner_view_form_private @@ -20383,7 +20541,7 @@ msgstr "" #. module: base #: model:ir.module.module,summary:base.module_hw_screen msgid "Provides support for customer facing displays" -msgstr "Fornisce un supporto per i display rivolti ai clienti" +msgstr "Fornisce il supporto per schermi lato cliente" #. module: base #: model:res.groups,name:base.group_public @@ -20502,12 +20660,12 @@ msgstr "Q ATTIVITÀ RELATIVE ALLA SALUTE UMANA E AL LAVORO SOCIALE" #: model_terms:ir.ui.view,arch_db:base.view_view_search #: selection:ir.ui.view,type:0 msgid "QWeb" -msgstr "QWeb" +msgstr "Qweb" #. module: base #: model_terms:ir.ui.view,arch_db:base.act_report_xml_view msgid "QWeb views" -msgstr "" +msgstr "Viste qweb" #. module: base #: model:res.country,name:base.qa @@ -20827,12 +20985,12 @@ msgstr "" #. module: base #: model:ir.model.fields,field_description:base.field_res_users__partner_id msgid "Related Partner" -msgstr "Partner Correlato" +msgstr "Partner collegato" #. module: base #: model:ir.model.fields,field_description:base.field_ir_server_object_lines__server_id msgid "Related Server Action" -msgstr "Azione del Server correlata" +msgstr "Azione server collegata" #. module: base #: model:ir.model.fields,field_description:base.field_ir_model_fields__related_field_id @@ -20906,7 +21064,7 @@ msgstr "Rimuovere un'Azione Contestuale" #. module: base #: model_terms:ir.ui.view,arch_db:base.act_report_xml_view msgid "Remove from the 'Print' menu" -msgstr "Rimuovi dal menu 'Stampa'" +msgstr "Rimuovi dal menù \"Stampa\"" #. module: base #: model_terms:ir.ui.view,arch_db:base.act_report_xml_view @@ -20944,7 +21102,7 @@ msgstr "Ripeti ogni x." #: model_terms:ir.ui.view,arch_db:base.act_report_xml_search_view #: model_terms:ir.ui.view,arch_db:base.act_report_xml_view msgid "Report" -msgstr "Report" +msgstr "Resoconto" #. module: base #: model:ir.model,name:base.model_ir_actions_report @@ -20959,33 +21117,33 @@ msgstr "File report" #. module: base #: model:ir.model.fields,field_description:base.field_res_company__report_footer msgid "Report Footer" -msgstr "Piè di pagina del Report" +msgstr "Piè di pagina resoconto" #. module: base #: model_terms:ir.ui.view,arch_db:base.act_report_xml_search_view msgid "Report Model" -msgstr "Modello di Report" +msgstr "Modello resoconto" #. module: base #: model:ir.model.fields,field_description:base.field_ir_actions_report__report_type #: model_terms:ir.ui.view,arch_db:base.act_report_xml_search_view msgid "Report Type" -msgstr "Tipo Report" +msgstr "Tipo resoconto" #. module: base #: model_terms:ir.ui.view,arch_db:base.act_report_xml_search_view msgid "Report Xml" -msgstr "Report XML" +msgstr "Resoconto XML" #. module: base #: model_terms:ir.ui.view,arch_db:base.act_report_xml_view_tree msgid "Report xml" -msgstr "Report XML" +msgstr "Resoconto XML" #. module: base #: model:ir.ui.menu,name:base.reporting_menuitem msgid "Reporting" -msgstr "Report" +msgstr "Resoconti" #. module: base #: model:ir.actions.act_window,name:base.ir_action_report @@ -20994,7 +21152,7 @@ msgstr "Report" #: model:ir.ui.menu,name:base.menu_ir_action_report #: model:ir.ui.menu,name:base.reports_menuitem msgid "Reports" -msgstr "Report" +msgstr "Resoconti" #. module: base #: model:ir.model.fields,field_description:base.field_ir_model_fields__required @@ -21392,7 +21550,7 @@ msgstr "Salva e Stampa" #. module: base #: model:ir.model.fields,field_description:base.field_ir_actions_report__attachment msgid "Save as Attachment Prefix" -msgstr "Salva come prefisso per allegato" +msgstr "Salva come prefisso allegato" #. module: base #: model:ir.module.module,summary:base.module_mrp_maintenance @@ -21721,7 +21879,7 @@ msgstr "Server" #: model_terms:ir.ui.view,arch_db:base.view_server_action_form #: model_terms:ir.ui.view,arch_db:base.view_server_action_search msgid "Server Action" -msgstr "Azione Server" +msgstr "Azione server" #. module: base #: model:ir.model,name:base.model_ir_server_object_lines @@ -21740,7 +21898,7 @@ msgstr "Azioni server" #. module: base #: model:ir.model.fields,field_description:base.field_ir_cron__ir_actions_server_id msgid "Server action" -msgstr "Azione del Server" +msgstr "Azione server" #. module: base #: model:res.partner.category,name:base.res_partner_category_11 @@ -21864,7 +22022,7 @@ msgstr "Mostrare moduli tecnici" #. module: base #: model:ir.module.module,summary:base.module_website_google_map msgid "Show your company address on Google Maps" -msgstr "" +msgstr "Mostra l'indirizzo aziendale sulle mappe di Google" #. module: base #: model:res.country,name:base.sl @@ -22010,25 +22168,25 @@ msgstr "Talvolta chiamato BIC o Swift." #: code:addons/base/models/ir_model.py:1222 #, python-format msgid "Sorry, you are not allowed to access this document." -msgstr "Spiacente, non sei autorizzato ad accedere a questo documento." +msgstr "Manca l'autorizzazione per accedere a questo documento." #. module: base #: code:addons/base/models/ir_model.py:1224 #, python-format msgid "Sorry, you are not allowed to create this kind of document." -msgstr "Spiacente, non sei autorizzato a creare questo tipo di documento." +msgstr "Manca l'autorizzazione per creare questo tipo di documento." #. module: base #: code:addons/base/models/ir_model.py:1225 #, python-format msgid "Sorry, you are not allowed to delete this document." -msgstr "Spiacente, non sei autorizzato a cancellare questo documento." +msgstr "Manca l'autorizzazione per eliminare questo documento." #. module: base #: code:addons/base/models/ir_model.py:1223 #, python-format msgid "Sorry, you are not allowed to modify this document." -msgstr "Spiacente, non sei autorizzato a modificare questo documento." +msgstr "Manca l'autorizzazione per modificare questo documento." #. module: base #: model:ir.model.fields,field_description:base.field_ir_filters__sort @@ -22161,7 +22319,7 @@ msgstr "Inizia configurazione" #: model_terms:ir.ui.view,arch_db:base.view_partner_short_form #: model_terms:ir.ui.view,arch_db:base.view_res_bank_form msgid "State" -msgstr "Stato" +msgstr "Provincia" #. module: base #: model:ir.model.fields,field_description:base.field_res_country_state__code @@ -22171,7 +22329,7 @@ msgstr "Codice" #. module: base #: model:ir.model.fields,field_description:base.field_res_country_state__name msgid "State Name" -msgstr "Nome stato" +msgstr "Nome provincia" #. module: base #: model:res.country,name:base.ps @@ -22502,12 +22660,12 @@ msgstr "Nome Tag" #: model:ir.model.fields,field_description:base.field_res_partner__category_id #: model:ir.model.fields,field_description:base.field_res_users__category_id msgid "Tags" -msgstr "Tags" +msgstr "Tag" #. module: base #: model_terms:ir.ui.view,arch_db:base.view_partner_form msgid "Tags..." -msgstr "tags..." +msgstr "tag..." #. module: base #: model:res.country,name:base.tw @@ -22533,7 +22691,7 @@ msgstr "Finestra di Destinazione" #. module: base #: model:ir.module.module,shortdesc:base.module_hr_timesheet msgid "Task Logs" -msgstr "" +msgstr "Registri attività" #. module: base #: model:ir.model.fields,field_description:base.field_res_company__vat @@ -22579,7 +22737,7 @@ msgstr "Nome tecnico" #: model:ir.module.category,name:base.module_category_hidden #: model:ir.module.category,name:base.module_category_technical_settings msgid "Technical Settings" -msgstr "Configurazioni Tecniche" +msgstr "Impostazioni tecniche" #. module: base #: code:addons/base/models/ir_translation.py:782 @@ -22590,7 +22748,7 @@ msgstr "Traduzioni tecniche" #. module: base #: model:ir.actions.report,name:base.ir_module_reference_print msgid "Technical guide" -msgstr "Guida Tecnica" +msgstr "Guida tecnica" #. module: base #: model_terms:ir.ui.view,arch_db:base.view_company_document_template_form @@ -22770,7 +22928,7 @@ msgstr "Il codice della lingua deve essere unico !" #. module: base #: sql_constraint:res.country.state:0 msgid "The code of the state must be unique by country !" -msgstr "Il codice dello stato deve essere univoco per nazione." +msgstr "Il codice della provincia deve essere univoco per nazione." #. module: base #: sql_constraint:res.company:0 @@ -23122,7 +23280,7 @@ msgstr "" #. module: base #: model:ir.model.fields,help:base.field_res_country_state__code msgid "The state code." -msgstr "Il codice Stato." +msgstr "Il codice provincia." #. module: base #: code:addons/base/models/ir_model.py:531 @@ -23323,7 +23481,7 @@ msgstr "Questo modulo causerà la disinstallazione dei seguenti moduli:" #. module: base #: model:ir.model.fields,field_description:base.field_res_lang__thousands_sep msgid "Thousands Separator" -msgstr "Separatore Migliaia" +msgstr "Separatore migliaia" #. module: base #: model:ir.model.fields,field_description:base.field_ir_attachment__thumbnail @@ -23348,7 +23506,7 @@ msgstr "Creazione di Biglietti, Assistenza, Diapositive" #. module: base #: model:ir.model.fields,field_description:base.field_res_lang__time_format msgid "Time Format" -msgstr "Formato Ora" +msgstr "Formato ora" #. module: base #: model:ir.module.module,summary:base.module_timesheet_grid @@ -23374,7 +23532,7 @@ msgstr "Fogli ore" #. module: base #: model:ir.module.module,shortdesc:base.module_hr_timesheet_attendance msgid "Timesheets/attendances reporting" -msgstr "Rendicontazione presenze/fogli ore" +msgstr "Resoconto presenze/fogli ore" #. module: base #: model:ir.model.fields,field_description:base.field_res_partner__tz @@ -23414,7 +23572,7 @@ msgstr "Da fare" #. module: base #: selection:ir.translation,state:0 msgid "To Translate" -msgstr "Da Tradurre" +msgstr "Da tradurre" #. module: base #: selection:ir.module.module,state:0 @@ -23478,7 +23636,7 @@ msgstr "" #. module: base #: model:ir.module.category,name:base.module_category_tool msgid "Tool" -msgstr "" +msgstr "Strumento" #. module: base #: model:ir.module.category,name:base.module_category_tools @@ -23508,7 +23666,7 @@ msgstr "Gestione delle presenze dei dipendenti" #. module: base #: model:ir.module.module,summary:base.module_hr_timesheet msgid "Track employee time on tasks" -msgstr "Gestione tempi del dipendente per le attività" +msgstr "Monitora i tempi attività del dipendente" #. module: base #: model:ir.module.module,summary:base.module_maintenance @@ -23533,7 +23691,7 @@ msgstr "Gestione dei canali di reclutamento" #. module: base #: model:ir.module.module,summary:base.module_event msgid "Trainings, Conferences, Meetings, Exhibitions, Registrations" -msgstr "Formazioni, Conferenze, Riunioni, Esposizioni, Iscrizioni" +msgstr "Corsi, conferenze, riunioni, esposizioni, Iscrizioni" #. module: base #: model:ir.module.module,description:base.module_payment_transfer @@ -23602,7 +23760,7 @@ msgstr "Termini tradotti" #. module: base #: model:ir.model.fields,field_description:base.field_ir_translation__name msgid "Translated field" -msgstr "Campi tradotti" +msgstr "Campo tradotto" #. module: base #: model:ir.model,name:base.model_ir_translation @@ -23613,7 +23771,7 @@ msgstr "Traduzione" #. module: base #: model:ir.model.fields,field_description:base.field_ir_translation__value msgid "Translation Value" -msgstr "Valore Traduzione" +msgstr "Valore traduzione" #. module: base #: model:ir.model.fields,field_description:base.field_ir_translation__comments @@ -23632,7 +23790,7 @@ msgstr "" #. module: base #: selection:ir.translation,state:0 msgid "Translation in Progress" -msgstr "Traduzione in corso" +msgstr "Traduzione in corso..." #. module: base #: code:addons/base/models/ir_translation.py:572 @@ -23664,7 +23822,7 @@ msgstr "Trasporto" #: model_terms:ir.ui.view,arch_db:base.view_view_search #: selection:ir.ui.view,type:0 msgid "Tree" -msgstr "Struttura ad Albero" +msgstr "Albero" #. module: base #: model:res.country,name:base.tt @@ -23771,7 +23929,7 @@ msgstr "" #: model:ir.model.fields,help:base.field_ir_model_constraint__type msgid "" "Type of the constraint: `f` for a foreign key, `u` for other constraints." -msgstr "Tipo di vincolo: `f` per una chiave esterna, `u` per altri vincoli." +msgstr "Tipo di vincolo: \"f\" per una chiave esterna, \"u\" per altri vincoli." #. module: base #: model_terms:ir.ui.view,arch_db:base.report_irmodeloverview @@ -23791,7 +23949,7 @@ msgstr "U.A.E. - Contabilità" #. module: base #: model:ir.module.module,shortdesc:base.module_l10n_uk msgid "UK - Accounting" -msgstr "UK - Contabilità" +msgstr "Regno Unito - Contabilità" #. module: base #: model:ir.module.module,shortdesc:base.module_l10n_uk_reports @@ -23853,7 +24011,7 @@ msgstr "Uganda" #. module: base #: model:ir.model.fields,field_description:base.field_ir_logging__create_uid msgid "Uid" -msgstr "Uid" +msgstr "UID" #. module: base #: model:res.country,name:base.ua @@ -23866,16 +24024,15 @@ msgstr "Ucraina" msgid "" "Unable to delete this document because it is used as a default property" msgstr "" -"Impossibile eliminare questo documento perché è usato come una proprietà " -"predefinita" +"Impossibile eliminare questo documento, è usato come proprietà predefinita" #. module: base #: code:addons/base/models/ir_actions_report.py:663 #, python-format msgid "Unable to find Wkhtmltopdf on this system. The PDF can not be created." msgstr "" -"Impossibile trovare Wkhtmltopdf su questo sistema. Il file PDF non può " -"essere creato." +"Impossibile trovare wkhtmltopdf nel sistema, il file PDF non può essere " +"creato." #. module: base #: code:addons/base/models/ir_module.py:336 @@ -23894,8 +24051,8 @@ msgid "" "Unable to process module \"%s\" because an external dependency is not met: " "%s" msgstr "" -"Impossibile processare il modulo \"%s\" perchè una dipendenza esterna non è " -"stata trovata: %s" +"Impossibile elaborare il modulo \"%s\", non è soddisfatta una dipendenza " +"esterna: %s" #. module: base #: code:addons/base/models/ir_module.py:338 @@ -23962,7 +24119,7 @@ msgstr "Spedizioni USPS (United States Postal Service)" #. module: base #: model:ir.module.module,shortdesc:base.module_uom msgid "Units of measure" -msgstr "" +msgstr "Unità di misura" #. module: base #: model:ir.model,name:base.model__unknown @@ -24052,7 +24209,7 @@ msgstr "Data di aggiornamento" #. module: base #: model_terms:ir.ui.view,arch_db:base.res_lang_tree msgid "Update Language Terms" -msgstr "Aggiornare le Traduzioni" +msgstr "Aggiorna i termini della lingua" #. module: base #: model:ir.model,name:base.model_base_module_update @@ -24067,7 +24224,7 @@ msgstr "Aggiorna elenco moduli" #. module: base #: model_terms:ir.ui.view,arch_db:base.res_lang_tree msgid "Update Terms" -msgstr "Aggiorna i termini" +msgstr "Aggiorna termini" #. module: base #: model:ir.model,name:base.model_base_update_translations @@ -24077,7 +24234,7 @@ msgstr "Aggiornamento traduzioni" #. module: base #: selection:ir.actions.server,state:0 msgid "Update the Record" -msgstr "Aggiornare il Record" +msgstr "Aggiornare il record" #. module: base #: model_terms:ir.ui.view,arch_db:base.view_company_report_form @@ -24098,7 +24255,7 @@ msgstr "Aggiornamenti" #: model_terms:ir.ui.view,arch_db:base.module_form #: model_terms:ir.ui.view,arch_db:base.module_view_kanban msgid "Upgrade" -msgstr "Esegui avanzamento" +msgstr "Avanza" #. module: base #: model:ir.model,name:base.model_base_module_upgrade @@ -24108,7 +24265,7 @@ msgstr "Avanzamento modulo" #. module: base #: model:ir.model.fields,field_description:base.field_ir_attachment__url msgid "Url" -msgstr "Url" +msgstr "URL" #. module: base #: model:res.country,name:base.uy @@ -24191,7 +24348,7 @@ msgstr "" #: code:addons/base/models/ir_fields.py:242 #, python-format msgid "Use the format '%s'" -msgstr "Usa il formato '%s'" +msgstr "Usare il formato \"%s\"" #. module: base #: model:ir.model.fields,help:base.field_res_country__vat_label @@ -24257,7 +24414,7 @@ msgstr "Utente" #. module: base #: model:ir.ui.menu,name:base.next_id_2 msgid "User Interface" -msgstr "Interfaccia Utente" +msgstr "Interfaccia utente" #. module: base #: model:ir.model.fields,field_description:base.field_change_password_user__user_login @@ -24269,7 +24426,7 @@ msgstr "Login Utente" #: model_terms:ir.ui.view,arch_db:base.user_groups_view #, python-format msgid "User Type" -msgstr "" +msgstr "Tipo utente" #. module: base #: model:ir.model.fields,field_description:base.field_res_users__log_ids @@ -24279,7 +24436,7 @@ msgstr "" #. module: base #: model:ir.module.category,name:base.module_category_user_type msgid "User types" -msgstr "" +msgstr "Tipologie utente" #. module: base #: model:ir.model,name:base.model_change_password_user @@ -24293,7 +24450,7 @@ msgstr "Utente, procedura di modifica password" #: model_terms:ir.ui.view,arch_db:base.ir_default_search_view #: model_terms:ir.ui.view,arch_db:base.ir_default_tree_view msgid "User-defined Defaults" -msgstr "Valori predefiniti dell'utente" +msgstr "Valori predefiniti utente" #. module: base #: model:ir.actions.act_window,name:base.actions_ir_filters_view @@ -24370,12 +24527,12 @@ msgstr "Uzbekistan" #: model:res.country,vat_label:base.se model:res.country,vat_label:base.si #: model:res.country,vat_label:base.sk model:res.country,vat_label:base.uk msgid "VAT" -msgstr "IVA" +msgstr "Partita IVA" #. module: base #: model:ir.module.module,shortdesc:base.module_base_vat msgid "VAT Number Validation" -msgstr "Validazione P. IVA" +msgstr "Convalida della partita IVA" #. module: base #: model:ir.module.module,shortdesc:base.module_voip @@ -24541,7 +24698,7 @@ msgstr "" #. module: base #: model:ir.model.fields,field_description:base.field_ir_ui_view__name msgid "View Name" -msgstr "Nome Vista" +msgstr "Nome vista" #. module: base #: model:ir.model.fields,field_description:base.field_ir_actions_act_window__view_id @@ -24554,7 +24711,7 @@ msgstr "Rif. Vista" #: model:ir.model.fields,field_description:base.field_ir_ui_view__type #: model_terms:ir.ui.view,arch_db:base.view_window_action_search msgid "View Type" -msgstr "Tipo Vista" +msgstr "Tipo vista" #. module: base #: model:ir.module.module,summary:base.module_account_reports @@ -24564,7 +24721,7 @@ msgstr "Vedi e crea report" #. module: base #: model:ir.model.fields,field_description:base.field_ir_ui_view__mode msgid "View inheritance mode" -msgstr "Modalità di ereditarietà vista" +msgstr "Modo eredità della vista" #. module: base #: model:ir.model.fields,help:base.field_ir_actions_act_window__view_type @@ -24572,8 +24729,8 @@ msgid "" "View type: Tree type to use for the tree view, set to 'tree' for a " "hierarchical tree view, or 'form' for a regular list view" msgstr "" -"Tipo di vista: Tree è usato per le viste elenco, imposta a 'tree' per una " -"vista strutturata (con eredità), oppure 'form' per una lista regolare" +"Tipo vista: tipologia da usare per la vista, impostare \"albero\" per una " +"vista gerarchica, oppure \"modulo\" per una vista a elenco" #. module: base #: code:addons/base/models/ir_model.py:620 @@ -24610,7 +24767,7 @@ msgstr "" #. module: base #: model:ir.model.fields,field_description:base.field_ir_ui_view__inherit_children_ids msgid "Views which inherit from this one" -msgstr "Visualizzazioni che ereditano da questa" +msgstr "Viste che ereditano da questa" #. module: base #: model:res.country,name:base.vg @@ -24824,7 +24981,7 @@ msgstr "Settimane" #. module: base #: model:ir.module.module,shortdesc:base.module_hw_scale msgid "Weighing Scale Hardware Driver" -msgstr "" +msgstr "Driver hardware bilancia" #. module: base #: model:res.country,name:base.eh @@ -24894,7 +25051,7 @@ msgstr "Larghezza" #: model:ir.actions.act_window,name:base.ir_action_window #: model:ir.ui.menu,name:base.menu_ir_action_window msgid "Window Actions" -msgstr "Azioni Finestra" +msgstr "Azioni su finestra" #. module: base #: model:ir.model.fields,field_description:base.field_base_partner_merge_line__wizard_id @@ -25314,7 +25471,7 @@ msgstr "ad esempio, Direttore Vendite" #. module: base #: model_terms:ir.ui.view,arch_db:base.view_server_action_form msgid "e.g. Update order quantity" -msgstr "es. aggiornare la quantità ordini" +msgstr "Es. aggiornare la quantità ordini" #. module: base #: model_terms:ir.ui.view,arch_db:base.view_base_import_language diff --git a/odoo/addons/base/i18n/ja.po b/odoo/addons/base/i18n/ja.po index 839dbdbf6fd..d94e198a862 100644 --- a/odoo/addons/base/i18n/ja.po +++ b/odoo/addons/base/i18n/ja.po @@ -14690,7 +14690,7 @@ msgstr "" #. module: base #: model_terms:ir.ui.view,arch_db:base.onboarding_company_step msgid "Let's start!" -msgstr "" +msgstr "はじめましょう" #. module: base #: selection:report.paperformat,format:0 @@ -20037,7 +20037,7 @@ msgstr "" #. module: base #: model_terms:ir.ui.view,arch_db:base.onboarding_company_step msgid "Set your company's data for documents header/footer." -msgstr "" +msgstr "ドキュメントヘッダ/フッタに会社情報を設定" #. module: base #: model:ir.model.fields,help:base.field_ir_actions_act_url__binding_model_id diff --git a/odoo/addons/base/i18n/nb.po b/odoo/addons/base/i18n/nb.po index 1de246c9e2a..fdefb899443 100644 --- a/odoo/addons/base/i18n/nb.po +++ b/odoo/addons/base/i18n/nb.po @@ -10,6 +10,7 @@ # Andy Schønhaug <odoo@cypodgroup.com>, 2018 # Martin Trigaux, 2018 # Jorunn D. Newth, 2018 +# Marius Stedjan <marius@stedjan.com>, 2018 # msgid "" msgstr "" @@ -17,7 +18,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-11-29 10:24+0000\n" "PO-Revision-Date: 2018-08-24 09:14+0000\n" -"Last-Translator: Jorunn D. Newth, 2018\n" +"Last-Translator: Marius Stedjan <marius@stedjan.com>, 2018\n" "Language-Team: Norwegian Bokmål (https://www.transifex.com/odoo/teams/41243/nb/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -6786,12 +6787,12 @@ msgstr "Apper:" #. module: base #: model:ir.model.fields,field_description:base.field_ir_ui_view__arch_db msgid "Arch Blob" -msgstr "" +msgstr "Arch Blob" #. module: base #: model:ir.model.fields,field_description:base.field_ir_ui_view__arch_fs msgid "Arch Filename" -msgstr "" +msgstr "Arch Filnavn" #. module: base #: model_terms:ir.ui.view,arch_db:base.view_view_form @@ -8358,7 +8359,7 @@ msgstr "" #. module: base #: model:ir.model,name:base.model_res_config_settings msgid "Config Settings" -msgstr "" +msgstr "Konfigurasjonsinnstillinger" #. module: base #: model_terms:ir.ui.view,arch_db:base.config_wizard_step_view_form @@ -9954,7 +9955,7 @@ msgstr "Dropshipping" #. module: base #: model_terms:ir.ui.view,arch_db:base.module_view_kanban msgid "Dropdown menu" -msgstr "" +msgstr "Nedtrekksmeny" #. module: base #: code:addons/base/models/res_company.py:18 @@ -11803,7 +11804,7 @@ msgstr "HTML" #. module: base #: model:ir.model,name:base.model_ir_http msgid "HTTP Routing" -msgstr "" +msgstr "HTTP-ruting" #. module: base #: model:res.country,name:base.ht @@ -12413,6 +12414,9 @@ msgid "" "* if False, the view currently does not extend its parent but can be enabled\n" " " msgstr "" +"Hvis denne visningen er arvet,\n" +"* hvis Sann, vil visningen alltid utvide sin overordnede visning\n" +"* hvis Sann, vil visningen ikke utvide sin overordnede visning, men kan skrus på" #. module: base #: model_terms:ir.ui.view,arch_db:base.view_rule_form @@ -17059,7 +17063,7 @@ msgstr "Overordnet meny" #: model:ir.model.fields,field_description:base.field_ir_ui_menu__parent_path #: model:ir.model.fields,field_description:base.field_res_partner_category__parent_path msgid "Parent Path" -msgstr "" +msgstr "Overordnet sti" #. module: base #: model:ir.model.fields,field_description:base.field_res_partner__parent_name @@ -17880,12 +17884,12 @@ msgstr "" #. module: base #: model:ir.model,name:base.model_ir_qweb msgid "Qweb" -msgstr "" +msgstr "Qweb" #. module: base #: model:ir.model,name:base.model_ir_qweb_field msgid "Qweb Field" -msgstr "" +msgstr "Qweb-felt" #. module: base #: model:ir.model,name:base.model_ir_qweb_field_barcode @@ -17895,27 +17899,27 @@ msgstr "" #. module: base #: model:ir.model,name:base.model_ir_qweb_field_contact msgid "Qweb Field Contact" -msgstr "" +msgstr "Qweb-felt Kontakt" #. module: base #: model:ir.model,name:base.model_ir_qweb_field_date msgid "Qweb Field Date" -msgstr "" +msgstr "Qweb-felt Dato" #. module: base #: model:ir.model,name:base.model_ir_qweb_field_datetime msgid "Qweb Field Datetime" -msgstr "" +msgstr "Qweb-felt Datotid" #. module: base #: model:ir.model,name:base.model_ir_qweb_field_duration msgid "Qweb Field Duration" -msgstr "" +msgstr "Qweb-felt Varighet" #. module: base #: model:ir.model,name:base.model_ir_qweb_field_float msgid "Qweb Field Float" -msgstr "" +msgstr "Qweb-felt Flyttall" #. module: base #: model:ir.model,name:base.model_ir_qweb_field_float_time @@ -17925,47 +17929,47 @@ msgstr "" #. module: base #: model:ir.model,name:base.model_ir_qweb_field_html msgid "Qweb Field HTML" -msgstr "" +msgstr "Qweb-felt HTML" #. module: base #: model:ir.model,name:base.model_ir_qweb_field_image msgid "Qweb Field Image" -msgstr "" +msgstr "Qweb Felt-bilde" #. module: base #: model:ir.model,name:base.model_ir_qweb_field_integer msgid "Qweb Field Integer" -msgstr "" +msgstr "Qweb-felt Heltall" #. module: base #: model:ir.model,name:base.model_ir_qweb_field_many2one msgid "Qweb Field Many to One" -msgstr "" +msgstr "Qweb-felt Mange til én" #. module: base #: model:ir.model,name:base.model_ir_qweb_field_monetary msgid "Qweb Field Monerary" -msgstr "" +msgstr "Qweb-felt Valuta" #. module: base #: model:ir.model,name:base.model_ir_qweb_field_relative msgid "Qweb Field Relative" -msgstr "" +msgstr "Qweb-felt Relativ" #. module: base #: model:ir.model,name:base.model_ir_qweb_field_selection msgid "Qweb Field Selection" -msgstr "" +msgstr "Qweb-felt Utvalg" #. module: base #: model:ir.model,name:base.model_ir_qweb_field_text msgid "Qweb Field Text" -msgstr "" +msgstr "Qweb-felt Tekst" #. module: base #: model:ir.model,name:base.model_ir_qweb_field_qweb msgid "Qweb Field qweb" -msgstr "" +msgstr "Qweb-felt qweb" #. module: base #: model:ir.model,name:base.model_ir_qweb_field_many2many @@ -21756,7 +21760,7 @@ msgstr "Vis og opprett rapporter" #. module: base #: model:ir.model.fields,field_description:base.field_ir_ui_view__mode msgid "View inheritance mode" -msgstr "" +msgstr "Arve-modus for visning" #. module: base #: model:ir.model.fields,help:base.field_ir_actions_act_window__view_type @@ -21799,7 +21803,7 @@ msgstr "" #. module: base #: model:ir.model.fields,field_description:base.field_ir_ui_view__inherit_children_ids msgid "Views which inherit from this one" -msgstr "" +msgstr "Visninger som arver fra denne" #. module: base #: model:res.country,name:base.vg diff --git a/odoo/addons/base/i18n/nl.po b/odoo/addons/base/i18n/nl.po index 6ee59115fa8..64bc2179d21 100644 --- a/odoo/addons/base/i18n/nl.po +++ b/odoo/addons/base/i18n/nl.po @@ -1772,7 +1772,7 @@ msgid "" " " msgstr "" "\n" -"Maak kassabetalingen met Credit Card mogelijk\n" +"Maak kassabetalingen met Creditcard mogelijk\n" "=============================================\n" "\n" "De module geeft klanten de mogelijkheid om hun bestelling met een creditcart te betalen. De transactie worden verwerkt via Mercury (ontworpen door \n" @@ -21218,7 +21218,7 @@ msgstr "" "\n" "### Automate the registration and payment process\n" "\n" -"Sell registrations to your event with the multi-ticketing feature. Events can be free or for a fee. Attendees can pay online with a credit card or on invoice, based on your configuration.\n" +"Sell registrations to your event with the multi-ticketing feature. Events can be free or for a fee. Attendees can pay online with a creditcard or on invoice, based on your configuration.\n" "\n" "Boost your sales with early-bird prices, special conditions for members, or extra services with multiple tickets.\n" "\n" diff --git a/odoo/addons/base/i18n/pt_BR.po b/odoo/addons/base/i18n/pt_BR.po index 65a6baad358..f66b9db1cc6 100644 --- a/odoo/addons/base/i18n/pt_BR.po +++ b/odoo/addons/base/i18n/pt_BR.po @@ -26,7 +26,8 @@ # Mateus Lopes <mateus1@gmail.com>, 2018 # Yannick Belot <yannickbh@gmail.com>, 2018 # Silmar <pinheirosilmar@gmail.com>, 2018 -# Brenno Martins <emanuel.breno@gmail.com>, 2018 +# Emanuel Martins <emanuel.breno@gmail.com>, 2018 +# Rafael H L Moretti <rafael.moretti@gmail.com>, 2018 # msgid "" msgstr "" @@ -34,7 +35,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-11-29 10:24+0000\n" "PO-Revision-Date: 2018-08-24 09:14+0000\n" -"Last-Translator: Brenno Martins <emanuel.breno@gmail.com>, 2018\n" +"Last-Translator: Rafael H L Moretti <rafael.moretti@gmail.com>, 2018\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/odoo/teams/41243/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -5956,7 +5957,7 @@ msgstr "" #. module: base #: model_terms:ir.ui.view,arch_db:base.res_lang_form msgid "%Y - Year with century.\"" -msgstr "" +msgstr "%Y - Ano com século.\"" #. module: base #: model_terms:ir.ui.view,arch_db:base.res_lang_form @@ -6117,7 +6118,7 @@ msgstr "-Este módulo não exclui nenhum outro módulo." #. module: base #: model_terms:ir.ui.view,arch_db:base.res_lang_form msgid "1. %b, %B ==> Dec, December" -msgstr "" +msgstr "1. %b, %B ==> Dez, Dezembro" #. module: base #: model_terms:ir.ui.view,arch_db:base.res_lang_form @@ -11934,6 +11935,8 @@ msgstr "O campo `%(field_name)s` não existe" msgid "" "Field names can only contain characters, digits and underscores (up to 63)." msgstr "" +"Nomes de campos somente podem conter caracteres, dígitos e subtraços (até " +"63)." #. module: base #: sql_constraint:ir.model.fields:0 @@ -13028,7 +13031,7 @@ msgstr "" #. module: base #: model:ir.module.category,description:base.module_category_hr_expense msgid "Helps you manage your expenses." -msgstr "" +msgstr "Ajuda a gerenciar suas despesas." #. module: base #: model:ir.module.category,description:base.module_category_warehouse_management @@ -21332,6 +21335,8 @@ msgid "" "The model name can only contain lowercase characters, digits, underscores " "and dots." msgstr "" +"O nome do modelo pode conter somente caracteres em caixa baixa, dígitos, " +"subtraços e pontos." #. module: base #: code:addons/base/models/ir_model.py:148 diff --git a/odoo/addons/base/i18n/zh_CN.po b/odoo/addons/base/i18n/zh_CN.po index 018b8c3db6e..9c7bd8fc20e 100644 --- a/odoo/addons/base/i18n/zh_CN.po +++ b/odoo/addons/base/i18n/zh_CN.po @@ -59,6 +59,7 @@ # liAnGjiA <liangjia@qq.com>, 2018 # 卫安琪 <weianqi1991@gmail.com>, 2018 # 广州救火 <7017511@qq.com>, 2018 +# jian liu <lj1989419@gmail.com>, 2018 # msgid "" msgstr "" @@ -66,7 +67,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-11-29 10:24+0000\n" "PO-Revision-Date: 2018-08-24 09:14+0000\n" -"Last-Translator: 广州救火 <7017511@qq.com>, 2018\n" +"Last-Translator: jian liu <lj1989419@gmail.com>, 2018\n" "Language-Team: Chinese (China) (https://www.transifex.com/odoo/teams/41243/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -7754,7 +7755,7 @@ msgstr "<span class=\"o_form_label\">我们提议重载菜单来查看新菜单 #. module: base #: model_terms:ir.ui.view,arch_db:base.demo_force_install_form msgid "<span class=\"text-white text-uppercase\">Danger Zone</span>" -msgstr "" +msgstr "<span class=\"text-white text-uppercase\">危险区域</span>" #. module: base #: model_terms:ir.ui.view,arch_db:base.sequence_view @@ -12287,6 +12288,8 @@ msgid "" "Demo data should only be used on test databases!\n" " Once they are loaded, they cannot be removed!" msgstr "" +"Demo数据仅用于测试数据库\n" +" 一旦这些数据加载，就不能被删除！" #. module: base #: model:ir.model,name:base.model_ir_demo_failure @@ -20654,7 +20657,7 @@ msgstr "只有以下访问等级的用户可才做这" #. module: base #: model_terms:ir.ui.view,arch_db:base.demo_force_install_form msgid "Oops, no!" -msgstr "" +msgstr "哦,不!" #. module: base #: model_terms:ir.ui.view,arch_db:base.view_base_module_update @@ -21561,7 +21564,7 @@ msgstr "请在当前用户上配置电子邮件，以模拟使用该发件服务 msgid "" "Please confirm that you want to <b>irreversibly</b> make this database a " "demo database." -msgstr "" +msgstr "你想让这个数据库成为demo数据库，该操作<b>不可逆</b>，请确认。" #. module: base #: code:addons/base/models/ir_model.py:1231 @@ -26480,7 +26483,7 @@ msgstr "也门" #. module: base #: model_terms:ir.ui.view,arch_db:base.demo_force_install_form msgid "Yes, I understand the risks" -msgstr "" +msgstr "是的，我了解相应风险" #. module: base #: model:ir.module.module,shortdesc:base.module_account_yodlee diff --git a/odoo/addons/base/models/ir_model.py b/odoo/addons/base/models/ir_model.py index 089689a35a2..624a2a32aeb 100644 --- a/odoo/addons/base/models/ir_model.py +++ b/odoo/addons/base/models/ir_model.py @@ -177,12 +177,16 @@ class IrModel(models.Model): def _drop_table(self): for model in self: - table = self.env[model.model]._table - kind = tools.table_kind(self._cr, table) - if kind == 'v': - self._cr.execute('DROP VIEW "%s"' % table) - elif kind == 'r': - self._cr.execute('DROP TABLE "%s" CASCADE' % table) + current_model = self.env.get(model.model) + if current_model is not None: + table = current_model._table + kind = tools.table_kind(self._cr, table) + if kind == 'v': + self._cr.execute('DROP VIEW "%s"' % table) + elif kind == 'r': + self._cr.execute('DROP TABLE "%s" CASCADE' % table) + else: + _logger.warning('The model %s could not be dropped because it did not exist in the registry.', model.model) return True @api.multi @@ -552,14 +556,15 @@ class IrModelFields(models.Model): for field in self: if field.name in models.MAGIC_COLUMNS: continue - model = self.env[field.model] - if tools.column_exists(self._cr, model._table, field.name) and \ + model = self.env.get(field.model) + is_model = model is not None + if is_model and tools.column_exists(self._cr, model._table, field.name) and \ tools.table_kind(self._cr, model._table) == 'r': self._cr.execute('ALTER TABLE "%s" DROP COLUMN "%s" CASCADE' % (model._table, field.name)) if field.state == 'manual' and field.ttype == 'many2many': - rel_name = field.relation_table or model._fields[field.name].relation + rel_name = field.relation_table or (is_model and model._fields[field.name].relation) tables_to_drop.add(rel_name) - if field.state == 'manual': + if field.state == 'manual' and is_model: model._pop_field(field.name) if tables_to_drop: @@ -581,18 +586,19 @@ class IrModelFields(models.Model): """ failed_dependencies = [] for rec in self: - model = self.env[rec.model] - if rec.name in model._fields: - field = model._fields[rec.name] - else: - # field hasn't been loaded (yet?) - continue - for dependant, path in model._field_triggers.get(field, ()): - if dependant.manual: - failed_dependencies.append((field, dependant)) - for inverse in model._field_inverses.get(field, ()): - if inverse.manual and inverse.type == 'one2many': - failed_dependencies.append((field, inverse)) + model = self.env.get(rec.model) + if model is not None: + if rec.name in model._fields: + field = model._fields[rec.name] + else: + # field hasn't been loaded (yet?) + continue + for dependant, path in model._field_triggers.get(field, ()): + if dependant.manual: + failed_dependencies.append((field, dependant)) + for inverse in model._field_inverses.get(field, ()): + if inverse.manual and inverse.type == 'one2many': + failed_dependencies.append((field, inverse)) if not self._context.get(MODULE_UNINSTALL_FLAG) and failed_dependencies: msg = _("The field '%s' cannot be removed because the field '%s' depends on it.") diff --git a/odoo/fields.py b/odoo/fields.py index a69edde187d..a4987c284f7 100644 --- a/odoo/fields.py +++ b/odoo/fields.py @@ -2553,6 +2553,8 @@ class Many2many(_RelationalMulti): self.column2 = '%s_id' % comodel._table # check validity of table name check_pg_name(self.relation) + else: + self.relation = self.column1 = self.column2 = None def _setup_regular_full(self, model): super(Many2many, self)._setup_regular_full(model) |