diff --git a/README.md b/README.md index d0528a87c11..95fd20c854b 100644 --- a/README.md +++ b/README.md @@ -16,14 +16,14 @@ a full-featured Open Source ERP when you inst Getting started with Odoo ------------------------- -For a standard installation please follow the Setup instructions +For a standard installation please follow the Setup instructions from the documentation. If you are a developer you may type the following command at your terminal: - wget -O- https://raw.githubusercontent.com/odoo/odoo/master/odoo.py | python + wget -O- https://raw.githubusercontent.com/odoo/odoo/9.0/odoo.py | python -Then follow the developer tutorials +Then follow the developer tutorials For Odoo employees diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot index df6abee18b0..c65f389f6cd 100644 --- a/addons/account/i18n/account.pot +++ b/addons/account/i18n/account.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 9.0\n" +"Project-Id-Version: Odoo Server 9.0c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-18 08:05+0000\n" -"PO-Revision-Date: 2015-11-18 08:05+0000\n" +"POT-Creation-Date: 2015-12-17 14:09+0000\n" +"PO-Revision-Date: 2015-12-17 14:09+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -18,7 +18,7 @@ msgstr "" #. module: account #: model:mail.template,body_html:account.email_template_edi_invoice msgid "\n" -"
\n" +"
\n" "

Hello ${object.partner_id.name},

\n" "

A new invoice is available for you:

\n" " \n" @@ -2101,19 +2101,9 @@ msgstr "" msgid "Cashbox Lines" msgstr "" -#. module: account -#: model:ir.model.fields,field_description:account.field_account_bank_statement_cashbox_end_id -msgid "Cashbox end id" -msgstr "" - #. module: account #: model:ir.model.fields,field_description:account.field_account_cashbox_line_cashbox_id -msgid "Cashbox id" -msgstr "" - -#. module: account -#: model:ir.model.fields,field_description:account.field_account_bank_statement_cashbox_start_id -msgid "Cashbox start id" +msgid "Cashbox" msgstr "" #. module: account @@ -2806,7 +2796,9 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_account_abstract_payment_currency_id +#: model:ir.model.fields,field_description:account.field_account_bank_statement_currency_id #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_currency_id +#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_journal_currency_id #: model:ir.model.fields,field_description:account.field_account_chart_template_currency_id #: model:ir.model.fields,field_description:account.field_account_invoice_company_currency_id #: model:ir.model.fields,field_description:account.field_account_invoice_currency_id @@ -2815,6 +2807,7 @@ msgstr "" #: model:ir.model.fields,field_description:account.field_account_invoice_report_currency_id #: model:ir.model.fields,field_description:account.field_account_invoice_tax_currency_id #: model:ir.model.fields,field_description:account.field_account_journal_currency_id +#: model:ir.model.fields,field_description:account.field_account_move_currency_id #: model:ir.model.fields,field_description:account.field_account_move_line_company_currency_id #: model:ir.model.fields,field_description:account.field_account_move_line_currency_id #: model:ir.model.fields,field_description:account.field_account_partial_reconcile_company_currency_id @@ -2822,6 +2815,7 @@ msgstr "" #: model:ir.model.fields,field_description:account.field_account_partial_reconcile_currency_id #: model:ir.model.fields,field_description:account.field_account_payment_currency_id #: model:ir.model.fields,field_description:account.field_account_register_payments_currency_id +#: model:ir.model.fields,field_description:account.field_res_partner_currency_id #: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts_currency_id #: model:ir.ui.view,arch_db:account.report_generalledger #: model:ir.ui.view,arch_db:account.view_account_payment_search @@ -2840,20 +2834,12 @@ msgid "Currency as per company's country." msgstr "" #. module: account -#: code:addons/account/models/account_move.py:1168 -#: code:addons/account/models/account_move.py:1176 +#: code:addons/account/models/account_move.py:1180 +#: code:addons/account/models/account_move.py:1188 #, python-format msgid "Currency exchange rate difference" msgstr "" -#. module: account -#: model:ir.model.fields,field_description:account.field_account_bank_statement_currency_id -#: model:ir.model.fields,field_description:account.field_account_bank_statement_line_journal_currency_id -#: model:ir.model.fields,field_description:account.field_account_move_currency_id -#: model:ir.model.fields,field_description:account.field_res_partner_currency_id -msgid "Currency id" -msgstr "" - #. module: account #: model:account.account.type,name:account.data_account_type_current_assets #: model:ir.ui.view,arch_db:account.view_account_form @@ -3465,6 +3451,11 @@ msgstr "" msgid "Ending Balance" msgstr "" +#. module: account +#: model:ir.model.fields,field_description:account.field_account_bank_statement_cashbox_end_id +msgid "Ending Cashbox" +msgstr "" + #. module: account #: model:ir.ui.view,arch_db:account.account_planner msgid "Enjoy your Odoo experience," @@ -5248,12 +5239,6 @@ msgstr "" msgid "Messages" msgstr "" -#. module: account -#: model:ir.model.fields,help:account.field_account_bank_statement_message_ids -#: model:ir.model.fields,help:account.field_account_invoice_message_ids -msgid "Messages and communication history" -msgstr "" - #. module: account #: selection:account.journal,type:0 #: model:ir.ui.view,arch_db:account.view_account_journal_form @@ -7209,6 +7194,11 @@ msgstr "" msgid "Starting Balance" msgstr "" +#. module: account +#: model:ir.model.fields,field_description:account.field_account_bank_statement_cashbox_start_id +msgid "Starting Cashbox" +msgstr "" + #. module: account #: model:ir.ui.view,arch_db:account.view_account_payment_search msgid "State" diff --git a/addons/account/i18n/ca.po b/addons/account/i18n/ca.po index 578dc01f77f..a8da38d7f83 100644 --- a/addons/account/i18n/ca.po +++ b/addons/account/i18n/ca.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-18 08:05+0000\n" -"PO-Revision-Date: 2015-12-05 23:18+0000\n" +"PO-Revision-Date: 2015-12-12 09:50+0000\n" "Last-Translator: Marc Tormo i Bochaca \n" "Language-Team: Catalan (http://www.transifex.com/odoo/odoo-9/language/ca/)\n" "MIME-Version: 1.0\n" @@ -8948,7 +8948,7 @@ msgstr "" #: model:ir.model.fields,field_description:account.field_account_invoice_reference #: model:ir.ui.view,arch_db:account.invoice_supplier_form msgid "Vendor Reference" -msgstr "" +msgstr "Referència de Proveïdor" #. module: account #: selection:account.invoice,type:0 selection:account.invoice.report,type:0 @@ -8962,7 +8962,7 @@ msgstr "Abonament de proveïdor " #. module: account #: model:ir.model.fields,field_description:account.field_product_template_supplier_taxes_id msgid "Vendor Taxes" -msgstr "" +msgstr "Impostos de Proveïdor" #. module: account #. openerp-web @@ -8970,7 +8970,7 @@ msgstr "" #: model:ir.ui.menu,name:account.menu_account_supplier #, python-format msgid "Vendors" -msgstr "" +msgstr "Proveïdors " #. module: account #: selection:account.financial.report,type:0 diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po index 53c984b36fd..e88b47c5a75 100644 --- a/addons/account/i18n/de.po +++ b/addons/account/i18n/de.po @@ -27,8 +27,8 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-18 08:05+0000\n" -"PO-Revision-Date: 2015-12-04 17:30+0000\n" -"Last-Translator: Falk Scholze \n" +"PO-Revision-Date: 2015-12-11 14:17+0000\n" +"Last-Translator: Philipp Hug \n" "Language-Team: German (http://www.transifex.com/odoo/odoo-9/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -329,7 +329,7 @@ msgstr "\n Balance in Odoo" -msgstr "Gleichgewicht in Odoo" +msgstr "Saldo in Odoo" #. module: account #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view @@ -421,7 +421,7 @@ msgstr "Automatisches Versenden der Dokumente: automatisches Ve #. module: account #: model:ir.ui.view,arch_db:account.report_overdue_document msgid "Balance :" -msgstr "Ausgleich:" +msgstr "Saldo:" #. module: account #: model:ir.ui.view,arch_db:account.account_planner @@ -590,7 +590,7 @@ msgstr "Periodendauer (Tage)" msgid "" "Print checks
\n" " From the Vendor Payments list, select those you want to pay and click on Print Check (you may first need to activate the check feature in the" -msgstr "" +msgstr "Druck-Kontrolle
\nWählen Sie zunächst von der Liste der Lieferantenzahlungen die Rechnungen aus, die Sie zahlen möchten und klicken Sie danach auf Druckprüfung (Zunächst müssen Sie die Kontrollfunktion aktivieren" #. module: account #: model:ir.ui.view,arch_db:account.account_planner @@ -686,7 +686,7 @@ msgstr "Zwischensumme" #: model:ir.ui.view,arch_db:account.report_generalledger #: model:ir.ui.view,arch_db:account.report_trialbalance msgid "Target Moves:" -msgstr "" +msgstr "Filter Buchungen:" #. module: account #: model:ir.ui.view,arch_db:account.account_planner @@ -859,7 +859,7 @@ msgstr "Auswertung Alter der Forderungen" #. module: account #: model:ir.ui.view,arch_db:account.account_planner msgid "Account Balances" -msgstr "Kontenausgleich" +msgstr "Kontensaldi" #. module: account #: model:ir.model,name:account.model_account_bank_statement_cashbox @@ -1149,7 +1149,7 @@ msgstr "Buchhaltungskonfiguration: eine Schritt-für-Schritt Anleitung." #. module: account #: model:ir.actions.act_window,name:account.open_account_journal_dashboard_kanban msgid "Accounting Dashboard" -msgstr "" +msgstr "Dashboard Finanzen" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_date @@ -1273,7 +1273,7 @@ msgstr "Erweiterte Einstellungen" #: model:ir.ui.menu,name:account.menu_finance_entries #: model:res.groups,name:account.group_account_manager msgid "Adviser" -msgstr "Ratgeber" +msgstr "Finanzberater" #. module: account #: model:ir.model.fields,field_description:account.field_account_tax_include_base_amount @@ -1493,7 +1493,7 @@ msgstr "" #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_amount_currency #: model:ir.model.fields,field_description:account.field_account_move_line_amount_currency msgid "Amount currency" -msgstr "" +msgstr "Währungsbetrag" #. module: account #: model:ir.model.fields,field_description:account.field_account_partial_reconcile_amount_currency @@ -1694,12 +1694,12 @@ msgstr "August" #. module: account #: model:ir.ui.view,arch_db:account.invoice_supplier_form msgid "Auto-detect" -msgstr "" +msgstr "Automatisch erkennen" #. module: account #: model:ir.ui.view,arch_db:account.view_account_config_settings msgid "Automate Payments" -msgstr "" +msgstr "Zahlugen automatisieren" #. module: account #: selection:account.financial.report,style_overwrite:0 @@ -1721,7 +1721,7 @@ msgstr "Durchschnittspreis" #. module: account #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view msgid "Awaiting payments" -msgstr "" +msgstr "Ausstehende Rechnungen" #. module: account #: code:addons/account/models/chart_template.py:156 @@ -1954,7 +1954,7 @@ msgstr "" #: code:addons/account/models/account_journal_dashboard.py:159 #, python-format msgid "Bills to pay" -msgstr "" +msgstr "Rechnungen zu bezahlen" #. module: account #: model:ir.model.fields,field_description:account.field_account_account_type_include_initial_balance @@ -2042,7 +2042,7 @@ msgstr "Abbrechen" #. module: account #: model:ir.ui.view,arch_db:account.invoice_supplier_form msgid "Cancel Bill" -msgstr "" +msgstr "Rechnung stornieren" #. module: account #: model:ir.ui.view,arch_db:account.view_move_form @@ -2143,7 +2143,7 @@ msgstr "" #: code:addons/account/wizard/account_invoice_refund.py:54 #, python-format msgid "Cannot refund draft/proforma/cancelled invoice." -msgstr "" +msgstr "Entwurf / Pro-Forma / Abgebrochen- Rechnungen können nicht rückerstattet werden." #. module: account #: code:addons/account/wizard/account_invoice_refund.py:56 @@ -2352,7 +2352,7 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_wizard_multi_chart #, python-format msgid "Choose Accounting Template" -msgstr "" +msgstr "Kontenvorlage auswählen" #. module: account #. openerp-web @@ -2389,7 +2389,7 @@ msgstr "" #. module: account #: model:ir.actions.act_window,help:account.action_move_journal_line msgid "Click to create a journal entry." -msgstr "" +msgstr "Klicken Sie um einen Buchungssatz zu erstellen." #. module: account #: model:ir.actions.act_window,help:account.action_view_bank_statement_tree @@ -3452,7 +3452,7 @@ msgstr "Entwurf" #. module: account #: model:ir.ui.view,arch_db:account.invoice_supplier_form msgid "Draft Bill" -msgstr "" +msgstr "Rechnungsentwurf" #. module: account #: model:ir.ui.view,arch_db:account.invoice_form @@ -3474,7 +3474,7 @@ msgstr "Neue Gutschrift" #. module: account #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view msgid "Draft bills" -msgstr "" +msgstr "Rechnungsentwürfe" #. module: account #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree @@ -3510,7 +3510,7 @@ msgstr "Fälligkeitsmonat" #. module: account #: model:ir.actions.report.xml,name:account.action_report_print_overdue msgid "Due Payments" -msgstr "" +msgstr "Fällige Zahlungen" #. module: account #: model:ir.ui.view,arch_db:account.view_payment_term_line_tree @@ -3662,7 +3662,7 @@ msgstr "Excelvorlage" #: code:addons/account/models/chart_template.py:158 #, python-format msgid "Exchange Difference" -msgstr "" +msgstr "Wechselkursdifferenzen" #. module: account #: model:ir.model.fields,field_description:account.field_res_company_currency_exchange_journal_id @@ -3931,7 +3931,7 @@ msgstr "Für Salden die mit umgekehrten Vorzeichen gedruckt werden sollen. z. B. #. module: account #: model:ir.model.fields,help:account.field_account_payment_term_line_value_amount msgid "For percent enter a ratio between 0-100." -msgstr "" +msgstr "Für Prozent geben Sie eine Zahl zwischen 0-100 ein." #. module: account #: model:ir.ui.view,arch_db:account.account_planner @@ -4083,7 +4083,7 @@ msgstr "" #: code:addons/account/static/src/xml/account_reconciliation.xml:225 #, python-format msgid "Go to bank statements" -msgstr "" +msgstr "Zu den Bankauszügen" #. module: account #: code:addons/account/models/account_invoice.py:447 @@ -4226,7 +4226,7 @@ msgstr "ID" #: code:addons/account/models/chart_template.py:155 #, python-format msgid "INV" -msgstr "" +msgstr "Re.:" #. module: account #: code:addons/account/models/account_bank_statement.py:394 @@ -4712,7 +4712,7 @@ msgstr "Alle Rechnungen" #: code:addons/account/static/src/js/account_reconciliation_widgets.js:2095 #, python-format msgid "Invoices & Payments Matching" -msgstr "" +msgstr "Ausgleich Rechnungen & Zahlungen" #. module: account #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view @@ -4743,7 +4743,7 @@ msgstr "Ihnen zugeordnete Rechnungen" #. module: account #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view msgid "Invoices to validate" -msgstr "zu prüfende Rechnungen" +msgstr "Zu prüfende Rechnungen" #. module: account #: model:ir.ui.menu,name:account.menu_finance @@ -4944,7 +4944,7 @@ msgstr "Journalbezeichnung" #. module: account #: model:ir.ui.view,arch_db:account.report_generalledger msgid "Journal and Partner" -msgstr "" +msgstr "Journal & Partner" #. module: account #: model:ir.ui.view,arch_db:account.view_account_invoice_report_search @@ -5269,7 +5269,7 @@ msgstr "" #. module: account #: model:ir.ui.view,arch_db:account.view_account_form msgid "Less Payable Accounts" -msgstr "" +msgstr "Abzüglich Kreditorenkonten" #. module: account #: code:addons/account/models/account_invoice.py:138 @@ -5357,7 +5357,7 @@ msgstr "DIV" #. module: account #: model:ir.ui.view,arch_db:account.account_planner msgid "Main Currency" -msgstr "" +msgstr "Hauptwährung" #. module: account #: selection:account.financial.report,style_overwrite:0 @@ -5367,7 +5367,7 @@ msgstr "Haupt Titel 1 (fett, unterstrichen)" #. module: account #: model:ir.model.fields,help:account.field_account_config_settings_currency_id msgid "Main currency of the company." -msgstr "" +msgstr "Hauptwährung des Unternehmens." #. module: account #: model:ir.ui.view,arch_db:account.account_planner @@ -5462,20 +5462,20 @@ msgstr "" #: model:ir.model.fields,field_description:account.field_account_payment_communication #: model:ir.model.fields,field_description:account.field_account_register_payments_communication msgid "Memo" -msgstr "" +msgstr "Memo" #. module: account #. openerp-web #: code:addons/account/static/src/xml/account_payment.xml:64 #, python-format msgid "Memo:" -msgstr "" +msgstr "Memo:" #. module: account #: model:ir.model.fields,field_description:account.field_account_bank_statement_message_ids #: model:ir.model.fields,field_description:account.field_account_invoice_message_ids msgid "Messages" -msgstr "" +msgstr "Mitteilungen" #. module: account #: model:ir.model.fields,help:account.field_account_bank_statement_message_ids @@ -5745,7 +5745,7 @@ msgstr "Notizen" #. module: account #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view msgid "Nothing to Reconcile" -msgstr "" +msgstr "Alle Zahlungen wurden abgeglichen" #. module: account #: selection:res.company,fiscalyear_last_month:0 @@ -5761,7 +5761,7 @@ msgstr "Anzahl" #. module: account #: model:ir.ui.view,arch_db:account.view_account_move_line_filter msgid "Number (Move)" -msgstr "" +msgstr "Nummer (Buchung)" #. module: account #: model:ir.model.fields,field_description:account.field_account_bank_statement_message_needaction_counter @@ -5782,7 +5782,7 @@ msgstr "Anzahl Tage" #. module: account #: model:ir.model.fields,field_description:account.field_res_company_accounts_code_digits msgid "Number of digits in an account code" -msgstr "" +msgstr "Stellenzahl für die Kontonummer" #. module: account #: model:ir.model.fields,help:account.field_account_bank_statement_message_needaction_counter @@ -5917,7 +5917,7 @@ msgstr "" #: code:addons/account/models/chart_template.py:699 #, python-format msgid "Only administrators can change the settings" -msgstr "" +msgstr "Nur ein Administrator darf Änderungen vornehmen" #. module: account #. openerp-web @@ -5938,7 +5938,7 @@ msgstr "" #. module: account #: selection:account.invoice,state:0 selection:account.invoice.report,state:0 msgid "Open" -msgstr "" +msgstr "Öffnen" #. module: account #. openerp-web @@ -5950,7 +5950,7 @@ msgstr "Offene Zahlung" #. module: account #: model:ir.actions.client,name:account.action_client_account_menu msgid "Open account dashboard menu" -msgstr "" +msgstr "Account Dashboard Menü öffnen" #. module: account #. openerp-web @@ -5974,7 +5974,7 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_account_account_template_nocreate msgid "Optional Create" -msgstr "" +msgstr "Erzeuge optional" #. module: account #: model:ir.ui.view,arch_db:account.view_move_line_form2 @@ -6026,7 +6026,7 @@ msgstr "" #. module: account #: selection:account.payment.method,payment_type:0 msgid "Outbound" -msgstr "" +msgstr "Ausgehend" #. module: account #: model:ir.model.fields,field_description:account.field_account_chart_template_property_stock_account_output_categ_id @@ -6172,7 +6172,7 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_partner_name msgid "Partner name" -msgstr "" +msgstr "Partner Name" #. module: account #: model:ir.model.fields,field_description:account.field_account_abstract_payment_partner_type @@ -6203,7 +6203,7 @@ msgstr "" #: selection:account.account.type,type:0 #: model:ir.ui.view,arch_db:account.view_account_payment_search msgid "Payable" -msgstr "" +msgstr "Kreditoren" #. module: account #: model:ir.model.fields,field_description:account.field_account_chart_template_property_account_payable_id @@ -6222,7 +6222,7 @@ msgstr "Kreditorenkonten" #. module: account #: model:ir.model.fields,field_description:account.field_res_partner_debit_limit msgid "Payable Limit" -msgstr "" +msgstr "Kreditlimit" #. module: account #: model:ir.model.fields,field_description:account.field_account_abstract_payment_amount @@ -6241,7 +6241,7 @@ msgstr "Zahlungsdatum" #. module: account #: model:ir.model.fields,field_description:account.field_account_payment_payment_difference_handling msgid "Payment Difference" -msgstr "" +msgstr "Zahlungsdifferenz" #. module: account #: model:ir.model.fields,field_description:account.field_account_abstract_payment_journal_id @@ -6322,27 +6322,27 @@ msgstr "Beschreibung der Zahlungsbedingungen für den Kunden..." #. module: account #: model:account.payment.term,note:account.account_payment_term_15days msgid "Payment term: 15 Days" -msgstr "" +msgstr "Zahlungsbedingung: 15 Tage" #. module: account #: model:account.payment.term,note:account.account_payment_term_net msgid "Payment term: 30 Net Days" -msgstr "" +msgstr "Zahlungsbedingung: 30 Tage netto" #. module: account #: model:account.payment.term,note:account.account_payment_term_advance msgid "Payment term: 30% Advance End of Following Month" -msgstr "" +msgstr "Zahlungsbedingung: 30% im Voraus zum Ende des folgenden Monats" #. module: account #: model:account.payment.term,note:account.account_payment_term msgid "Payment term: End of Following Month" -msgstr "" +msgstr "Zahlungsbedingung: Am Ende des Folgemonats" #. module: account #: model:account.payment.term,note:account.account_payment_term_immediate msgid "Payment term: Immediate Payment" -msgstr "" +msgstr "Zahlungsbedindung: Sofortige Zahlung" #. module: account #: model:ir.model.fields,help:account.field_account_move_line_payment_id @@ -6384,7 +6384,7 @@ msgstr "" #. module: account #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view msgid "Payments to do" -msgstr "" +msgstr "Zu erledigende Rechnungen" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_payments_widget @@ -6460,7 +6460,7 @@ msgstr "" #. module: account #: model:ir.ui.view,arch_db:account.view_account_invoice_filter msgid "Period" -msgstr "" +msgstr "Periode" #. module: account #: model:ir.model.fields,field_description:account.field_account_aged_trial_balance_period_length @@ -6470,7 +6470,7 @@ msgstr "Periodendauer (Tage)" #. module: account #: model:ir.model.fields,field_description:account.field_account_config_settings_module_account_plaid msgid "Plaid Connector" -msgstr "" +msgstr "Plaid Connector" #. module: account #: model:ir.model,name:account.model_web_planner @@ -6596,7 +6596,7 @@ msgstr "Vorauszahlungen" #. module: account #: selection:account.financial.report,sign:0 msgid "Preserve balance sign" -msgstr "" +msgstr "Saldo mit existierendem Vorzeichen" #. module: account #: model:ir.model,name:account.model_account_operation_template @@ -7150,7 +7150,7 @@ msgstr "" #. module: account #: selection:account.financial.report,sign:0 msgid "Reverse balance sign" -msgstr "" +msgstr "Saldo mit umgekehrtem Vorzeichen" #. module: account #: model:ir.ui.view,arch_db:account.account_planner @@ -7378,7 +7378,7 @@ msgstr "September" #: model:ir.model.fields,field_description:account.field_account_tax_sequence #: model:ir.model.fields,field_description:account.field_account_tax_template_sequence msgid "Sequence" -msgstr "" +msgstr "Reihenfolge" #. module: account #: model:ir.model.fields,help:account.field_account_tax_active @@ -7403,7 +7403,7 @@ msgstr "" #. module: account #: model:ir.ui.view,arch_db:account.invoice_supplier_form msgid "Set to Draft" -msgstr "" +msgstr "Auf 'Entwurf' setzen" #. module: account #: model:ir.ui.menu,name:account.menu_account_config @@ -7443,7 +7443,7 @@ msgstr "Zeige Journal in der Übersicht" #: code:addons/account/static/src/xml/account_reconciliation.xml:19 #, python-format msgid "Show more... (" -msgstr "" +msgstr "Mehr anzeigen... (" #. module: account #: model:ir.model.fields,field_description:account.field_account_financial_report_sign @@ -7488,7 +7488,7 @@ msgstr "Startdatum" #. module: account #: model:ir.model.fields,field_description:account.field_account_bank_statement_balance_start msgid "Starting Balance" -msgstr "" +msgstr "Anfangssaldo" #. module: account #: model:ir.ui.view,arch_db:account.view_account_payment_search @@ -7550,7 +7550,7 @@ msgstr "Status" #. module: account #: model:ir.model.fields,field_description:account.field_account_cashbox_line_subtotal msgid "Subtotal" -msgstr "" +msgstr "Zwischensumme" #. module: account #: model:ir.ui.view,arch_db:account.report_invoice_document @@ -7674,13 +7674,13 @@ msgstr "Steuerbuchungen" #: model:ir.model.fields,field_description:account.field_account_fiscal_position_template_tax_ids #: model:ir.ui.view,arch_db:account.view_account_position_form msgid "Tax Mapping" -msgstr "" +msgstr "Steuerzuordnung" #. module: account #: model:ir.model.fields,field_description:account.field_account_tax_name #: model:ir.model.fields,field_description:account.field_account_tax_template_name msgid "Tax Name" -msgstr "" +msgstr "Steuerbezeichnung" #. module: account #: model:ir.model.fields,field_description:account.field_account_tax_template_type_tax_use @@ -7883,7 +7883,7 @@ msgstr "Vereinbarungen" #. module: account #: model:ir.ui.view,arch_db:account.account_planner msgid "Terms & Conditions" -msgstr "" +msgstr "Geschäftsbedingungen" #. module: account #: model:ir.ui.view,arch_db:account.invoice_form @@ -8276,7 +8276,7 @@ msgstr "" msgid "" "This allows to automate letters for unpaid invoices, with multi-level recalls.\n" "-This installs the module account_reports_followup." -msgstr "Hiermit erlaufen Sie den automatischen Versand von Nachrichten zu unbezahlten Rechnungen mit mehrdimensionalen Abrufen. Es wird das Modul \"account_reports_followup\" installiert." +msgstr "Hiermit erlauben Sie den automatischen Versand von Nachrichten zu unbezahlten Rechnungen mit mehrdimensionalen Abrufen. Es wird das Modul \"account_reports_followup\" installiert." #. module: account #: model:ir.model.fields,help:account.field_account_config_settings_module_account_batch_deposit @@ -8478,17 +8478,17 @@ msgstr "" #: code:addons/account/static/src/xml/account_reconciliation.xml:20 #, python-format msgid "Tip : Hit ctrl-enter to reconcile all the balanced items in the sheet." -msgstr "" +msgstr "Tip: Benutze ctrl-enter um alle offenen Posten auszugleichen. " #. module: account #: selection:account.financial.report,style_overwrite:0 msgid "Title 2 (bold)" -msgstr "" +msgstr "Titel 2 (fett)" #. module: account #: selection:account.financial.report,style_overwrite:0 msgid "Title 3 (bold, smaller)" -msgstr "" +msgstr "Titel 3 (fett, kleiner)" #. module: account #: model:ir.ui.view,arch_db:account.view_account_invoice_report_search @@ -8512,7 +8512,7 @@ msgstr "" #: code:addons/account/models/account_move.py:776 #, python-format msgid "To reconcile the entries company should be the same for all entries!" -msgstr "" +msgstr "Das Unternehmen sollte für alle auszugleichenden Buchungen identisch sein." #. module: account #: model:ir.ui.view,arch_db:account.account_planner @@ -8546,7 +8546,7 @@ msgstr "Gesamtkredit" #: model:ir.ui.view,arch_db:account.view_move_form #: model:ir.ui.view,arch_db:account.view_move_line_tree msgid "Total Debit" -msgstr "" +msgstr "Summe Soll" #. module: account #: model:ir.model.fields,field_description:account.field_res_partner_total_invoiced @@ -8556,18 +8556,18 @@ msgstr "Abgerechneter Betrag" #. module: account #: model:ir.model.fields,field_description:account.field_res_partner_debit msgid "Total Payable" -msgstr "" +msgstr "Summe Kreditoren" #. module: account #: model:ir.model.fields,field_description:account.field_res_partner_credit msgid "Total Receivable" -msgstr "" +msgstr "Summe Debitoren" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_report_residual #: model:ir.model.fields,field_description:account.field_account_invoice_report_user_currency_residual msgid "Total Residual" -msgstr "" +msgstr "Restbetrag" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_report_price_total @@ -8591,12 +8591,12 @@ msgstr "" #. module: account #: model:ir.model.fields,help:account.field_res_partner_credit msgid "Total amount this customer owes you." -msgstr "" +msgstr "Gesamtschulden dieses Kunden" #. module: account #: model:ir.model.fields,help:account.field_res_partner_debit msgid "Total amount you have to pay to this vendor." -msgstr "" +msgstr "Gesamtsumme zahlbar an Lieferant." #. module: account #: model:ir.model.fields,help:account.field_account_bank_statement_total_entry_encoding @@ -8660,12 +8660,12 @@ msgstr "Überweisungen" #: model:ir.actions.report.xml,name:account.action_report_trial_balance #: model:ir.ui.menu,name:account.menu_general_Balance_report msgid "Trial Balance" -msgstr "Summen und Salden" +msgstr "Vorläufige Bilanz" #. module: account #: model:ir.model,name:account.model_account_balance_report msgid "Trial Balance Report" -msgstr "Salden-Bilanz" +msgstr "Vorläufige Bilanz" #. module: account #: model:ir.model.fields,field_description:account.field_account_account_internal_type @@ -8711,7 +8711,7 @@ msgstr "" #. module: account #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened msgid "Unpaid Invoices" -msgstr "" +msgstr "Offene Rechnungen" #. module: account #: selection:account.move,state:0 @@ -8723,12 +8723,12 @@ msgstr "Nicht gebucht" #. module: account #: model:ir.ui.view,arch_db:account.view_account_move_filter msgid "Unposted Journal Entries" -msgstr "" +msgstr "Buchungssatz-Vorschläge" #. module: account #: model:ir.ui.view,arch_db:account.view_account_move_line_filter msgid "Unposted Journal Items" -msgstr "" +msgstr "Nicht verbuchte Journaleinträge" #. module: account #: model:ir.model.fields,field_description:account.field_account_bank_statement_message_unread @@ -8748,12 +8748,12 @@ msgstr "Zähler der ungelesenen Nachrichten" #: model:ir.ui.view,arch_db:account.account_unreconcile_view #, python-format msgid "Unreconcile" -msgstr "" +msgstr "Storno Ausgleich" #. module: account #: model:ir.actions.act_window,name:account.action_account_unreconcile msgid "Unreconcile Entries" -msgstr "" +msgstr "OP-Ausgleich stornieren" #. module: account #: model:ir.ui.view,arch_db:account.account_unreconcile_view @@ -8763,17 +8763,17 @@ msgstr "" #. module: account #: model:ir.ui.view,arch_db:account.view_account_move_line_filter msgid "Unreconciled" -msgstr "" +msgstr "Offene Posten" #. module: account #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled msgid "Unreconciled Entries" -msgstr "" +msgstr "Nicht ausgeglichene Buchungen" #. module: account #: model:ir.ui.view,arch_db:account.view_account_move_line_filter msgid "Unreconciled Journal Items" -msgstr "" +msgstr "Nicht ausgeglichene Buchungen" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_amount_untaxed @@ -8795,7 +8795,7 @@ msgstr "Benutze die Angelsächsische Buchführung" #. module: account #: model:ir.model.fields,field_description:account.field_account_chart_template_use_anglo_saxon msgid "Use Anglo-Saxon accounting" -msgstr "" +msgstr "Benutze die Angelsächsische Buchführung" #. module: account #: model:ir.model.fields,field_description:account.field_account_config_settings_module_account_sepa @@ -8810,7 +8810,7 @@ msgstr "Benutze das spezifische Journal" #. module: account #: model:ir.model.fields,field_description:account.field_res_company_anglo_saxon_accounting msgid "Use anglo-saxon accounting" -msgstr "" +msgstr "Benutze die Angelsächsische Buchführung" #. module: account #: model:ir.model.fields,field_description:account.field_account_config_settings_module_account_batch_deposit @@ -8897,7 +8897,7 @@ msgstr "Bestätigen" #. module: account #: model:ir.model,name:account.model_validate_account_move msgid "Validate Account Move" -msgstr "" +msgstr "Buchung quittieren" #. module: account #: model:ir.ui.view,arch_db:account.account_planner diff --git a/addons/account/i18n/el.po b/addons/account/i18n/el.po index fc381d9664f..d38bcf5f906 100644 --- a/addons/account/i18n/el.po +++ b/addons/account/i18n/el.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-18 08:05+0000\n" -"PO-Revision-Date: 2015-12-05 23:14+0000\n" +"PO-Revision-Date: 2015-12-09 13:01+0000\n" "Last-Translator: Goutoudis Kostas \n" "Language-Team: Greek (http://www.transifex.com/odoo/odoo-9/language/el/)\n" "MIME-Version: 1.0\n" @@ -139,7 +139,7 @@ msgstr "%s (αντίγραφο)" #. module: account #: model:ir.ui.view,arch_db:account.external_layout_footer msgid "&bull;" -msgstr "" +msgstr "&bull;" #. module: account #: model:ir.ui.view,arch_db:account.account_planner @@ -4807,7 +4807,7 @@ msgstr "Πλάγια Γράμματα (μικρότερα)" #. module: account #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view msgid "Items" -msgstr "" +msgstr "Είδη" #. module: account #: model:ir.ui.view,arch_db:account.report_generalledger diff --git a/addons/account/i18n/es_DO.po b/addons/account/i18n/es_DO.po index 7be16087f98..003e72d89ae 100644 --- a/addons/account/i18n/es_DO.po +++ b/addons/account/i18n/es_DO.po @@ -3,7 +3,7 @@ # * account # # Translators: -# Alejandro Die , 2015 +# Alejandro Die Sanchis , 2015 # Alejandro Santana , 2015 # Carlos Liébana , 2015 # Eneldo Serrata , 2015 @@ -19,8 +19,8 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-18 08:05+0000\n" -"PO-Revision-Date: 2015-11-18 08:43+0000\n" -"Last-Translator: Martin Trigaux\n" +"PO-Revision-Date: 2015-12-12 19:20+0000\n" +"Last-Translator: Eneldo Serrata \n" "Language-Team: Spanish (Dominican Republic) (http://www.transifex.com/odoo/odoo-9/language/es_DO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -4740,7 +4740,7 @@ msgstr "Facturas a validar" #. module: account #: model:ir.ui.menu,name:account.menu_finance msgid "Invoicing" -msgstr "Facturación" +msgstr "Contabilidad" #. module: account #: model:ir.ui.view,arch_db:account.view_account_config_settings @@ -8205,7 +8205,7 @@ msgstr "Estos tipos se definien en función de su país. Contienen más informac #. module: account #: model:ir.ui.view,arch_db:account.account_planner msgid "These users handle billing specifically." -msgstr "Estos usuarios en concreto manejan facturación." +msgstr "Estos usuarios manejan la facturación específica." #. module: account #: code:addons/account/models/account_journal_dashboard.py:101 diff --git a/addons/account/i18n/es_EC.po b/addons/account/i18n/es_EC.po index c34d444f061..15e621f6e66 100644 --- a/addons/account/i18n/es_EC.po +++ b/addons/account/i18n/es_EC.po @@ -20,7 +20,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-18 08:05+0000\n" -"PO-Revision-Date: 2015-11-27 06:09+0000\n" +"PO-Revision-Date: 2015-12-10 17:36+0000\n" "Last-Translator: Rick Hunter \n" "Language-Team: Spanish (Ecuador) (http://www.transifex.com/odoo/odoo-9/language/es_EC/)\n" "MIME-Version: 1.0\n" @@ -571,7 +571,7 @@ msgstr "O cree órdenes de pago
\nCree una Órd #. module: account #: model:ir.ui.view,arch_db:account.report_agedpartnerbalance msgid "Partner's:" -msgstr "Asociado:" +msgstr "Empresa:" #. module: account #: model:ir.ui.view,arch_db:account.report_agedpartnerbalance @@ -1781,7 +1781,7 @@ msgid "" "Bank Account Number to which the invoice will be paid. A Company bank " "account if this is a Customer Invoice or Vendor Refund, otherwise a Partner " "bank account number." -msgstr "Número de cuenta bancaria con el que se abonará la factura. Una cuenta bancaria de la compañía, si es una factura de cliente o devolución a proveedor; en otro caso, el número de cuenta bancaria de un asociado." +msgstr "Número de cuenta bancaria con el que se abonará la factura. Una cuenta bancaria de la compañía, si es una factura de cliente o devolución a proveedor; en otro caso, el número de cuenta bancaria de una empresa." #. module: account #: model:ir.actions.act_window,name:account.action_account_bank_journal_form @@ -1967,7 +1967,7 @@ msgstr "Gestión de presupuestos" #. module: account #: model:ir.ui.menu,name:account.account_reports_business_intelligence_menu msgid "Business Intelligence" -msgstr "Inteligencia empresarial" +msgstr "Tableros de Control" #. module: account #: model:ir.model.fields,field_description:account.field_account_operation_template_name @@ -4937,7 +4937,7 @@ msgstr "Nombre del diario" #. module: account #: model:ir.ui.view,arch_db:account.report_generalledger msgid "Journal and Partner" -msgstr "Diario y asociado" +msgstr "Diario y Empresa" #. module: account #: model:ir.ui.view,arch_db:account.view_account_invoice_report_search @@ -5218,7 +5218,7 @@ msgid "" "Last time the invoices & payments matching was performed for this partner. " "It is set either if there's not at least an unreconciled debit and an " "unreconciled credit or if you click the \"Done\" button." -msgstr "Última vez que se conciliaros facturas y pagos de este asociado. Se configura incluso si no hay ningún débito o crédito por conciliar, o si pulsa el botón \"Hecho\"." +msgstr "Última vez que se conciliaros facturas y pagos de esta Empresa. Se configura incluso si no hay ningún débito o crédito por conciliar, o si pulsa el botón \"Hecho\"." #. module: account #: model:ir.model.fields,help:account.field_account_account_last_time_entries_checked @@ -6160,19 +6160,19 @@ msgstr "Empresa asociada" #. module: account #: model:ir.model.fields,field_description:account.field_account_move_line_ref msgid "Partner Reference" -msgstr "Referencia de asociado" +msgstr "Referencia de la Empresa" #. module: account #: model:ir.model.fields,field_description:account.field_account_bank_statement_line_partner_name msgid "Partner name" -msgstr "Nombre de asociado" +msgstr "Nombre de Empresa" #. module: account #: model:ir.model.fields,field_description:account.field_account_abstract_payment_partner_type #: model:ir.model.fields,field_description:account.field_account_payment_partner_type #: model:ir.model.fields,field_description:account.field_account_register_payments_partner_type msgid "Partner type" -msgstr "Tipo asociado" +msgstr "Tipo de Empresa" #. module: account #: model:ir.model.fields,field_description:account.field_account_aged_trial_balance_result_selection @@ -7087,7 +7087,7 @@ msgstr "Valor en informe" #. module: account #: model:ir.ui.menu,name:account.menu_finance_reports msgid "Reporting" -msgstr "Informando" +msgstr "Reportes" #. module: account #: model:ir.ui.menu,name:account.account_report_folder @@ -7296,14 +7296,14 @@ msgstr "Seleccione 'Ventas' para diarios de facturas de cliente. \nSeleccione 'C #: code:addons/account/static/src/js/account_reconciliation_widgets.js:1756 #, python-format msgid "Select Partner" -msgstr "Seleccione asociado" +msgstr "Seleccione Empresa" #. module: account #. openerp-web #: code:addons/account/static/src/xml/account_reconciliation.xml:234 #, python-format msgid "Select a partner or choose a counterpart" -msgstr "Seleccione un asociado o elija una contrapartida" +msgstr "Seleccione una Empresa o elija una contrapartida" #. module: account #: model:ir.model.fields,help:account.field_account_payment_term_line_value @@ -8030,7 +8030,7 @@ msgstr "El primer paso es introducir la información sobre su compañía. Se uti #: model:ir.model.fields,help:account.field_res_partner_property_account_position_id msgid "" "The fiscal position will determine taxes and accounts used for the partner." -msgstr "La posición fiscal determinará los impuestos y cuentas utilizados por el asociado." +msgstr "La posición fiscal determinará los impuestos y cuentas utilizados por la Empresa." #. module: account #: code:addons/account/models/account.py:272 @@ -8095,14 +8095,14 @@ msgstr "La cantidad opcional expresada en el apunte, por ejemplo: número de pro #. module: account #: model:ir.model.fields,help:account.field_account_invoice_account_id msgid "The partner account used for this invoice." -msgstr "La cuenta de asociado utilizada para esta factura." +msgstr "La cuenta de la empresa utilizada para esta factura." #. module: account #: model:ir.model.fields,help:account.field_res_partner_has_unreconciled_entries msgid "" "The partner has at least one unreconciled debit and credit since last time " "the invoices & payments matching was performed." -msgstr "El asociado tiene al menos un débito o crédito no conciliado desde la última vez que se realizó la conciliación de facturas y pagos." +msgstr "La empresa tiene al menos un débito o crédito no conciliado desde la última vez que se realizó la conciliación de facturas y pagos." #. module: account #: code:addons/account/models/account_move.py:782 @@ -8110,12 +8110,12 @@ msgstr "El asociado tiene al menos un débito o crédito no conciliado desde la msgid "" "The partner has to be the same on all lines for receivable and payable " "accounts!" -msgstr "¡El asociado debe ser el mismo en todos los apuntes de cuentas pendientes de pago y pagables!" +msgstr "¡La empresa debe ser el mismo en todos los apuntes de cuentas pendientes de pago y pagables!" #. module: account #: model:ir.model.fields,help:account.field_account_invoice_reference msgid "The partner reference of this invoice." -msgstr "La referencia de asociado para esta factura." +msgstr "La referencia de la empresa para esta factura." #. module: account #: code:addons/account/models/account_payment.py:314 @@ -9323,7 +9323,7 @@ msgstr "Tiene que definir una Fecha de inicio" #: code:addons/account/models/account_invoice.py:1097 #, python-format msgid "You must first select a partner!" -msgstr "¡Antes ha de seleccionar un asociado!" +msgstr "¡Usted debe seleccionar primero una Empresa!" #. module: account #: code:addons/account/wizard/account_report_aged_partner_balance.py:26 diff --git a/addons/account/i18n/es_MX.po b/addons/account/i18n/es_MX.po index 7813eb8b79e..a7bee1276f1 100644 --- a/addons/account/i18n/es_MX.po +++ b/addons/account/i18n/es_MX.po @@ -3,6 +3,7 @@ # * account # # Translators: +# Jorge Villamil , 2015 # Néstor Gómez Muñoz , 2015 # Scott Acock , 2015 msgid "" @@ -10,8 +11,8 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-18 08:05+0000\n" -"PO-Revision-Date: 2015-11-18 08:43+0000\n" -"Last-Translator: Martin Trigaux\n" +"PO-Revision-Date: 2015-12-10 15:59+0000\n" +"Last-Translator: Jorge Villamil \n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/odoo/odoo-9/language/es_MX/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -144,7 +145,7 @@ msgstr "" #. module: account #: model:ir.ui.view,arch_db:account.account_planner msgid ", if accounting or purchase is installed" -msgstr "" +msgstr ", si se ha instalado la contabilidad o la compra " #. module: account #: code:addons/account/models/account_bank_statement.py:321 @@ -322,12 +323,12 @@ msgstr "" #. module: account #: model:ir.ui.view,arch_db:account.view_account_position_form msgid " From " -msgstr "" +msgstr " De " #. module: account #: model:ir.ui.view,arch_db:account.view_account_position_form msgid " To " -msgstr "" +msgstr " Para " #. module: account #: model:ir.ui.view,arch_db:account.account_invoice_report_duplicate @@ -337,7 +338,7 @@ msgstr "" #. module: account #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view msgid "New Bill" -msgstr "" +msgstr "Nueva Cuenta" #. module: account #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view @@ -347,7 +348,7 @@ msgstr "" #. module: account #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view msgid "New" -msgstr "" +msgstr "Nuevo" #. module: account #: model:ir.ui.view,arch_db:account.report_agedpartnerbalance @@ -442,7 +443,7 @@ msgstr "" #. module: account #: model:ir.ui.view,arch_db:account.report_invoice_document msgid "Comment:" -msgstr "" +msgstr "Comentario:" #. module: account #: model:ir.ui.view,arch_db:account.account_planner @@ -478,14 +479,14 @@ msgstr "" #: model:ir.ui.view,arch_db:account.report_generalledger #: model:ir.ui.view,arch_db:account.report_trialbalance msgid "Date from :" -msgstr "" +msgstr "Desde la Fecha: " #. module: account #: model:ir.ui.view,arch_db:account.report_financial #: model:ir.ui.view,arch_db:account.report_generalledger #: model:ir.ui.view,arch_db:account.report_trialbalance msgid "Date to :" -msgstr "" +msgstr "Hasta la Fecha :" #. module: account #: model:ir.ui.view,arch_db:account.account_planner @@ -495,7 +496,7 @@ msgstr "" #. module: account #: model:ir.ui.view,arch_db:account.report_invoice_document msgid "Description:" -msgstr "" +msgstr "Descripción:" #. module: account #: model:ir.ui.view,arch_db:account.report_trialbalance @@ -3050,7 +3051,7 @@ msgstr "Clientes" #. module: account #: model:ir.ui.menu,name:account.menu_board_journal_1 msgid "Dashboard" -msgstr "" +msgstr "Dashboard" #. module: account #. openerp-web @@ -3078,7 +3079,7 @@ msgstr "Fecha" #: model:ir.model.fields,help:account.field_account_bank_statement_message_last_post #: model:ir.model.fields,help:account.field_account_invoice_message_last_post msgid "Date of the last message posted on the record." -msgstr "" +msgstr "Fecha de último trabajo realizado en esta cuenta" #. module: account #. openerp-web @@ -3899,7 +3900,7 @@ msgstr "Seguidores" #: model:ir.model.fields,field_description:account.field_account_bank_statement_message_partner_ids #: model:ir.model.fields,field_description:account.field_account_invoice_message_partner_ids msgid "Followers (Partners)" -msgstr "" +msgstr "Seguidores (Socios)" #. module: account #: model:ir.model.fields,help:account.field_account_financial_report_sign @@ -5005,7 +5006,7 @@ msgstr "" #: model:ir.model.fields,field_description:account.field_account_bank_statement_message_last_post #: model:ir.model.fields,field_description:account.field_account_invoice_message_last_post msgid "Last Message Date" -msgstr "" +msgstr "Fecha de último mensaje" #. module: account #: model:ir.model.fields,field_description:account.field_account_abstract_payment___last_update @@ -5507,7 +5508,7 @@ msgstr "" #. module: account #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view msgid "More " -msgstr "" +msgstr "Más" #. module: account #: model:ir.ui.view,arch_db:account.account_planner @@ -5750,7 +5751,7 @@ msgstr "" #: model:ir.model.fields,field_description:account.field_account_bank_statement_message_needaction_counter #: model:ir.model.fields,field_description:account.field_account_invoice_message_needaction_counter msgid "Number of Actions" -msgstr "" +msgstr "Número de acciones" #. module: account #: model:ir.model.fields,field_description:account.field_account_cashbox_line_number @@ -5771,13 +5772,13 @@ msgstr "" #: model:ir.model.fields,help:account.field_account_bank_statement_message_needaction_counter #: model:ir.model.fields,help:account.field_account_invoice_message_needaction_counter msgid "Number of messages which requires an action" -msgstr "" +msgstr "Número de mensajes que requieren una acción" #. module: account #: model:ir.model.fields,help:account.field_account_bank_statement_message_unread_counter #: model:ir.model.fields,help:account.field_account_invoice_message_unread_counter msgid "Number of unread messages" -msgstr "" +msgstr "Número de mensajes sin leer" #. module: account #. openerp-web @@ -8723,7 +8724,7 @@ msgstr "" #: model:ir.model.fields,field_description:account.field_account_bank_statement_message_unread_counter #: model:ir.model.fields,field_description:account.field_account_invoice_message_unread_counter msgid "Unread Messages Counter" -msgstr "" +msgstr "Contador de mensajes sin leer" #. module: account #. openerp-web diff --git a/addons/account/i18n/fi.po b/addons/account/i18n/fi.po index a2197e2d16f..9f6de517d35 100644 --- a/addons/account/i18n/fi.po +++ b/addons/account/i18n/fi.po @@ -4,13 +4,14 @@ # # Translators: # Kari Lindgren , 2015 +# Timo Koukkari , 2015 msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-18 08:05+0000\n" -"PO-Revision-Date: 2015-12-04 21:16+0000\n" -"Last-Translator: Martin Trigaux\n" +"PO-Revision-Date: 2015-12-09 15:44+0000\n" +"Last-Translator: Timo Koukkari \n" "Language-Team: Finnish (http://www.transifex.com/odoo/odoo-9/language/fi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1191,7 +1192,7 @@ msgstr "Tileihin kohdistus" #: model:ir.model.fields,field_description:account.field_account_bank_statement_message_needaction #: model:ir.model.fields,field_description:account.field_account_invoice_message_needaction msgid "Action Needed" -msgstr "" +msgstr "Huomiota vaadittu" #. module: account #: model:ir.ui.view,arch_db:account.account_planner @@ -1244,7 +1245,7 @@ msgstr "Dirección" #: model:ir.ui.view,arch_db:account.view_account_tax_template_form #: model:ir.ui.view,arch_db:account.view_tax_form msgid "Advanced Options" -msgstr "" +msgstr "Lisäasetukset" #. module: account #: model:ir.ui.view,arch_db:account.view_account_journal_form @@ -1379,7 +1380,7 @@ msgstr "" msgid "" "All the account entries lines must be processed in order to close the " "statement." -msgstr "" +msgstr "Kaikki tilikirjaukset pitää käsitellä jotta voit sulkea tiliotteen." #. module: account #: model:ir.model.fields,field_description:account.field_account_journal_update_posted @@ -2708,7 +2709,7 @@ msgstr "Maa" #. module: account #: model:ir.model.fields,field_description:account.field_account_fiscal_position_country_group_id msgid "Country Group" -msgstr "" +msgstr "Maaryhmä" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_report_country_id @@ -4226,7 +4227,7 @@ msgstr "Jos valittu, uudet viestit vaativat huomiosi." #: model:ir.model.fields,help:account.field_account_bank_statement_message_needaction #: model:ir.model.fields,help:account.field_account_invoice_message_needaction msgid "If checked, new messages require your attention." -msgstr "" +msgstr "Jos valittu, uudet viestit vaativat huomiosi." #. module: account #: model:ir.model.fields,help:account.field_account_account_template_nocreate @@ -5776,7 +5777,7 @@ msgstr "" #: model:ir.model.fields,help:account.field_account_bank_statement_message_unread_counter #: model:ir.model.fields,help:account.field_account_invoice_message_unread_counter msgid "Number of unread messages" -msgstr "" +msgstr "Lukemattomien viestien määrä" #. module: account #. openerp-web @@ -8906,7 +8907,7 @@ msgstr "" #: model:ir.ui.view,arch_db:account.view_account_invoice_report_search #: model:ir.ui.view,arch_db:account.view_account_supplier_payment_tree msgid "Vendor" -msgstr "" +msgstr "Toimittaja" #. module: account #: selection:account.invoice,type:0 selection:account.invoice.report,type:0 @@ -8946,7 +8947,7 @@ msgstr "" #: model:ir.model.fields,field_description:account.field_account_invoice_reference #: model:ir.ui.view,arch_db:account.invoice_supplier_form msgid "Vendor Reference" -msgstr "" +msgstr "Toimittajan viite" #. module: account #: selection:account.invoice,type:0 selection:account.invoice.report,type:0 @@ -8968,7 +8969,7 @@ msgstr "" #: model:ir.ui.menu,name:account.menu_account_supplier #, python-format msgid "Vendors" -msgstr "" +msgstr "Toimittajat" #. module: account #: selection:account.financial.report,type:0 diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po index b63e0c49240..c96d446868f 100644 --- a/addons/account/i18n/fr.po +++ b/addons/account/i18n/fr.po @@ -9,6 +9,7 @@ # Daniel & Delphine , 2015 # Fabien Pinckaers , 2015 # Hamid Darabi, 2015 +# Ilone Math , 2015 # Loic , 2015 # lucasdeliege , 2015 # Lucas Deliege , 2015 @@ -29,8 +30,8 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-18 08:05+0000\n" -"PO-Revision-Date: 2015-11-25 09:38+0000\n" -"Last-Translator: Maxime Chambreuil \n" +"PO-Revision-Date: 2015-12-09 12:49+0000\n" +"Last-Translator: Frédéric Clementi \n" "Language-Team: French (http://www.transifex.com/odoo/odoo-9/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -7913,7 +7914,7 @@ msgstr "Le \"Type interne\" est utilisé pour des caractéristiques disponibles msgid "" "The Advisors have full access to the Accounting application, \n" " plus access to miscellaneous operations such as salary and asset management." -msgstr "" +msgstr "Les consultants ont un accès complet aux applications comptables,\nainsi qu'à diverses opérations telles que les salaires ou la gestion d'actifs." #. module: account #: model:ir.ui.view,arch_db:account.account_planner diff --git a/addons/account/i18n/gl.po b/addons/account/i18n/gl.po index b822ab855c6..760bca68c9d 100644 --- a/addons/account/i18n/gl.po +++ b/addons/account/i18n/gl.po @@ -3,13 +3,14 @@ # * account # # Translators: +# Jose Manuel , 2015 msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-18 08:05+0000\n" -"PO-Revision-Date: 2015-11-18 08:43+0000\n" -"Last-Translator: Martin Trigaux\n" +"PO-Revision-Date: 2015-12-11 11:46+0000\n" +"Last-Translator: Jose Manuel \n" "Language-Team: Galician (http://www.transifex.com/odoo/odoo-9/language/gl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -90,7 +91,7 @@ msgstr "" #: code:addons/account/static/src/js/account_reconciliation_widgets.js:1500 #, python-format msgid " seconds" -msgstr "" +msgstr "segundos" #. module: account #: model:ir.model.fields,field_description:account.field_account_chart_template_code_digits @@ -193,7 +194,7 @@ msgstr "" #. module: account #: model:ir.ui.view,arch_db:account.partner_view_buttons msgid "Invoiced" -msgstr "" +msgstr "Facturado" #. module: account #: model:ir.ui.view,arch_db:account.account_planner diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po index ae412216f6b..bf3dc231efe 100644 --- a/addons/account/i18n/hr.po +++ b/addons/account/i18n/hr.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-18 08:05+0000\n" -"PO-Revision-Date: 2015-11-21 14:34+0000\n" +"PO-Revision-Date: 2015-12-09 13:55+0000\n" "Last-Translator: Davor Bojkić \n" "Language-Team: Croatian (http://www.transifex.com/odoo/odoo-9/language/hr/)\n" "MIME-Version: 1.0\n" @@ -2758,7 +2758,7 @@ msgstr "" #: code:addons/account/models/account_journal_dashboard.py:213 #, python-format msgid "Create invoice/bill" -msgstr "" +msgstr "Kreiraj račun" #. module: account #. openerp-web @@ -7419,7 +7419,7 @@ msgstr "Prikaži" #. module: account #: model:ir.model.fields,field_description:account.field_account_journal_display_on_footer msgid "Show in Invoices Footer" -msgstr "" +msgstr "Prikaži u podnožju računa" #. module: account #: model:ir.model.fields,field_description:account.field_account_journal_show_on_dashboard diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po index 03b4d1440f8..2a11f849d02 100644 --- a/addons/account/i18n/it.po +++ b/addons/account/i18n/it.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-18 08:05+0000\n" -"PO-Revision-Date: 2015-12-02 10:08+0000\n" +"PO-Revision-Date: 2015-12-08 14:20+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Italian (http://www.transifex.com/odoo/odoo-9/language/it/)\n" "MIME-Version: 1.0\n" @@ -5776,7 +5776,7 @@ msgstr "" #: model:ir.model.fields,help:account.field_account_bank_statement_message_unread_counter #: model:ir.model.fields,help:account.field_account_invoice_message_unread_counter msgid "Number of unread messages" -msgstr "" +msgstr "Numero di messaggi non letti" #. module: account #. openerp-web @@ -8722,7 +8722,7 @@ msgstr "" #: model:ir.model.fields,field_description:account.field_account_bank_statement_message_unread_counter #: model:ir.model.fields,field_description:account.field_account_invoice_message_unread_counter msgid "Unread Messages Counter" -msgstr "" +msgstr "Contatore di messsaggi non letti" #. module: account #. openerp-web diff --git a/addons/account/i18n/ja.po b/addons/account/i18n/ja.po index f8bb7ea3e36..2fdda2fe2c8 100644 --- a/addons/account/i18n/ja.po +++ b/addons/account/i18n/ja.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-18 08:05+0000\n" -"PO-Revision-Date: 2015-11-18 08:43+0000\n" +"PO-Revision-Date: 2015-12-09 09:15+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Japanese (http://www.transifex.com/odoo/odoo-9/language/ja/)\n" "MIME-Version: 1.0\n" @@ -5463,7 +5463,7 @@ msgstr "" #: model:ir.model.fields,help:account.field_account_bank_statement_message_ids #: model:ir.model.fields,help:account.field_account_invoice_message_ids msgid "Messages and communication history" -msgstr "" +msgstr "メッセージとコミュニケーション履歴" #. module: account #: selection:account.journal,type:0 diff --git a/addons/account/i18n/pt.po b/addons/account/i18n/pt.po index 29ba800468e..0404fdd2abc 100644 --- a/addons/account/i18n/pt.po +++ b/addons/account/i18n/pt.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-18 08:05+0000\n" -"PO-Revision-Date: 2015-11-27 13:00+0000\n" +"PO-Revision-Date: 2015-12-08 01:24+0000\n" "Last-Translator: Ricardo Martins \n" "Language-Team: Portuguese (http://www.transifex.com/odoo/odoo-9/language/pt/)\n" "MIME-Version: 1.0\n" @@ -1960,7 +1960,7 @@ msgstr "Gestão de orçamento" #. module: account #: model:ir.ui.menu,name:account.account_reports_business_intelligence_menu msgid "Business Intelligence" -msgstr "Inteligência Empresarial" +msgstr "Análises do Negócio" #. module: account #: model:ir.model.fields,field_description:account.field_account_operation_template_name diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po index 58977c51028..9d417cf39e1 100644 --- a/addons/account/i18n/pt_BR.po +++ b/addons/account/i18n/pt_BR.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-18 08:05+0000\n" -"PO-Revision-Date: 2015-12-04 19:52+0000\n" +"PO-Revision-Date: 2015-12-10 14:14+0000\n" "Last-Translator: Cezar José Sant Anna Junior \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/odoo/odoo-9/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -141,12 +141,12 @@ msgstr "%s (copia)" #. module: account #: model:ir.ui.view,arch_db:account.external_layout_footer msgid "&bull;" -msgstr "" +msgstr "&bull;" #. module: account #: model:ir.ui.view,arch_db:account.account_planner msgid ", if accounting or purchase is installed" -msgstr "" +msgstr ", se contabilidade ou compras está instalado" #. module: account #: code:addons/account/models/account_bank_statement.py:321 @@ -207,7 +207,7 @@ msgid "" " Import a file
\n" " Recommended if >100 products\n" " " -msgstr "" +msgstr "\n\nImportar um arquivo
\nRecomendado se >100 produtos\n" #. module: account #: model:ir.ui.view,arch_db:account.account_planner @@ -217,7 +217,7 @@ msgid "" " Import
\n" " > 200 contacts\n" " " -msgstr "" +msgstr "\n\nImportar
\n> 200 contatos\n" #. module: account #: model:ir.ui.view,arch_db:account.account_planner @@ -227,7 +227,7 @@ msgid "" " Create manually
\n" " < 200 contacts\n" " " -msgstr "" +msgstr "\n\n Criar manualmente
\n< 200 contatos\n" #. module: account #: model:ir.ui.view,arch_db:account.account_planner @@ -237,7 +237,7 @@ msgid "" " Create manually
\n" " Recommended if <100 products\n" " " -msgstr "" +msgstr "\n\n Criar manualmente
\nRecomendado se <100 produtos\n" #. module: account #: model:ir.ui.view,arch_db:account.account_planner @@ -349,7 +349,7 @@ msgstr "" #. module: account #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view msgid "New" -msgstr "" +msgstr "Novo" #. module: account #: model:ir.ui.view,arch_db:account.report_agedpartnerbalance @@ -374,7 +374,7 @@ msgstr "Relatórios" #. module: account #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view msgid "View" -msgstr "" +msgstr "Visualizar" #. module: account #: model:ir.ui.view,arch_db:account.account_planner @@ -444,7 +444,7 @@ msgstr "" #. module: account #: model:ir.ui.view,arch_db:account.report_invoice_document msgid "Comment:" -msgstr "" +msgstr "Comentário:" #. module: account #: model:ir.ui.view,arch_db:account.account_planner @@ -527,7 +527,7 @@ msgstr "" #. module: account #: model:ir.ui.view,arch_db:account.report_invoice_document msgid "Invoice Date:" -msgstr "" +msgstr "Data de Fatura:" #. module: account #: model:ir.ui.view,arch_db:account.report_generalledger @@ -1044,7 +1044,7 @@ msgstr "Tipos de Conta" #. module: account #: model:ir.model.fields,field_description:account.field_account_journal_type_control_ids msgid "Account Types Allowed" -msgstr "" +msgstr "Tipos de Contas Permitidas" #. module: account #: model:ir.model,name:account.model_account_unreconcile @@ -1178,7 +1178,7 @@ msgstr "Contas" #. module: account #: model:ir.model.fields,field_description:account.field_account_journal_account_control_ids msgid "Accounts Allowed" -msgstr "" +msgstr "Contas Permitidas" #. module: account #: model:ir.model,name:account.model_account_fiscal_position_account @@ -1664,12 +1664,12 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_account_journal_at_least_one_inbound msgid "At least one inbound" -msgstr "" +msgstr "Pelo menos uma entrada" #. module: account #: model:ir.model.fields,field_description:account.field_account_journal_at_least_one_outbound msgid "At least one outbound" -msgstr "" +msgstr "Pelo menos uma saída" #. module: account #: selection:res.company,fiscalyear_last_month:0 @@ -3111,7 +3111,7 @@ msgstr "Débito" #. module: account #: model:ir.model.fields,field_description:account.field_account_journal_inbound_payment_method_ids msgid "Debit Methods" -msgstr "" +msgstr "Métodos de Débito" #. module: account #: model:ir.model.fields,field_description:account.field_account_move_line_reconcile_debit @@ -3141,7 +3141,7 @@ msgstr "Dezembro" #. module: account #: model:ir.model.fields,field_description:account.field_account_journal_refund_sequence msgid "Dedicated Refund Sequence" -msgstr "" +msgstr "Seqüência de Reembolso Dedicado" #. module: account #: model:ir.model.fields,field_description:account.field_account_journal_default_credit_account_id @@ -3217,7 +3217,7 @@ msgstr "Obsoleto" #: model:account.account.type,name:account.data_account_type_depreciation #: model:ir.ui.view,arch_db:account.view_account_form msgid "Depreciation" -msgstr "" +msgstr "Depreciação" #. module: account #: model:ir.ui.view,arch_db:account.cash_box_out_form @@ -4019,21 +4019,21 @@ msgstr "" msgid "" "Get your bank statements from you bank and import them through plaid.com.\n" "-that installs the module account_plaid." -msgstr "" +msgstr "Obtenha seus extratos bancários de seu banco e importe-os através do plaid.com.\n-que instala o módulo account_plaid." #. module: account #: model:ir.model.fields,help:account.field_account_config_settings_module_account_bank_statement_import_ofx msgid "" "Get your bank statements from your bank and import them in Odoo in the .OFX format.\n" "This installs the module account_bank_statement_import_ofx." -msgstr "" +msgstr "Obtenha seus extratos bancários de seu banco e importe-os no Odoo no formato .OFX.\n-que instala o módulo account_bank_statement_import_ofx." #. module: account #: model:ir.model.fields,help:account.field_account_config_settings_module_account_bank_statement_import_qif msgid "" "Get your bank statements from your bank and import them in Odoo in the .QIF format.\n" "This installs the module account_bank_statement_import_qif." -msgstr "" +msgstr "Obtenha seus extratos bancários de seu banco e importe-os no Odoo no formato . QIF.\n-que instala o módulo account_bank_statement_import_qif." #. module: account #: model:ir.model.fields,help:account.field_account_config_settings_module_account_yodlee @@ -4277,7 +4277,7 @@ msgstr "Se esta caixa estiver marcada, o sistema irá tentar agrupar as linhas c msgid "" "If you check this box, you will be able to register your payment using SEPA.\n" "-This installs the module account_sepa." -msgstr "" +msgstr "Se você marcar esta caixa, você será capaz de registrar seu pagamento usando SEPA.\n-Isto Instala o módulo account_sepa." #. module: account #: model:ir.model.fields,help:account.field_account_config_settings_module_account_accountant @@ -5210,7 +5210,7 @@ msgid "" "Last time the invoices & payments matching was performed for this partner. " "It is set either if there's not at least an unreconciled debit and an " "unreconciled credit or if you click the \"Done\" button." -msgstr "" +msgstr "A última vez em que a correspondência de faturas e pagamentos foi realizada para este parceiro. Ele é definido se não houver pelo menos um débito não reconciliado e um crédito não reconciliado ou se você clicar no botão \"Concluído\"." #. module: account #: model:ir.model.fields,help:account.field_account_account_last_time_entries_checked @@ -5509,7 +5509,7 @@ msgstr "Mais" #. module: account #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view msgid "More " -msgstr "" +msgstr "Mais " #. module: account #: model:ir.ui.view,arch_db:account.account_planner @@ -6964,7 +6964,7 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_account_journal_refund_sequence_id msgid "Refund Entry Sequence" -msgstr "" +msgstr "Sequência de Reembolso de Entrada" #. module: account #: model:ir.actions.act_window,name:account.action_account_invoice_refund @@ -7008,7 +7008,7 @@ msgstr "Registrar Pagamento" #. module: account #: model:ir.model,name:account.model_account_register_payments msgid "Register payments on multiple invoices" -msgstr "" +msgstr "Registrar pagamentos em várias faturas" #. module: account #: model:ir.ui.view,arch_db:account.account_planner @@ -7399,7 +7399,7 @@ msgstr "Configurações" #. module: account #: model:ir.model.fields,field_description:account.field_account_journal_code msgid "Short Code" -msgstr "" +msgstr "Código Abreviado" #. module: account #: model:ir.ui.view,arch_db:account.view_tax_tree @@ -7416,12 +7416,12 @@ msgstr "Exibir" #. module: account #: model:ir.model.fields,field_description:account.field_account_journal_display_on_footer msgid "Show in Invoices Footer" -msgstr "" +msgstr "Mostrar no Rodapé das Faturas" #. module: account #: model:ir.model.fields,field_description:account.field_account_journal_show_on_dashboard msgid "Show journal on dashboard" -msgstr "" +msgstr "Mostrar diário no dashboard" #. module: account #. openerp-web @@ -8044,7 +8044,7 @@ msgstr "" #. module: account #: model:ir.model.fields,help:account.field_account_journal_code msgid "The journal entries of this journal will be named using this prefix." -msgstr "" +msgstr "Os lançamentos deste diário serão nomeados utilizando esse prefixo." #. module: account #: model:ir.ui.view,arch_db:account.view_payment_term_form @@ -8094,7 +8094,7 @@ msgstr "A conta do parceiro usada para esta fatura" msgid "" "The partner has at least one unreconciled debit and credit since last time " "the invoices & payments matching was performed." -msgstr "" +msgstr "O parceiro tem pelo menos um débito e crédito não reconciliado desde última vez que a correspondência de faturas e pagamentos foi realizada." #. module: account #: code:addons/account/models/account_move.py:782 @@ -8268,7 +8268,7 @@ msgstr "Isto permite automatizar mensagens de cobrança, com diversos níveis de msgid "" "This allows you to group received checks before you deposit them to the bank.\n" "-This installs the module account_batch_deposit." -msgstr "" +msgstr "Isto permite-lhe agrupar cheques recebidos antes de depositá-los para o banco.\n-Isto Instala o módulo account_batch_deposit." #. module: account #: model:ir.model.fields,help:account.field_account_config_settings_complete_tax_set @@ -8838,7 +8838,7 @@ msgstr "" #. module: account #: model:ir.model.fields,help:account.field_account_journal_sequence msgid "Used to order Journals in the dashboard view" -msgstr "" +msgstr "Usado para organizar Diários no dashboard" #. module: account #: model:ir.model.fields,help:account.field_account_journal_loss_account_id @@ -8918,7 +8918,7 @@ msgstr "Fornecedor" #: model:ir.ui.view,arch_db:account.report_invoice_document #, python-format msgid "Vendor Bill" -msgstr "" +msgstr "Conta de Fornecedor" #. module: account #: code:addons/account/models/chart_template.py:156 @@ -8949,7 +8949,7 @@ msgstr "Termos de Pagamento do Fornecedor" #: model:ir.model.fields,field_description:account.field_account_invoice_reference #: model:ir.ui.view,arch_db:account.invoice_supplier_form msgid "Vendor Reference" -msgstr "" +msgstr "Referência de Fornecedor" #. module: account #: selection:account.invoice,type:0 selection:account.invoice.report,type:0 @@ -8958,12 +8958,12 @@ msgstr "" #: model:ir.ui.view,arch_db:account.report_invoice_document #, python-format msgid "Vendor Refund" -msgstr "" +msgstr "Reembolso de Fornecedor" #. module: account #: model:ir.model.fields,field_description:account.field_product_template_supplier_taxes_id msgid "Vendor Taxes" -msgstr "" +msgstr "Impostos do Vendedor" #. module: account #. openerp-web @@ -9040,7 +9040,7 @@ msgstr "" #. module: account #: model:ir.model.fields,help:account.field_account_journal_show_on_dashboard msgid "Whether this journal should be displayed on the dashboard or not" -msgstr "" +msgstr "Se este diário deve ser exibid no dashboard ou não" #. module: account #. openerp-web diff --git a/addons/account/i18n/ro.po b/addons/account/i18n/ro.po index ba4b76d269a..377eb1fc209 100644 --- a/addons/account/i18n/ro.po +++ b/addons/account/i18n/ro.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-18 08:05+0000\n" -"PO-Revision-Date: 2015-12-01 06:24+0000\n" +"PO-Revision-Date: 2015-12-08 05:27+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Romanian (http://www.transifex.com/odoo/odoo-9/language/ro/)\n" "MIME-Version: 1.0\n" @@ -5922,7 +5922,7 @@ msgstr "" #. module: account #: selection:account.invoice,state:0 selection:account.invoice.report,state:0 msgid "Open" -msgstr "" +msgstr "Deschis" #. module: account #. openerp-web diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po index c5c2eda051a..b52a46798f4 100644 --- a/addons/account/i18n/ru.po +++ b/addons/account/i18n/ru.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-18 08:05+0000\n" -"PO-Revision-Date: 2015-11-26 20:51+0000\n" +"PO-Revision-Date: 2015-12-07 18:21+0000\n" "Last-Translator: Viktor Pogrebniak \n" "Language-Team: Russian (http://www.transifex.com/odoo/odoo-9/language/ru/)\n" "MIME-Version: 1.0\n" @@ -9027,7 +9027,7 @@ msgstr "История общения с сайта" #. module: account #: model:ir.ui.view,arch_db:account.account_planner msgid "Welcome" -msgstr "" +msgstr "Добро пожаловать" #. module: account #: model:ir.ui.view,arch_db:account.account_planner diff --git a/addons/account/i18n/sk.po b/addons/account/i18n/sk.po index 8ee0d595ed1..f078e00cb8c 100644 --- a/addons/account/i18n/sk.po +++ b/addons/account/i18n/sk.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-18 08:05+0000\n" -"PO-Revision-Date: 2015-12-01 09:43+0000\n" +"PO-Revision-Date: 2015-12-12 17:40+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Slovak (http://www.transifex.com/odoo/odoo-9/language/sk/)\n" "MIME-Version: 1.0\n" @@ -366,7 +366,7 @@ msgstr "" #. module: account #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view msgid "Reports" -msgstr "" +msgstr "Výkazy" #. module: account #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view @@ -6442,7 +6442,7 @@ msgstr "" #. module: account #: model:ir.ui.view,arch_db:account.view_account_invoice_filter msgid "Period" -msgstr "" +msgstr "Obdobie" #. module: account #: model:ir.model.fields,field_description:account.field_account_aged_trial_balance_period_length @@ -6769,7 +6769,7 @@ msgstr "" #: model:ir.model.fields,field_description:account.field_cash_box_in_name #: model:ir.model.fields,field_description:account.field_cash_box_out_name msgid "Reason" -msgstr "" +msgstr "Dôvod " #. module: account #: model:account.account.type,name:account.data_account_type_receivable @@ -8662,7 +8662,7 @@ msgstr "" #: model:ir.model.fields,field_description:account.field_account_move_line_user_type_id #: model:ir.model.fields,field_description:account.field_account_payment_term_line_value msgid "Type" -msgstr "" +msgstr "Typ" #. module: account #: code:addons/account/models/chart_template.py:738 @@ -8895,7 +8895,7 @@ msgstr "" #. module: account #: model:ir.model.fields,field_description:account.field_account_payment_term_line_value_amount msgid "Value" -msgstr "" +msgstr "Hodnota" #. module: account #: selection:account.abstract.payment,partner_type:0 @@ -8906,7 +8906,7 @@ msgstr "" #: model:ir.ui.view,arch_db:account.view_account_invoice_report_search #: model:ir.ui.view,arch_db:account.view_account_supplier_payment_tree msgid "Vendor" -msgstr "" +msgstr "Predajca" #. module: account #: selection:account.invoice,type:0 selection:account.invoice.report,type:0 @@ -8968,12 +8968,12 @@ msgstr "" #: model:ir.ui.menu,name:account.menu_account_supplier #, python-format msgid "Vendors" -msgstr "" +msgstr "Predajcovia" #. module: account #: selection:account.financial.report,type:0 msgid "View" -msgstr "" +msgstr "Zobrazenie" #. module: account #: model:ir.ui.view,arch_db:account.view_account_config_settings @@ -8985,7 +8985,7 @@ msgstr "" #: code:addons/account/models/account_invoice.py:1161 #, python-format msgid "Warning!" -msgstr "" +msgstr "Varovanie!" #. module: account #: model:ir.ui.view,arch_db:account.account_planner diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po index 138abb02ceb..cd1f1a9271d 100644 --- a/addons/account/i18n/tr.po +++ b/addons/account/i18n/tr.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-18 08:05+0000\n" -"PO-Revision-Date: 2015-12-03 09:32+0000\n" +"PO-Revision-Date: 2015-12-11 13:23+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Turkish (http://www.transifex.com/odoo/odoo-9/language/tr/)\n" "MIME-Version: 1.0\n" @@ -5856,7 +5856,7 @@ msgid "" " to modify them. The invoices will receive a unique\n" " number and journal items will be created in your chart\n" " of accounts." -msgstr "" +msgstr "Taslak faturalar onaylandığında artık faturaları değiştiremeyeceksiniz.\n Faturalar özgün numara alacak ve yevmiye kalemleri\n hesap planınızda oluşturulacaktır." #. module: account #: model:ir.ui.view,arch_db:account.account_planner @@ -6487,7 +6487,7 @@ msgstr "" #: code:addons/account/models/account_invoice.py:660 #, python-format msgid "Please define sequence on the journal related to this invoice." -msgstr "" +msgstr "Bu faturayla ilgili yevmiyeye lütfen bir sıra tanımlayın." #. module: account #: model:ir.ui.view,arch_db:account.view_account_form @@ -6533,7 +6533,7 @@ msgstr "" #: model:ir.actions.act_window,name:account.action_validate_account_move #: model:ir.ui.view,arch_db:account.validate_account_move_view msgid "Post Journal Entries" -msgstr "" +msgstr "Yevmiye Girişleri İşle" #. module: account #: selection:account.move,state:0 selection:account.payment,state:0 @@ -6546,12 +6546,12 @@ msgstr "" #. module: account #: model:ir.ui.view,arch_db:account.view_account_move_filter msgid "Posted Journal Entries" -msgstr "" +msgstr "İşlenmiş Yevmiye Kayıtları" #. module: account #: model:ir.ui.view,arch_db:account.view_account_move_line_filter msgid "Posted Journal Items" -msgstr "" +msgstr "İşlenmiş Yevmiye Öğeleri" #. module: account #: model:ir.model.fields,field_description:account.field_account_chart_template_bank_account_code_prefix @@ -7200,7 +7200,7 @@ msgstr "" #. module: account #: model:ir.ui.view,arch_db:account.view_account_invoice_report_search msgid "Sales Team" -msgstr "" +msgstr "Satış Ekibi" #. module: account #: model:ir.model.fields,field_description:account.field_account_config_settings_sale_tax_rate @@ -7248,7 +7248,7 @@ msgstr "" #. module: account #: model:ir.ui.view,arch_db:account.view_account_move_line_filter msgid "Search Journal Items" -msgstr "" +msgstr "Yevmiye Öğelerini Ara" #. module: account #: model:ir.ui.view,arch_db:account.view_account_move_filter @@ -7487,7 +7487,7 @@ msgstr "" #: code:addons/account/models/account_bank_statement.py:250 #, python-format msgid "Statement %s confirmed, journal items were created." -msgstr "" +msgstr "Hesap özeti %s onaylandı, yevmiye kalemleri oluşturuldu." #. module: account #: model:ir.ui.view,arch_db:account.view_bank_statement_line_form @@ -7986,7 +7986,7 @@ msgstr "" #: model:ir.model.fields,help:account.field_account_invoice_commercial_partner_id msgid "" "The commercial entity that will be used on Journal Entries for this invoice" -msgstr "" +msgstr "Bu faturaya ait Yevmiye Girişlerinde kullanılacak ticari varlık" #. module: account #: model:ir.model.fields,help:account.field_account_journal_currency_id @@ -8132,7 +8132,7 @@ msgid "" "The selected account of your Journal Entry forces to provide a secondary " "currency. You should remove the secondary currency on the account or select " "a multi-currency view on the journal." -msgstr "" +msgstr "yevmiye kaydınızın seçili hesabı farklı bir para biriminde işlemi zorluyor.Bu şekilde giriş yapmak için ya hesaptan para birimini kaldırın ya da yevmiye görünüm türünü çoklu-para birimi olarak seçin." #. module: account #: code:addons/account/models/account_invoice.py:1162 @@ -8251,7 +8251,7 @@ msgstr "" msgid "" "This allows accountants to manage analytic and crossovered budgets. Once the master budgets and the budgets are defined, the project managers can set the planned amount on each analytic account.\n" "-This installs the module account_budget." -msgstr "" +msgstr "Bu modül muhasebecinin analiz bütçe ve aşılmış bütçeleri yönetmenizi sağlar. Ana bütçe ve bütçeler tanımlandıktan sonra proje yöneticisi her analiz hesabına planlanan tutarları yerleştirebilir." #. module: account #: model:ir.model.fields,help:account.field_account_config_settings_module_account_reports_followup @@ -8322,7 +8322,7 @@ msgstr "" msgid "" "This field is used for payable and receivable journal entries. You can put " "the limit date for the payment of this line." -msgstr "" +msgstr "Bu alan borç ve alacak yevmiye kayıtları için kullanılır. Bu satıra ait ödemeye ödeme sınırlama tarihi koyabilirsiniz." #. module: account #: model:ir.model.fields,help:account.field_account_bank_statement_line_partner_name @@ -8710,7 +8710,7 @@ msgstr "" #. module: account #: model:ir.ui.view,arch_db:account.view_account_move_line_filter msgid "Unposted Journal Items" -msgstr "" +msgstr "İşlenmemiş Yevmiye Kalemleri" #. module: account #: model:ir.model.fields,field_description:account.field_account_bank_statement_message_unread @@ -8755,7 +8755,7 @@ msgstr "" #. module: account #: model:ir.ui.view,arch_db:account.view_account_move_line_filter msgid "Unreconciled Journal Items" -msgstr "" +msgstr "Uzlaştırılmamış Yevmiye Öğeleri" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_amount_untaxed @@ -9183,7 +9183,7 @@ msgstr "" msgid "" "You cannot change the owner company of an account that already contains " "journal items." -msgstr "" +msgstr "Hali hazırda yevmiye kalemleri içeren bir hesabın sahibi şirketi değiştiremezsiniz." #. module: account #: code:addons/account/models/account_move.py:997 @@ -9294,7 +9294,7 @@ msgstr "" msgid "" "You cannot use this general account in this journal, check the tab 'Entry " "Controls' on the related journal." -msgstr "" +msgstr "Bu günlükte bu genel hesabı kullanamazsınız, ilgili yevmiye 'Giriş Denetimleri' sekmesini denetleyin." #. module: account #: model:ir.ui.view,arch_db:account.invoice_form diff --git a/addons/account/i18n/uk.po b/addons/account/i18n/uk.po index c048163bd0b..dedb9cc5f65 100644 --- a/addons/account/i18n/uk.po +++ b/addons/account/i18n/uk.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-18 08:05+0000\n" -"PO-Revision-Date: 2015-12-02 13:44+0000\n" -"Last-Translator: Martin Trigaux\n" +"PO-Revision-Date: 2015-12-09 12:23+0000\n" +"Last-Translator: Bogdan\n" "Language-Team: Ukrainian (http://www.transifex.com/odoo/odoo-9/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -120,7 +120,7 @@ msgstr "${object.company_id.name|safe} Рахунок (Ref ${object.number or 'n #: code:addons/account/models/account_bank_statement.py:320 #, python-format msgid "%d transactions were automatically reconciled." -msgstr "%d операцій було проведено автоматично." +msgstr "%d операцій було узгоджено автоматично." #. module: account #: code:addons/account/models/account.py:528 @@ -150,7 +150,7 @@ msgstr ", якщо бухоблік або купівлю встановлено #: code:addons/account/models/account_bank_statement.py:321 #, python-format msgid "1 transaction was automatically reconciled." -msgstr "1 операція проведена автоматично." +msgstr "1 операція узгоджена автоматично." #. module: account #: model:account.payment.term,name:account.account_payment_term_15days @@ -1921,7 +1921,7 @@ msgstr "" #. module: account #: model:res.groups,name:account.group_account_invoice msgid "Billing" -msgstr "Оплата" +msgstr "Оплата постачальникам" #. module: account #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view @@ -6518,7 +6518,7 @@ msgstr "" #. module: account #: model:ir.ui.view,arch_db:account.view_move_form msgid "Post" -msgstr "Допис" +msgstr "Провести" #. module: account #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po index 5b7af2e8f12..7c1c1991d74 100644 --- a/addons/account/i18n/zh_CN.po +++ b/addons/account/i18n/zh_CN.po @@ -24,8 +24,8 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-18 08:05+0000\n" -"PO-Revision-Date: 2015-12-02 07:44+0000\n" -"Last-Translator: Gary Wei \n" +"PO-Revision-Date: 2015-12-11 07:23+0000\n" +"Last-Translator: fausthuang\n" "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -551,7 +551,7 @@ msgstr "分类账:" msgid "" "Mark the bills to pay
\n" " Group or filter your bills to see those due in the next week, then open each bill individually, click on 'Pay' and select the payment method you prefer." -msgstr "标记需要付款的发票
\n 整合或过滤出下周要到期的发票, 然后打开每张发票, 点击 '付款' 选择付款方式." +msgstr "标记待支付的发票
\n 整合或过滤出下周要到期的发票, 然后打开每张发票, 点击 '付款' 选择付款方法." #. module: account #: model:ir.ui.view,arch_db:account.account_planner @@ -723,7 +723,7 @@ msgid "" " payments on a daily basis. You can enter the coins that are in\n" " your cash box, and then post entries when money comes in or\n" " goes out of the cash box." -msgstr "现金登记按钮允许你在现金分类账中管理你的现金条目\n这个特征让你用一种简单的方式操作每天的业务，你可以输入钱箱中的硬币数额，\n然后当从钱箱中拿出或者放入金额的时候对条目进行过账" +msgstr "现金登记按钮允许你在现金分类账中管理你的现金分录\n这个特征让你用一种简单的方式操作每天的业务，你可以输入钱箱中的硬币数额，\n然后当从钱箱中拿出或者放入金额的时候对分录进行过账" #. module: account #: code:addons/account/models/account_invoice.py:1206 @@ -761,7 +761,7 @@ msgstr "银行对账单行是银行科目的一次财政交易" msgid "" "A journal entry consists of several journal items, each of\n" " which is either a debit or a credit transaction." -msgstr "一条分类账条目由几个分类账项目构成，每一条都是一条借或者贷的交易" +msgstr "一条分类账分录由几个分类账项目构成，每一条都是一条借或者贷的交易" #. module: account #: model:ir.actions.act_window,help:account.action_account_journal_form @@ -799,7 +799,7 @@ msgstr "一次反调节至少２次移动" #: code:addons/account/models/account_bank_statement.py:791 #, python-format msgid "A selected move line was already reconciled." -msgstr "选择的条目行早已调节" +msgstr "选择的分录行早已调节" #. module: account #: code:addons/account/models/account_bank_statement.py:224 @@ -824,7 +824,7 @@ msgid "" "A typical company may use one journal per payment method (cash,\n" " bank accounts, checks), one purchase journal, one sale journal\n" " and one for miscellaneous information." -msgstr "一个典型的公司可以根据付款方式（现金，银行账户，支票）用一个分类账，\n一个采购分类账，一个销售分类账，和其他杂项分类账" +msgstr "一个典型的公司可以根据付款方法（现金，银行账户，支票）用一个分类账，\n一个采购分类账，一个销售分类账，和其他杂项分类账" #. module: account #. openerp-web @@ -899,7 +899,7 @@ msgstr "科目目标" #: model:ir.model,name:account.model_account_move #: model:ir.ui.view,arch_db:account.view_move_form msgid "Account Entry" -msgstr "科目条目" +msgstr "科目分录" #. module: account #: model:ir.model.fields,field_description:account.field_res_partner_bank_journal_id @@ -939,7 +939,7 @@ msgstr "账户号码" #. module: account #: model:ir.model.fields,field_description:account.field_res_partner_property_account_payable_id msgid "Account Payable" -msgstr "应付账" +msgstr "应付账款" #. module: account #: model:ir.ui.view,arch_db:account.view_category_property_form @@ -949,7 +949,7 @@ msgstr "科目属性" #. module: account #: model:ir.model.fields,field_description:account.field_res_partner_property_account_receivable_id msgid "Account Receivable" -msgstr "应收科目" +msgstr "应收账款" #. module: account #: model:ir.model,name:account.model_account_financial_report @@ -1014,7 +1014,7 @@ msgstr "科目模板" #: model:ir.model.fields,field_description:account.field_account_chart_template_property_stock_valuation_account_id #: model:ir.model.fields,field_description:account.field_res_company_property_stock_valuation_account_id msgid "Account Template for Stock Valuation" -msgstr "库存估值的科目模板" +msgstr "库存计价的科目模板" #. module: account #: model:ir.actions.act_window,name:account.action_account_template_form @@ -1045,7 +1045,7 @@ msgid "" "Account Type is used for information purpose, to generate country-specific " "legal reports, and set the rules to close a fiscal year and generate opening" " entries." -msgstr "科目类型用于信息目的，生成合乎各国财税规范的报告，以及设置财政年度关闭的规则，并生成开账条目" +msgstr "科目类型用于信息目的，生成合乎各国财税规范的报告，以及设置财政年度关闭的规则，并生成开账分录" #. module: account #: model:ir.actions.act_window,name:account.action_account_type_form @@ -1066,12 +1066,12 @@ msgstr "科目未调节" #. module: account #: model:ir.model,name:account.model_account_move_line_reconcile msgid "Account move line reconcile" -msgstr "分类账条目行调节" +msgstr "分类账分录行调节" #. module: account #: model:ir.model,name:account.model_account_move_line_reconcile_writeoff msgid "Account move line reconcile (writeoff)" -msgstr "分类账条目行对账(销账)" +msgstr "分类账分录行对账(销账)" #. module: account #: model:ir.model,name:account.model_account_move_reversal @@ -1146,7 +1146,7 @@ msgstr "会计配置：一步一步的向导" #. module: account #: model:ir.actions.act_window,name:account.open_account_journal_dashboard_kanban msgid "Accounting Dashboard" -msgstr "会计仪表盘" +msgstr "会计仪表板" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_date @@ -1162,7 +1162,7 @@ msgstr "会计单据" #. module: account #: model:ir.ui.view,arch_db:account.view_partner_property_form msgid "Accounting Entries" -msgstr "分类账条目" +msgstr "分类账分录" #. module: account #: model:ir.model,name:account.model_accounting_report @@ -1206,7 +1206,7 @@ msgstr "科目映射" #: model:ir.model.fields,field_description:account.field_account_bank_statement_message_needaction #: model:ir.model.fields,field_description:account.field_account_invoice_message_needaction msgid "Action Needed" -msgstr "所需行动" +msgstr "所需动作" #. module: account #: model:ir.ui.view,arch_db:account.account_planner @@ -1299,7 +1299,7 @@ msgid "" "then calculates a table of credit balance by start Date. So if you request " "an interval of 30 days Odoo generates an analysis of creditors for the past " "month, past two months, and so on." -msgstr "账龄表是应收款账的明细表. 打开报表，选择公司名字 , 显示开始日，一个间隔一列(按天). Odoo可以计算出开始日后的贷项余额. 如果你设定没30天一个间隔，odoo将生成过去一个月，过去2个月等等的数据分析." +msgstr "账龄表是应收款账的明细表. 打开报表，选择公司名称 , 显示开始日，一个间隔一列(按天). Odoo可以计算出开始日后的贷项余额. 如果你设定没30天一个间隔，odoo将生成过去一个月，过去2个月等等的数据分析." #. module: account #: model:ir.ui.view,arch_db:account.report_agedpartnerbalance @@ -1329,7 +1329,7 @@ msgstr "全部" #: model:ir.ui.view,arch_db:account.report_generalledger #: model:ir.ui.view,arch_db:account.report_trialbalance msgid "All Entries" -msgstr "所有条目" +msgstr "所有分录" #. module: account #: selection:account.aged.trial.balance,target_move:0 @@ -1344,7 +1344,7 @@ msgstr "所有条目" #: model:ir.ui.view,arch_db:account.report_generalledger #: model:ir.ui.view,arch_db:account.report_trialbalance msgid "All Posted Entries" -msgstr "所有已过账条目" +msgstr "所有已过账分录" #. module: account #: model:ir.ui.view,arch_db:account.report_trialbalance @@ -1379,14 +1379,14 @@ msgid "" "journal. In that case, they will behave as journal entries automatically " "created by the system on document validation (invoices, bank statements...) " "and will be created in 'Posted' status." -msgstr "所有手工创建的分类账条目通常为“未登帐”状态，但您可以配置跳过这一状态的选项，这样，系统会自动创建分类账条目的有效凭证（发票、银行对账单...），并且会处于“已登帐”状态。" +msgstr "所有手工创建的分类账分录通常为“未登帐”状态，但您可以配置跳过这一状态的选项，这样，系统会自动创建分类账分录的有效凭证（发票、银行对账单...），并且会处于“已登帐”状态。" #. module: account #: model:ir.ui.view,arch_db:account.validate_account_move_view msgid "" "All selected journal entries will be validated and posted. You won't be able" " to modify them afterwards." -msgstr "所有的分类账条目被确认和过账，随后你将不能更改" +msgstr "所有的分类账分录被确认和过账，随后你将不能更改" #. module: account #: code:addons/account/models/account_bank_statement.py:246 @@ -1394,12 +1394,12 @@ msgstr "所有的分类账条目被确认和过账，随后你将不能更改" msgid "" "All the account entries lines must be processed in order to close the " "statement." -msgstr "所有的分类账条目必须被处理，这样才能关闭结算单" +msgstr "所有的分类账分录必须被处理，这样才能关闭结算单" #. module: account #: model:ir.model.fields,field_description:account.field_account_journal_update_posted msgid "Allow Cancelling Entries" -msgstr "允许取消条目" +msgstr "允许取消分录" #. module: account #: model:ir.model.fields,field_description:account.field_account_account_template_reconcile @@ -1581,7 +1581,7 @@ msgstr "分析成本" #. module: account #: model:ir.ui.menu,name:account.menu_action_analytic_lines_tree msgid "Analytic Entries" -msgstr "分析条目" +msgstr "分析分录" #. module: account #: model:ir.model,name:account.model_account_analytic_line @@ -1830,12 +1830,12 @@ msgstr "银行同步" #. module: account #: model:ir.ui.view,arch_db:account.view_account_operation_template_tree msgid "Bank Reconciliation Move Presets" -msgstr "银行调节条目预制" +msgstr "银行调节分录预制" #. module: account #: model:ir.ui.view,arch_db:account.view_account_operation_template_search msgid "Bank Reconciliation Move preset" -msgstr "银行调节条目预制" +msgstr "银行调节分录预制" #. module: account #: model:ir.model,name:account.model_account_bank_statement @@ -1889,7 +1889,7 @@ msgstr "银行和现金" #. module: account #: model:ir.model.fields,field_description:account.field_account_move_statement_line_id msgid "Bank statement line reconciled with this entry" -msgstr "和这条目调节的银行对账单行" +msgstr "和这分录调节的银行对账单行" #. module: account #: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement @@ -2044,7 +2044,7 @@ msgstr "取消账单" #. module: account #: model:ir.ui.view,arch_db:account.view_move_form msgid "Cancel Entry" -msgstr "取消条目" +msgstr "取消分录" #. module: account #: model:ir.ui.view,arch_db:account.invoice_form @@ -2099,13 +2099,13 @@ msgstr "这部分不能自动形成顺序.\n在这个部分的分类账里配置 #: code:addons/account/models/account_move.py:164 #, python-format msgid "Cannot create moves for different companies." -msgstr "不能创建不同公司的条目" +msgstr "不能创建不同公司的分录" #. module: account #: code:addons/account/models/account_move.py:192 #, python-format msgid "Cannot create unbalanced journal entry." -msgstr "不能创建不平衡的分类账条目" +msgstr "不能创建不平衡的分类账分录" #. module: account #: code:addons/account/models/account_invoice.py:446 @@ -2320,7 +2320,7 @@ msgstr "如果你不想共用发票和红字发票的序列号, 请选择这个 msgid "" "Check this box if you want to allow the cancellation the entries related to " "this journal or of the invoice related to this journal" -msgstr "则此分类账下的分类账条目或发票可以被作废，勾选此项。" +msgstr "则此分类账下的分类账分录或发票可以被作废，勾选此项。" #. module: account #: model:ir.model.fields,help:account.field_account_tax_price_include @@ -2334,7 +2334,7 @@ msgstr "勾选, 如果您使用的产品和发票价格含税." #: model:ir.model.fields,help:account.field_account_account_template_reconcile msgid "" "Check this option if you want the user to reconcile entries in this account." -msgstr "勾选此项, 如果您想用户在这科目对账条目。" +msgstr "勾选此项, 如果您想用户在这科目对账分录。" #. module: account #: model:ir.model.fields,field_description:account.field_account_tax_children_tax_ids @@ -2386,7 +2386,7 @@ msgstr "点击去创建一个客户发票" #. module: account #: model:ir.actions.act_window,help:account.action_move_journal_line msgid "Click to create a journal entry." -msgstr "点击去创建一个分类账条目" +msgstr "点击去创建一个分类账分录" #. module: account #: model:ir.actions.act_window,help:account.action_view_bank_statement_tree @@ -2576,7 +2576,7 @@ msgstr "撰写电子邮件" msgid "" "Compute the counter part accounts of this journal item for this journal " "entry. This can be needed in reports." -msgstr "计算这张分类账条目的配对科目，报表中需要这样" +msgstr "计算这张分类账分录的配对科目，报表中需要这样" #. module: account #: model:ir.model.fields,field_description:account.field_account_bank_statement_balance_end @@ -2674,7 +2674,7 @@ msgstr "已确认" msgid "" "Confirming this will create automatically a journal entry with the " "difference in the profit/loss account set on the cash journal." -msgstr "确认这个之后就会自动创建一个带有在现金分类账中设置的损益科目的差异的分类账条目" +msgstr "确认这个之后就会自动创建一个带有在现金分类账中设置的损益科目的差异的分类账分录" #. module: account #. openerp-web @@ -2836,7 +2836,7 @@ msgstr "创建你的产品" #: model:ir.model.fields,field_description:account.field_validate_account_move_create_uid #: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts_create_uid msgid "Created by" -msgstr "创建于" +msgstr "创建人" #. module: account #: model:ir.model.fields,field_description:account.field_account_account_create_date @@ -2893,7 +2893,7 @@ msgstr "创建于" #: model:ir.model.fields,field_description:account.field_validate_account_move_create_date #: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts_create_date msgid "Created on" -msgstr "创建于" +msgstr "创建时间" #. module: account #: model:ir.model.fields,field_description:account.field_account_move_line_credit @@ -3064,7 +3064,7 @@ msgstr "客户" #. module: account #: model:ir.ui.menu,name:account.menu_board_journal_1 msgid "Dashboard" -msgstr "仪表盘" +msgstr "仪表板" #. module: account #. openerp-web @@ -3223,7 +3223,7 @@ msgstr "定义" #. module: account #: model:ir.model.fields,field_description:account.field_account_account_deprecated msgid "Deprecated" -msgstr "反对" +msgstr "废弃" #. module: account #: model:account.account.type,name:account.data_account_type_depreciation @@ -3603,39 +3603,39 @@ msgstr "好好体验Odoo吧" #. module: account #: model:ir.actions.act_window,name:account.action_move_line_form msgid "Entries" -msgstr "条目" +msgstr "分录" #. module: account #: code:addons/account/models/account_move.py:778 #, python-format msgid "Entries are not of the same account!" -msgstr "不同科目的条目" +msgstr "不同科目的分录" #. module: account #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view msgid "Entries to Review" -msgstr "待查看的条目" +msgstr "待查看的分录" #. module: account #: code:addons/account/models/account_analytic_line.py:55 #, python-format msgid "Entries: " -msgstr "条目： " +msgstr "分录： " #. module: account #: model:ir.ui.view,arch_db:account.report_generalledger msgid "Entry Label" -msgstr "条目标签" +msgstr "分录标签" #. module: account #: model:ir.model.fields,field_description:account.field_account_journal_sequence_id msgid "Entry Sequence" -msgstr "条目序列" +msgstr "分录序列" #. module: account #: model:ir.model.fields,field_description:account.field_account_bank_statement_move_line_ids msgid "Entry lines" -msgstr "条目行" +msgstr "分录行" #. module: account #: model:account.account.type,name:account.data_account_type_equity @@ -3669,7 +3669,7 @@ msgstr "汇率损益分类账" #. module: account #: model:ir.model.fields,field_description:account.field_account_move_rate_diff_partial_rec_id msgid "Exchange Rate Entry of" -msgstr "汇率条目" +msgstr "汇率分录" #. module: account #: model:ir.ui.view,arch_db:account.account_planner @@ -3946,7 +3946,7 @@ msgstr "强制这个科目所有的移动拥有这个科目的币别" #: model:ir.model.fields,help:account.field_account_account_template_currency_id #: model:ir.model.fields,help:account.field_account_bank_accounts_wizard_currency_id msgid "Forces all moves for this account to have this secondary currency." -msgstr "强制将这科目的所有条目转为第二币别。" +msgstr "强制将这科目的所有分录转为第二币别。" #. module: account #: code:addons/account/models/account_invoice.py:75 @@ -4014,7 +4014,7 @@ msgstr "总账报告" #. module: account #: model:ir.model.fields,help:account.field_account_config_settings_module_account_tax_cash_basis msgid "Generate tax cash basis entrie when reconciliating entries" -msgstr "当反调节条目的时候生成以现金为基础的税的条目" +msgstr "当反调节分录的时候生成以现金为基础的税的分录" #. module: account #: model:ir.model.fields,field_description:account.field_account_config_settings_module_account_reports @@ -4141,14 +4141,14 @@ msgstr "有完结的" #. module: account #: model:ir.model.fields,field_description:account.field_res_partner_has_unreconciled_entries msgid "Has unreconciled entries" -msgstr "有未调节条目" +msgstr "有未调节分录" #. module: account #: model:ir.model.fields,field_description:account.field_account_abstract_payment_hide_payment_method #: model:ir.model.fields,field_description:account.field_account_payment_hide_payment_method #: model:ir.model.fields,field_description:account.field_account_register_payments_hide_payment_method msgid "Hide payment method" -msgstr "隐藏付款方式" +msgstr "隐藏付款方法" #. module: account #: model:ir.ui.view,arch_db:account.view_account_form @@ -4252,7 +4252,7 @@ msgstr "如果选中，在新的科目表中默认将不包含此项。" #. module: account #: model:ir.model.fields,help:account.field_account_move_reversal_journal_id msgid "If empty, uses the journal of the journal entry to be reversed." -msgstr "如果为空，用预留条目的分类账" +msgstr "如果为空，用预留分录的分类账" #. module: account #: model:ir.model.fields,help:account.field_account_tax_include_base_amount @@ -4275,7 +4275,7 @@ msgstr "如果设置，根据这个税计算出来的总额将被赋给发票行 msgid "" "If the active field is set to False, it will allow you to hide the payment " "term without removing it." -msgstr "如果配置为false，该付款方式将会被隐藏。" +msgstr "如果配置为false，该付款方法将会被隐藏。" #. module: account #: model:ir.model.fields,help:account.field_account_journal_group_invoice_lines @@ -4351,7 +4351,7 @@ msgid "" " generation of accounting entries. If you keep the payment term and the due " "date empty, it means direct payment. The payment term may compute several " "due dates, for example 50% now, 50% in one month." -msgstr "如果您使用付款条款, 生成条目将自动开始计算到期日. 如果您的付款条款和到期日为空, 则意味着直接付款. 付款条款可以计算出几个到期日, 例如:现付50%, 然后一个月内支付余下的50%." +msgstr "如果您使用付款条款, 生成分录将自动开始计算到期日. 如果您的付款条款和到期日为空, 则意味着直接付款. 付款条款可以计算出几个到期日, 例如:现付50%, 然后一个月内支付余下的50%." #. module: account #: model:ir.model.fields,help:account.field_account_invoice_date_due @@ -4361,7 +4361,7 @@ msgid "" "dates, for example 50% now and 50% in one month, but if you want to force a " "due date, make sure that the payment term is not set on the invoice. If you " "keep the payment term and the due date empty, it means direct payment." -msgstr "如果您使用付款条款，到期日会在分类账条目产生时自动产生。付款条款可能产生几个到期日，例如现付50%，一月内付余下的50%。但是如果您想强制一个到期日，要确保此发票没有设定支付表款。如果您没有设定付款条款且发票的到期日为空，就意味着立即支付。" +msgstr "如果您使用付款条款，到期日会在分类账分录产生时自动产生。付款条款可能产生几个到期日，例如现付50%，一月内付余下的50%。但是如果您想强制一个到期日，要确保此发票没有设定支付表款。如果您没有设定付款条款且发票的到期日为空，就意味着立即支付。" #. module: account #: model:ir.ui.view,arch_db:account.account_planner @@ -4521,7 +4521,7 @@ msgstr "附加信息" #: model:ir.model.fields,field_description:account.field_account_chart_template_property_stock_account_input_categ_id #: model:ir.model.fields,field_description:account.field_res_company_property_stock_account_input_categ_id msgid "Input Account for Stock Valuation" -msgstr "为库存估值输入科目" +msgstr "为库存计价输入科目" #. module: account #: model:ir.ui.view,arch_db:account.account_planner @@ -4775,7 +4775,7 @@ msgstr "它将作为一个默认的借方科目" msgid "" "It indicates that the invoice has been paid and the journal entry of the " "invoice has been reconciled with one or several journal entries of payment." -msgstr "此字段表示发票已付款，也就是说这张发票对应的分类账条目与一张或几张付款对应的分类账条目已调节。" +msgstr "此字段表示发票已付款，也就是说这张发票对应的分类账分录与一张或几张付款对应的分类账分录已调节。" #. module: account #: model:ir.model.fields,help:account.field_account_invoice_sent @@ -4821,7 +4821,7 @@ msgstr "斜体（小一些）" #. module: account #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view msgid "Items" -msgstr "翻译项" +msgstr "项目" #. module: account #: model:ir.ui.view,arch_db:account.report_generalledger @@ -4869,12 +4869,12 @@ msgstr "分类账 & 业务伙伴" #: model:ir.ui.view,arch_db:account.view_account_journal_form #: model:ir.ui.view,arch_db:account.view_move_tree msgid "Journal Entries" -msgstr "分类账条目" +msgstr "分类账分录" #. module: account #: model:ir.ui.view,arch_db:account.view_account_move_filter msgid "Journal Entries by Month" -msgstr "分类账条目按月（排序）" +msgstr "分类账分录按月（排序）" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_move_id @@ -4882,7 +4882,7 @@ msgstr "分类账条目按月（排序）" #: model:ir.model.fields,field_description:account.field_account_move_line_move_id #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view msgid "Journal Entry" -msgstr "分类账条目" +msgstr "分类账分录" #. module: account #: model:ir.model,name:account.model_account_move_line @@ -4974,12 +4974,12 @@ msgstr "六月" #. module: account #: model:ir.model.fields,field_description:account.field_account_journal_kanban_dashboard msgid "Kanban dashboard" -msgstr "看板　仪表盘" +msgstr "看板　仪表板" #. module: account #: model:ir.model.fields,field_description:account.field_account_journal_kanban_dashboard_graph msgid "Kanban dashboard graph" -msgstr "看板　仪表盘　图标" +msgstr "看板　仪表板　图标" #. module: account #: model:ir.ui.view,arch_db:account.view_account_journal_form @@ -5147,7 +5147,7 @@ msgstr "最后调节 :" #: model:ir.model.fields,field_description:account.field_validate_account_move_write_uid #: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts_write_uid msgid "Last Updated by" -msgstr "最后更新" +msgstr "最后更新人" #. module: account #: model:ir.model.fields,field_description:account.field_account_account_tag_write_date @@ -5204,7 +5204,7 @@ msgstr "最后更新" #: model:ir.model.fields,field_description:account.field_validate_account_move_write_date #: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts_write_date msgid "Last Updated on" -msgstr "最后更新" +msgstr "最后更新时间" #. module: account #: selection:account.payment.term.line,option:0 @@ -5321,7 +5321,7 @@ msgstr "非顾问的锁定日期" #. module: account #: model:ir.ui.view,arch_db:account.view_account_config_settings msgid "Lock Entries" -msgstr "锁定条目" +msgstr "锁定分录" #. module: account #: model:ir.ui.view,arch_db:account.account_planner @@ -5443,7 +5443,7 @@ msgid "" "Means of payment for collecting money. Odoo modules offer various payments " "handling facilities, but you can always use the 'Manual' payment method in " "order to manage payments outside of the software." -msgstr "意味着用来收钱的付款。Odoo模块提供各种各样的付款处理工具，但是你也可以一直在系统外用手工的付款方式管理付款" +msgstr "意味着用来收钱的付款。Odoo模块提供各种各样的付款处理工具，但是你也可以一直在系统外用手工的付款方法管理付款" #. module: account #: model:ir.model.fields,help:account.field_account_journal_outbound_payment_method_ids @@ -5451,7 +5451,7 @@ msgid "" "Means of payment for sending money. Odoo modules offer various payments " "handling facilities, but you can always use the 'Manual' payment method in " "order to manage payments outside of the software." -msgstr "意味着用来付钱的付款。Odoo模块提供各种各样的付款处理工具，但是你也可以一直在系统外用手工的付款方式管理付款" +msgstr "意味着用来付钱的付款。Odoo模块提供各种各样的付款处理工具，但是你也可以一直在系统外用手工的付款方法管理付款" #. module: account #: model:ir.model.fields,field_description:account.field_account_abstract_payment_communication @@ -5536,12 +5536,12 @@ msgstr "许多币别已经被默认创建。如果你打算用其中的一些， #: model:ir.ui.view,arch_db:account.view_account_move_filter #: model:ir.ui.view,arch_db:account.view_account_move_line_filter msgid "Move" -msgstr "条目" +msgstr "分录" #. module: account #: model:ir.model.fields,field_description:account.field_account_analytic_line_move_id msgid "Move Line" -msgstr "条目行" +msgstr "分录行" #. module: account #: model:ir.model.fields,field_description:account.field_account_payment_move_line_ids @@ -5658,7 +5658,7 @@ msgstr "没有跟进" #: code:addons/account/models/account_invoice.py:925 #, python-format msgid "No appropriate payment method enabled on journal %s" -msgstr "分类账%s中没有合适的付款方式" +msgstr "分类账%s中没有合适的付款方法" #. module: account #: selection:account.financial.report,display_detail:0 @@ -5831,7 +5831,7 @@ msgid "" " document: invoice, refund, vendor payment, bank statements,\n" " etc. So, you should record journal entries manually only/mainly\n" " for miscellaneous operations." -msgstr "Odoo会自动的根据分类账条目：发票，退款，供应商付款，银行对账单等等创建分类账条目。所以，你应该只对杂项操作手工的记录分类账条目" +msgstr "Odoo会自动的根据分类账分录：发票，退款，供应商付款，银行对账单等等创建分类账分录。所以，你应该只对杂项操作手工的记录分类账分录" #. module: account #: model:ir.ui.view,arch_db:account.account_planner @@ -5886,7 +5886,7 @@ msgid "" "Once your bank accounts are registered, you will be able \n" " to access your statements from the Accounting Dashboard. \n" " The available methods for synchronization are as follows." -msgstr "一旦你的银行账户被注册，你将可以从快译仪表盘登陆你的报表可用的同步方式如下：" +msgstr "一旦你的银行账户被注册，你将可以从快译仪表板登陆你的报表可用的同步方式如下：" #. module: account #: model:ir.ui.view,arch_db:account.account_planner @@ -5947,7 +5947,7 @@ msgstr "打开付款" #. module: account #: model:ir.actions.client,name:account.action_client_account_menu msgid "Open account dashboard menu" -msgstr "打开账户仪表盘菜单" +msgstr "打开账户仪表板菜单" #. module: account #. openerp-web @@ -6005,20 +6005,20 @@ msgstr "发起人税" #. module: account #: model:account.account.type,name:account.data_account_type_other_income msgid "Other Income" -msgstr "其余营收" +msgstr "其他营收" #. module: account #: model:ir.ui.view,arch_db:account.invoice_form #: model:ir.ui.view,arch_db:account.invoice_supplier_form msgid "Other Info" -msgstr "其余信息" +msgstr "其他信息" #. module: account #. openerp-web #: code:addons/account/static/src/xml/account_reconciliation.xml:296 #, python-format msgid "OtherAccounts" -msgstr "其余科目" +msgstr "其他科目" #. module: account #: selection:account.payment.method,payment_type:0 @@ -6029,7 +6029,7 @@ msgstr "境外" #: model:ir.model.fields,field_description:account.field_account_chart_template_property_stock_account_output_categ_id #: model:ir.model.fields,field_description:account.field_res_company_property_stock_account_output_categ_id msgid "Output Account for Stock Valuation" -msgstr "库存估值的输出账户" +msgstr "库存计价的输出账户" #. module: account #: model:ir.ui.view,arch_db:account.account_planner @@ -6072,7 +6072,7 @@ msgstr "逾期付款消息" #. module: account #: model:ir.ui.view,arch_db:account.view_account_invoice_filter msgid "Overdue invoices, maturity date passed" -msgstr "过期发票，过了付款期" +msgstr "到期发票，过了付款期" #. module: account #: model:ir.ui.menu,name:account.menu_finance_legal_statement @@ -6246,20 +6246,20 @@ msgstr "差异付款" #: model:ir.model.fields,field_description:account.field_account_register_payments_journal_id #: model:ir.ui.view,arch_db:account.view_account_payment_search msgid "Payment Method" -msgstr "付款方式" +msgstr "付款方法" #. module: account #. openerp-web #: code:addons/account/static/src/xml/account_payment.xml:60 #, python-format msgid "Payment Method:" -msgstr "付款方式" +msgstr "付款方法" #. module: account #: model:ir.model,name:account.model_account_payment_method #: model:ir.model.fields,field_description:account.field_account_journal_outbound_payment_method_ids msgid "Payment Methods" -msgstr "付款方式" +msgstr "付款方法" #. module: account #: model:ir.model.fields,field_description:account.field_account_invoice_reference_type @@ -6344,7 +6344,7 @@ msgstr "付款条款：立即付款" #. module: account #: model:ir.model.fields,help:account.field_account_move_line_payment_id msgid "Payment that created this entry" -msgstr "创建了这条条目的付款" +msgstr "创建了这条分录的付款" #. module: account #: model:ir.model.fields,field_description:account.field_account_payment_method_payment_type @@ -6376,7 +6376,7 @@ msgstr "匹配付款" msgid "" "Payments are used to register liquidity movements (send, collect or transfer money).\n" " You can then process those payments by your own means or by using installed facilities." -msgstr "付款用来登记流动性的（付，收或者转移钱）。\n你可以自己用安装的工具操作这些付款" +msgstr "付款用来登记流动性的（付，收或者调拨钱）。\n你可以自己用安装的工具操作这些付款" #. module: account #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view @@ -6527,7 +6527,7 @@ msgstr "加上非流动资产" #. module: account #: model:ir.ui.view,arch_db:account.view_account_form msgid "Plus Other Income" -msgstr "加上其余收入" +msgstr "加上其他收入" #. module: account #: model:ir.ui.view,arch_db:account.view_move_form @@ -6537,7 +6537,7 @@ msgstr "记账" #. module: account #: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view msgid "Post All Entries" -msgstr "给所有条目过账" +msgstr "给所有分录过账" #. module: account #: model:ir.ui.view,arch_db:account.view_account_payment_invoice_form @@ -6548,7 +6548,7 @@ msgstr "给差异过账" #: model:ir.actions.act_window,name:account.action_validate_account_move #: model:ir.ui.view,arch_db:account.validate_account_move_view msgid "Post Journal Entries" -msgstr "分类账条目过账" +msgstr "分类账分录过账" #. module: account #: selection:account.move,state:0 selection:account.payment,state:0 @@ -6556,12 +6556,12 @@ msgstr "分类账条目过账" #: model:ir.ui.view,arch_db:account.view_account_move_line_filter #: model:ir.ui.view,arch_db:account.view_account_payment_search msgid "Posted" -msgstr "已记账" +msgstr "已过账" #. module: account #: model:ir.ui.view,arch_db:account.view_account_move_filter msgid "Posted Journal Entries" -msgstr "过账分类账条目" +msgstr "过账分类账分录" #. module: account #: model:ir.ui.view,arch_db:account.view_account_move_line_filter @@ -6599,7 +6599,7 @@ msgstr "保持余额标识" #: model:ir.model,name:account.model_account_operation_template msgid "" "Preset to create journal entries during a invoices and payments matching" -msgstr "请在发票和付款匹配期间创建分类账条目" +msgstr "请在发票和付款匹配期间创建分类账分录" #. module: account #: model:ir.ui.view,arch_db:account.report_invoice_document @@ -6839,7 +6839,7 @@ msgstr "调节" #. module: account #: model:ir.actions.act_window,name:account.action_view_account_move_line_reconcile msgid "Reconcile Entries" -msgstr "调节条目" +msgstr "调节分录" #. module: account #: model:ir.ui.view,arch_db:account.view_account_move_line_reconcile_full @@ -6899,7 +6899,7 @@ msgstr "对账" #. module: account #: model:ir.ui.view,arch_db:account.account_planner msgid "Reconciling journal entries" -msgstr "对账分类账条目" +msgstr "对账分类账分录" #. module: account #: selection:account.journal,bank_statements_source:0 @@ -6976,7 +6976,7 @@ msgstr "退款日期" #. module: account #: model:ir.model.fields,field_description:account.field_account_journal_refund_sequence_id msgid "Refund Entry Sequence" -msgstr "退款条目序列" +msgstr "退款分录序列" #. module: account #: model:ir.actions.act_window,name:account.action_account_invoice_refund @@ -7134,7 +7134,7 @@ msgstr "撤销日期" #. module: account #: model:ir.ui.view,arch_db:account.view_move_form msgid "Reverse Entry" -msgstr "撤销条目" +msgstr "撤销分录" #. module: account #: code:addons/account/wizard/account_move_reversal.py:20 @@ -7293,7 +7293,7 @@ msgid "" "customer or vendor payments. Select 'General' for miscellaneous operations " "journals. Select 'Opening/Closing Situation' for entries generated for new " "fiscal years." -msgstr "给客户发票分类账选择‘销售’，　给供应商发票选‘采购’，在客户或者供应商付款的分类账中选择‘现金’或者‘银行’。给‘其余操作’的分类账选择‘通用’。给因为新‘财政年’生成的条目的分类账选择‘Opening/Closing Situation’" +msgstr "给客户发票分类账选择‘销售’，　给供应商发票选‘采购’，在客户或者供应商付款的分类账中选择‘现金’或者‘银行’。给‘其他操作’的分类账选择‘通用’。给因为新‘财政年’生成的分录的分类账选择‘Opening/Closing Situation’" #. module: account #. openerp-web @@ -7433,7 +7433,7 @@ msgstr "在发票页脚显示" #. module: account #: model:ir.model.fields,field_description:account.field_account_journal_show_on_dashboard msgid "Show journal on dashboard" -msgstr "在仪表盘中显示分类账" +msgstr "在仪表板中显示分类账" #. module: account #. openerp-web @@ -7815,7 +7815,7 @@ msgstr "技术领域中使用的，以适应该接口所选择的支付类型。 msgid "" "Technical field used to hide the payment method if the selected journal has " "only one available which is 'manual'" -msgstr "技术领域用于隐藏的付款方式，如果选择的分类账只有一个可用的是“手动”" +msgstr "技术领域用于隐藏的付款方法，如果选择的分类账只有一个可用的是“手动”" #. module: account #: model:ir.model.fields,help:account.field_account_move_rate_diff_partial_rec_id @@ -7934,7 +7934,7 @@ msgstr "会计分类账和银行科目保持一致" msgid "" "The amount expressed in an optional other currency if it is a multi-currency" " entry." -msgstr "如果是多币别的条目，币别会用另外一个选项的币别呈现" +msgstr "如果是多币别的分录，币别会用另外一个选项的币别呈现" #. module: account #: model:ir.model.fields,help:account.field_account_analytic_line_amount_currency @@ -7964,7 +7964,7 @@ msgstr "一个群组中的税的应用范围必须和群组的设置一样或者 #, python-format msgid "" "The bank account of a bank journal must belong to the same company (%s)." -msgstr "银行条目的银行科目必须属于同一公司(%s)" +msgstr "银行分录的银行科目必须属于同一公司(%s)" #. module: account #: code:addons/account/models/account_bank_statement.py:786 @@ -8001,7 +8001,7 @@ msgstr "每个公司的科目代码都是独一的" #: model:ir.model.fields,help:account.field_account_invoice_commercial_partner_id msgid "" "The commercial entity that will be used on Journal Entries for this invoice" -msgstr "被用在这张发票的条目上的商务实体" +msgstr "被用在这张发票的分录上的商务实体" #. module: account #: model:ir.model.fields,help:account.field_account_journal_currency_id @@ -8056,7 +8056,7 @@ msgstr "分类账%s 没有序列号，请定义一个" #. module: account #: model:ir.model.fields,help:account.field_account_journal_code msgid "The journal entries of this journal will be named using this prefix." -msgstr "这个分类账中的条目会被用这个前缀命名" +msgstr "这个分类账中的分录会被用这个前缀命名" #. module: account #: model:ir.ui.view,arch_db:account.view_payment_term_form @@ -8068,7 +8068,7 @@ msgstr "为保证全部总量被分配，最后一行的计算类型应该是 \" #. module: account #: model:ir.model.fields,help:account.field_account_move_line_move_id msgid "The move of this entry line." -msgstr "这条条目行的移动" +msgstr "这条分录行的移动" #. module: account #: model:ir.ui.view,arch_db:account.account_planner @@ -8087,7 +8087,7 @@ msgstr "科目移动行的名称" #: model:ir.model.fields,help:account.field_account_bank_statement_line_currency_id #: model:ir.model.fields,help:account.field_account_move_line_currency_id msgid "The optional other currency if it is a multi-currency entry." -msgstr "多币别条目的另外币别选项" +msgstr "多币别分录的另外币别选项" #. module: account #: model:ir.model.fields,help:account.field_account_move_line_quantity @@ -8147,7 +8147,7 @@ msgid "" "The selected account of your Journal Entry forces to provide a secondary " "currency. You should remove the secondary currency on the account or select " "a multi-currency view on the journal." -msgstr "你的条目的被选择的总量强制提供第二种币别你需要在科目上移除第二币别或者在分类账上选择多币别视图" +msgstr "你的分录的被选择的总量强制提供第二种币别你需要在科目上移除第二币别或者在分类账上选择多币别视图" #. module: account #: code:addons/account/models/account_invoice.py:1162 @@ -8317,14 +8317,14 @@ msgstr "这个公司有它自己的科目表" msgid "" "This field contains the information related to the numbering of the journal " "entries of this journal." -msgstr "这个字段包含和这个分类账中条目数量相关的信息" +msgstr "这个字段包含和这个分类账中分录数量相关的信息" #. module: account #: model:ir.model.fields,help:account.field_account_journal_refund_sequence_id msgid "" "This field contains the information related to the numbering of the refund " "entries of this journal." -msgstr "这个字段包含和这个分类账的退款条目的数量相关的信息" +msgstr "这个字段包含和这个分类账的退款分录的数量相关的信息" #. module: account #: model:ir.model.fields,help:account.field_account_operation_template_journal_id @@ -8337,7 +8337,7 @@ msgstr "这一字段在银行报表的反调节中被忽略掉" msgid "" "This field is used for payable and receivable journal entries. You can put " "the limit date for the payment of this line." -msgstr "这一字段被用在应收应付的分类账条目你可以在这行放置付款的限定日期" +msgstr "这一字段被用在应收应付的分类账分录你可以在这行放置付款的限定日期" #. module: account #: model:ir.model.fields,help:account.field_account_bank_statement_line_partner_name @@ -8359,7 +8359,7 @@ msgstr "这条向导将会帮你开启Odoo的会计，一旦你完成，你将 msgid "" "This is the accounting dashboard. If you have not yet\n" " installed a chart of account, please install one first." -msgstr "这是财务仪表盘，如果你还没有安装科目表，请先安装一个" +msgstr "这是财务仪表板，如果你还没有安装科目表，请先安装一个" #. module: account #: code:addons/account/models/account.py:304 @@ -8461,7 +8461,7 @@ msgstr "这一技术领域可用于报表行创建/导入时间 为了避免稍 msgid "" "This wizard will validate all journal entries selected. Once journal entries" " are validated, you can not update them anymore." -msgstr "这个向导会审核所有选择的分类账条目. 一旦条目被审核，就再也不能更改" +msgstr "这个向导会审核所有选择的分类账分录. 一旦分录被审核，就再也不能更改" #. module: account #: model:ir.actions.act_window,help:account.action_account_operation_template @@ -8509,7 +8509,7 @@ msgstr "当给公司开发票用到税的时候，Odoo用到了“财政位置 #: code:addons/account/models/account_move.py:776 #, python-format msgid "To reconcile the entries company should be the same for all entries!" -msgstr "所有条目的调节都是成对的条目" +msgstr "所有分录的调节都是成对的分录" #. module: account #: model:ir.ui.view,arch_db:account.account_planner @@ -8720,7 +8720,7 @@ msgstr "未过账" #. module: account #: model:ir.ui.view,arch_db:account.view_account_move_filter msgid "Unposted Journal Entries" -msgstr "未过账分类账条目" +msgstr "未过账分类账分录" #. module: account #: model:ir.ui.view,arch_db:account.view_account_move_line_filter @@ -8750,7 +8750,7 @@ msgstr "反调节" #. module: account #: model:ir.actions.act_window,name:account.action_account_unreconcile msgid "Unreconcile Entries" -msgstr "反调节条目" +msgstr "反调节分录" #. module: account #: model:ir.ui.view,arch_db:account.account_unreconcile_view @@ -8765,7 +8765,7 @@ msgstr "未调节的" #. module: account #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled msgid "Unreconciled Entries" -msgstr "未调节的条目" +msgstr "未调节的分录" #. module: account #: model:ir.ui.view,arch_db:account.view_account_move_line_filter @@ -8787,17 +8787,17 @@ msgstr "使用" #: model:ir.model.fields,field_description:account.field_account_config_settings_use_anglo_saxon #: model:ir.model.fields,field_description:account.field_wizard_multi_charts_accounts_use_anglo_saxon msgid "Use Anglo-Saxon Accounting" -msgstr "用anglo-saxon会计" +msgstr "使用anglo-saxon会计" #. module: account #: model:ir.model.fields,field_description:account.field_account_chart_template_use_anglo_saxon msgid "Use Anglo-Saxon accounting" -msgstr "用anglo-saxon会计" +msgstr "使用anglo-saxon会计" #. module: account #: model:ir.model.fields,field_description:account.field_account_config_settings_module_account_sepa msgid "Use SEPA payments" -msgstr "用SEPA付款方式" +msgstr "用SEPA付款" #. module: account #: model:ir.model.fields,field_description:account.field_account_move_reversal_journal_id @@ -8807,7 +8807,7 @@ msgstr "用特定的分类账" #. module: account #: model:ir.model.fields,field_description:account.field_res_company_anglo_saxon_accounting msgid "Use anglo-saxon accounting" -msgstr "用anglo-saxon会计" +msgstr "使用anglo-saxon会计" #. module: account #: model:ir.model.fields,field_description:account.field_account_config_settings_module_account_batch_deposit @@ -8850,7 +8850,7 @@ msgstr "用来在报表中让我们知道分类账项目是否应该从期初或 #. module: account #: model:ir.model.fields,help:account.field_account_journal_sequence msgid "Used to order Journals in the dashboard view" -msgstr "用来给仪表盘视图中的分类账排序" +msgstr "用来给仪表板视图中的分类账排序" #. module: account #: model:ir.model.fields,help:account.field_account_journal_loss_account_id @@ -8988,7 +8988,7 @@ msgstr "供应商" #. module: account #: selection:account.financial.report,type:0 msgid "View" -msgstr "查看" +msgstr "视图" #. module: account #: model:ir.ui.view,arch_db:account.view_account_config_settings @@ -9052,7 +9052,7 @@ msgstr "当邀请用户时候，你需要定义他们能够登陆的权限 \n #. module: account #: model:ir.model.fields,help:account.field_account_journal_show_on_dashboard msgid "Whether this journal should be displayed on the dashboard or not" -msgstr "不管这个分类账是否显示在仪表盘" +msgstr "不管这个分类账是否显示在仪表板" #. module: account #. openerp-web @@ -9118,20 +9118,20 @@ msgstr "销账金额" #. module: account #: sql_constraint:account.move.line:0 msgid "Wrong credit or debit value in accounting entry !" -msgstr "在分类账条目中错误的借方或者贷方" +msgstr "在分类账分录中错误的借方或者贷方" #. module: account #: code:addons/account/models/account_move.py:774 #, python-format msgid "You are trying to reconcile some entries that are already reconciled!" -msgstr "你正在调节一些已经被调节的条目" +msgstr "你正在调节一些已经被调节的分录" #. module: account #: model:ir.model.fields,help:account.field_account_move_line_blocked msgid "" "You can check this box to mark this journal item as a litigation with the " "associated partner" -msgstr "你可以勾选这个勾选框来表明这条条目条目以及相关的业务伙伴状态在诉讼状态 " +msgstr "你可以勾选这个勾选框来表明这条分录分录以及相关的业务伙伴状态在诉讼状态 " #. module: account #: model:ir.actions.act_window,help:account.action_invoice_tree2 @@ -9154,7 +9154,7 @@ msgid "" "You can not change the unit of measure of a product that has been already " "used in an account journal item. If you need to change the unit of measure, " "you may deactivate this product." -msgstr "一个产品的计量单位如果已经被用在会计分类账的条目中，那么这个产品的计量单位将不能被更改 但是你可以通过设置这个产品为无效的的方式来更改计量单位 " +msgstr "一个产品的计量单位如果已经被用在会计分类账的分录中，那么这个产品的计量单位将不能被更改 但是你可以通过设置这个产品为无效的的方式来更改计量单位 " #. module: account #: code:addons/account/models/account_payment.py:297 @@ -9182,7 +9182,7 @@ msgstr "你可以在这里设置你想要的格式。如果你 离开自动格 msgid "" "You cannot add/modify entries prior to and inclusive of the lock date %s. " "Check the company settings or ask someone with the 'Adviser' role" -msgstr "在锁定日期之前，您不能添加/修改条目%s “检查公司的设置，或询问相关顾问”" +msgstr "在锁定日期之前，您不能添加/修改分录%s “检查公司的设置，或询问相关顾问”" #. module: account #: code:addons/account/models/account_invoice.py:789 @@ -9190,7 +9190,7 @@ msgstr "在锁定日期之前，您不能添加/修改条目%s “检查公司 msgid "" "You cannot cancel an invoice which is partially paid. You need to " "unreconcile related payment entries first." -msgstr "已经部分付款的发票不能被取消，需要先反调节部分付款的条目　" +msgstr "已经部分付款的发票不能被取消，需要先反调节部分付款的分录　" #. module: account #: code:addons/account/models/account.py:162 @@ -9204,7 +9204,7 @@ msgstr "不能更改已经包含分类账项目的所属公司 " #: code:addons/account/models/account_move.py:997 #, python-format msgid "You cannot change the tax, you should remove and recreate lines." -msgstr "睡不能被更改，你可以移除然后重新创建条目" +msgstr "睡不能被更改，你可以移除然后重新创建分录" #. module: account #: code:addons/account/models/account_move.py:379 @@ -9243,7 +9243,7 @@ msgstr "你不能在包含分类账项目的科目上那样做" msgid "" "You cannot do this modification on a posted journal entry, you can just change some non legal fields. You must revert the journal entry to cancel it.\n" "%s." -msgstr "已经过账的条目不能不更改,你只能更改一些非法律强制项或者逆转这条条目达到取消的目的.\n%s." +msgstr "已经过账的分录不能不更改,你只能更改一些非法律强制项或者逆转这条分录达到取消的目的.\n%s." #. module: account #: code:addons/account/models/account_move.py:1030 @@ -9251,7 +9251,7 @@ msgstr "已经过账的条目不能不更改,你只能更改一些非法律强 msgid "" "You cannot do this modification on a reconciled entry. You can just change some non legal fields or you must unreconcile first.\n" "%s." -msgstr "已经调节的条目不能不更改。你只能更改一些非法律强制项或者必须首先反调节.\n%s." +msgstr "已经调节的分录不能不更改。你只能更改一些非法律强制项或者必须首先反调节.\n%s." #. module: account #: code:addons/account/models/account.py:96 @@ -9280,7 +9280,7 @@ msgstr "应收和应付科目不能被混淆" msgid "" "You cannot modify a posted entry of this journal.\n" "First you should set the journal to allow cancelling entries." -msgstr "你不能修改已经这个账簿中过账的条目.\n首先你需要设置允许这个账簿取消条目" +msgstr "你不能修改已经这个账簿中过账的分录.\n首先你需要设置允许这个账簿取消分录" #. module: account #: code:addons/account/wizard/pos_box.py:36 @@ -9309,7 +9309,7 @@ msgstr "你不能使用作废的科目" msgid "" "You cannot use this general account in this journal, check the tab 'Entry " "Controls' on the related journal." -msgstr "你不能在这个分类账中用这个总账，在相关分类账中检查页面'条目控制'" +msgstr "你不能在这个分类账中用这个总账，在相关分类账中检查页面'分录控制'" #. module: account #: model:ir.ui.view,arch_db:account.invoice_form @@ -9348,7 +9348,7 @@ msgid "" "You should configure the 'Exchange Rate Journal' in the accounting settings," " to manage automatically the booking of accounting entries related to " "differences between exchange rates." -msgstr "你应该在会计设置中配置'汇率科目'，来自动的管理在汇率差异相关的分类账条目的预定" +msgstr "你应该在会计设置中配置'汇率科目'，来自动的管理在汇率差异相关的分类账分录的预定" #. module: account #: code:addons/account/models/account_move.py:1162 @@ -9357,7 +9357,7 @@ msgid "" "You should configure the 'Gain Exchange Rate Account' in the accounting " "settings, to manage automatically the booking of accounting entries related " "to differences between exchange rates." -msgstr "你应该在会计设置中配置'汇率收益科目'，来自动的管理在汇率差异相关的分类账条目的预定" +msgstr "你应该在会计设置中配置'汇率收益科目'，来自动的管理在汇率差异相关的分类账分录的预定" #. module: account #: code:addons/account/models/account_move.py:1164 @@ -9366,7 +9366,7 @@ msgid "" "You should configure the 'Loss Exchange Rate Account' in the accounting " "settings, to manage automatically the booking of accounting entries related " "to differences between exchange rates." -msgstr "你应该在会计设置中配置'汇率损失科目'，来自动的管理在汇率差异相关的分类账条目的预定" +msgstr "你应该在会计设置中配置'汇率损失科目'，来自动的管理在汇率差异相关的分类账分录的预定" #. module: account #: code:addons/account/wizard/pos_box.py:49 @@ -9505,7 +9505,7 @@ msgstr "代码" #. module: account #: model:ir.ui.view,arch_db:account.account_planner msgid "create a journal entry" -msgstr "创建一分类账条目" +msgstr "创建一分类账分录" #. module: account #. openerp-web @@ -9683,4 +9683,4 @@ msgstr "wizard.multi.charts.accounts" #. module: account #: model:ir.ui.view,arch_db:account.view_bank_statement_form msgid "→ Count" -msgstr "→ 数" +msgstr "→ 计数" diff --git a/addons/account/models/account.py b/addons/account/models/account.py index 082273b3644..50388f30f49 100644 --- a/addons/account/models/account.py +++ b/addons/account/models/account.py @@ -638,7 +638,10 @@ class AccountTax(models.Model): continue tax_amount = tax._compute_amount(base, price_unit, quantity, product, partner) - tax_amount = currency.round(tax_amount) + if company_id.tax_calculation_rounding_method == 'round_globally': + tax_amount = round(tax_amount, prec) + else: + tax_amount = currency.round(tax_amount) if tax_amount: if tax.price_include: @@ -702,7 +705,7 @@ class AccountOperationTemplate(models.Model): ], required=True, default='percentage') amount = fields.Float(digits=0, required=True, default=100.0, help="Fixed amount will count as a debit if it is negative, as a credit if it is positive.") tax_id = fields.Many2one('account.tax', string='Tax', ondelete='restrict', domain=[('type_tax_use', '=', 'purchase')]) - analytic_account_id = fields.Many2one('account.analytic.account', string='Analytic Account', ondelete='set null', domain=[('state', 'not in', ('close', 'cancelled'))]) + analytic_account_id = fields.Many2one('account.analytic.account', string='Analytic Account', ondelete='set null', domain=[('account_type', '=', 'normal')]) second_account_id = fields.Many2one('account.account', string='Account', ondelete='cascade', domain=[('deprecated', '=', False)]) second_journal_id = fields.Many2one('account.journal', string='Journal', ondelete='cascade', help="This field is ignored in a bank statement reconciliation.") @@ -713,7 +716,7 @@ class AccountOperationTemplate(models.Model): ], string='Amount type', required=True, default='percentage') second_amount = fields.Float(string='Amount', digits=0, required=True, default=100.0, help="Fixed amount will count as a debit if it is negative, as a credit if it is positive.") second_tax_id = fields.Many2one('account.tax', string='Tax', ondelete='restrict', domain=[('type_tax_use', '=', 'purchase')]) - second_analytic_account_id = fields.Many2one('account.analytic.account', string='Analytic Account', ondelete='set null', domain=[('state', 'not in', ('close', 'cancelled'))]) + second_analytic_account_id = fields.Many2one('account.analytic.account', string='Analytic Account', ondelete='set null', domain=[('account_type', '=', 'normal')]) @api.onchange('name') def onchange_name(self): diff --git a/addons/account/models/account_analytic_line.py b/addons/account/models/account_analytic_line.py index 0152730f22f..6b8fcdc17aa 100644 --- a/addons/account/models/account_analytic_line.py +++ b/addons/account/models/account_analytic_line.py @@ -17,7 +17,7 @@ class AccountAnalyticLine(models.Model): ref = fields.Char(string='Ref.') currency_id = fields.Many2one('res.currency', related='move_id.currency_id', string='Account Currency', store=True, help="The related account currency if not equal to the company one.", readonly=True) amount_currency = fields.Monetary(related='move_id.amount_currency', store=True, help="The amount expressed in the related account currency if not equal to the company one.", readonly=True) - partner_id = fields.Many2one('res.partner', related='account_id.partner_id', string='Partner', store=True) + partner_id = fields.Many2one('res.partner', related='account_id.partner_id', string='Partner', store=True, readonly=True) @api.v8 @api.onchange('product_id', 'product_uom_id', 'unit_amount', 'currency_id') diff --git a/addons/account/models/account_bank_statement.py b/addons/account/models/account_bank_statement.py index 09a2260f228..260a180f497 100644 --- a/addons/account/models/account_bank_statement.py +++ b/addons/account/models/account_bank_statement.py @@ -26,7 +26,7 @@ class AccountCashboxLine(models.Model): coin_value = fields.Float(string='Coin/Bill Value', required=True, digits=0) number = fields.Integer(string='Number of Coins/Bills', help='Opening Unit Numbers') subtotal = fields.Float(compute='_sub_total', string='Subtotal', digits=0, readonly=True) - cashbox_id = fields.Many2one('account.bank.statement.cashbox') + cashbox_id = fields.Many2one('account.bank.statement.cashbox', string="Cashbox") class AccountBankStmtCashWizard(models.Model): @@ -132,7 +132,7 @@ class AccountBankStatement(models.Model): balance_start = fields.Monetary(string='Starting Balance', states={'confirm': [('readonly', True)]}, default=_default_opening_balance) balance_end_real = fields.Monetary('Ending Balance', states={'confirm': [('readonly', True)]}) state = fields.Selection([('open', 'New'), ('confirm', 'Validated')], string='Status', required=True, readonly=True, copy=False, default='open') - currency_id = fields.Many2one('res.currency', compute='_compute_currency', oldname='currency') + currency_id = fields.Many2one('res.currency', compute='_compute_currency', oldname='currency', string="Currency") journal_id = fields.Many2one('account.journal', string='Journal', required=True, states={'confirm': [('readonly', True)]}, default=_default_journal) journal_type = fields.Selection(related='journal_id.type', help="Technical field used for usability purposes") company_id = fields.Many2one('res.company', related='journal_id.company_id', string='Company', store=True, readonly=True, @@ -146,8 +146,8 @@ class AccountBankStatement(models.Model): move_line_ids = fields.One2many('account.move.line', 'statement_id', string='Entry lines', states={'confirm': [('readonly', True)]}) all_lines_reconciled = fields.Boolean(compute='_check_lines_reconciled') user_id = fields.Many2one('res.users', string='Responsible', required=False, default=lambda self: self.env.user) - cashbox_start_id = fields.Many2one('account.bank.statement.cashbox') - cashbox_end_id = fields.Many2one('account.bank.statement.cashbox') + cashbox_start_id = fields.Many2one('account.bank.statement.cashbox', string="Starting Cashbox") + cashbox_end_id = fields.Many2one('account.bank.statement.cashbox', string="Ending Cashbox") @api.onchange('journal_id') diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py index 10b0b3b8e24..3564ba348b7 100644 --- a/addons/account/models/account_move.py +++ b/addons/account/models/account_move.py @@ -73,7 +73,7 @@ class AccountMove(models.Model): ref = fields.Char(string='Reference', copy=False) date = fields.Date(required=True, states={'posted': [('readonly', True)]}, index=True, default=fields.Date.context_today) journal_id = fields.Many2one('account.journal', string='Journal', required=True, states={'posted': [('readonly', True)]}, default=_get_default_journal) - currency_id = fields.Many2one('res.currency', compute='_compute_currency', store=True) + currency_id = fields.Many2one('res.currency', compute='_compute_currency', store=True, string="Currency") rate_diff_partial_rec_id = fields.Many2one('account.partial.reconcile', string='Exchange Rate Entry of', help="Technical field used to keep track of the origin of journal entries created in case of fluctuation of the currency exchange rate. This is needed when cancelling the source: it will post the inverse journal entry to cancel that part too.") state = fields.Selection([('draft', 'Unposted'), ('posted', 'Posted')], string='Status', required=True, readonly=True, copy=False, default='draft', diff --git a/addons/account/models/partner.py b/addons/account/models/partner.py index ee466397a0d..e1b7457556d 100644 --- a/addons/account/models/partner.py +++ b/addons/account/models/partner.py @@ -122,31 +122,36 @@ class AccountFiscalPosition(models.Model): def _get_fpos_by_region(self, country_id=False, state_id=False, zipcode=False, vat_required=False): if not country_id: return False - domains = [[('auto_apply', '=', True), ('vat_required', '=', vat_required)]] - if vat_required: - # Possibly allow fallback to non-VAT positions, if no VAT-required position matches - domains += [[('auto_apply', '=', True), ('vat_required', '=', False)]] + base_domain = [('auto_apply', '=', True), ('vat_required', '=', vat_required)] + null_state_dom = state_domain = [('state_ids', '=', False)] + null_zip_dom = zip_domain = [('zip_from', '=', 0), ('zip_to', '=', 0)] + if zipcode and zipcode.isdigit(): zipcode = int(zipcode) - domain_zip = [('zip_from', '<=', zipcode), ('zip_to', '>=', zipcode)] + zip_domain = [('zip_from', '<=', zipcode), ('zip_to', '>=', zipcode)] else: - zipcode, domain_zip = 0, [('zip_from', '=', 0), ('zip_to', '=', 0)] - state_domain = [('state_ids', '=', False)] + zipcode = 0 + if state_id: state_domain = [('state_ids', '=', state_id)] - for domain in domains: - # Build domain to search records with exact matching criteria - fpos_id = self.search(domain + [('country_id', '=', country_id)] + state_domain + domain_zip, limit=1).id - # return records that fit the most the criteria, and fallback on less specific fiscal positions if any can be found - if not fpos_id and zipcode: - fpos_id = self.search(domain + [('country_id', '=', country_id)] + state_domain + [('zip_from', '=', 0), ('zip_to', '=', 0)], limit=1).id - if not fpos_id and state_id: - fpos_id = self.search(domain + [('country_id', '=', country_id)] + [('state_ids', '=', False)] + domain_zip, limit=1).id - if not fpos_id and state_id and zipcode: - fpos_id = self.search(domain + [('country_id', '=', country_id)] + [('state_ids', '=', False)] + [('zip_from', '=', 0), ('zip_to', '=', 0)], limit=1).id - if fpos_id: - return fpos_id - return False + + domain_country = base_domain + [('country_id', '=', country_id)] + domain_group = base_domain + [('country_group_id.country_ids', '=', country_id)] + + # Build domain to search records with exact matching criteria + fpos = self.search(domain_country + state_domain + zip_domain, limit=1) + # return records that fit the most the criteria, and fallback on less specific fiscal positions if any can be found + if not fpos and state_id: + fpos = self.search(domain_country + null_state_dom + zip_domain, limit=1) + if not fpos and zipcode: + fpos = self.search(domain_country + state_domain + null_zip_dom, limit=1) + if not fpos and state_id and zipcode: + fpos = self.search(domain_country + null_state_dom + null_zip_dom, limit=1) + + # fallback: country group with no state/zip range + if not fpos: + fpos = self.search(domain_group + null_state_dom + null_zip_dom, limit=1) + return fpos or False @api.model def get_fiscal_position(self, partner_id, delivery_id=None): @@ -156,7 +161,7 @@ class AccountFiscalPosition(models.Model): PartnerObj = self.env['res.partner'] partner = PartnerObj.browse(partner_id) - # if no delivery use invocing + # if no delivery use invoicing if delivery_id: delivery = PartnerObj.browse(delivery_id) else: @@ -166,25 +171,23 @@ class AccountFiscalPosition(models.Model): if delivery.property_account_position_id or partner.property_account_position_id: return delivery.property_account_position_id.id or partner.property_account_position_id.id - fiscal_position_id = self._get_fpos_by_region(delivery.country_id.id, delivery.state_id.id, delivery.zip, bool(partner.vat)) - if fiscal_position_id: - return fiscal_position_id + def fallback_search(vat_required): + fpos = self._get_fpos_by_region(delivery.country_id.id, delivery.state_id.id, delivery.zip, vat_required) + if not fpos: + # Fallback on catchall (no country, no group) + fpos = self.search([('auto_apply', '=', True), ('vat_required', '=', vat_required), + ('country_id', '=', None), ('country_group_id', '=', None)], limit=1) + return fpos - domains = [[('auto_apply', '=', True), ('vat_required', '=', bool(partner.vat))]] - if partner.vat: - # Possibly allow fallback to non-VAT positions, if no VAT-required position matches - domains += [[('auto_apply', '=', True), ('vat_required', '=', False)]] + # First search only matching VAT positions + vat_required = bool(partner.vat) + fp = fallback_search(vat_required) - for domain in domains: - if delivery.country_id.id: - fiscal_position = self.search(domain + [('country_group_id.country_ids', '=', delivery.country_id.id)], limit=1) - if fiscal_position: - return fiscal_position.id + # Then if VAT required found no match, try positions that do not require it + if not fp and vat_required: + fp = fallback_search(False) - fiscal_position = self.search(domain + [('country_id', '=', None), ('country_group_id', '=', None)], limit=1) - if fiscal_position: - return fiscal_position.id - return False + return fp.id if fp else False class AccountFiscalPositionTax(models.Model): @@ -405,7 +408,7 @@ class ResPartner(models.Model): total_invoiced = fields.Monetary(compute='_invoice_total', string="Total Invoiced", groups='account.group_account_invoice') currency_id = fields.Many2one('res.currency', compute='_get_company_currency', readonly=True, - help='Utility field to express amount currency') + string="Currency", help='Utility field to express amount currency') contracts_count = fields.Integer(compute='_journal_item_count', string="Contracts", type='integer') journal_item_count = fields.Integer(compute='_journal_item_count', string="Journal Items", type="integer") diff --git a/addons/account/static/src/js/account_reconciliation_widgets.js b/addons/account/static/src/js/account_reconciliation_widgets.js index 94ea596218f..31166102d7b 100644 --- a/addons/account/static/src/js/account_reconciliation_widgets.js +++ b/addons/account/static/src/js/account_reconciliation_widgets.js @@ -128,7 +128,7 @@ var abstractReconciliation = Widget.extend(ControlPanelMixin, { relation: "account.tax", string: _t("Tax"), type: "many2one", - domain: [['type_tax_use','=','purchase']], + domain: [['type_tax_use','!=','none']], }, }, amount: { @@ -155,7 +155,7 @@ var abstractReconciliation = Widget.extend(ControlPanelMixin, { relation: "account.analytic.account", string: _t("Analytic Acc."), type: "many2one", - domain: [['type', '!=', 'view'], ['state', 'not in', ['close','cancelled']]], + domain: [['account_type', '=', 'normal']], }, }, }; @@ -1767,8 +1767,8 @@ var bankStatementReconciliationLine = abstractReconciliationLine.extend({ /** Creating */ initializeCreateForm: function() { - this.label_field.set("value", this.st_line.name); this._super(); + this.label_field.set("value", this.st_line.name); }, diff --git a/addons/account/tests/test_fiscal_position.py b/addons/account/tests/test_fiscal_position.py index 57a3ea5f68a..11c5f71170c 100644 --- a/addons/account/tests/test_fiscal_position.py +++ b/addons/account/tests/test_fiscal_position.py @@ -1,6 +1,6 @@ -from openerp.addons.account.tests.account_test_classes import AccountingTestCase +from openerp.tests import common -class TestFiscalPosition(AccountingTestCase): +class TestFiscalPosition(common.TransactionCase): """Tests for fiscal positions in auto apply (account.fiscal.position). If a partner has a vat number, the fiscal positions with "vat_required=True" are preferred. @@ -8,33 +8,124 @@ class TestFiscalPosition(AccountingTestCase): def setUp(self): super(TestFiscalPosition, self).setUp() - self.fiscal_position_model = self.registry('account.fiscal.position') - self.res_partner_model = self.registry('res.partner') - self.res_country_model = self.registry('res.country') + self.fp = self.env['account.fiscal.position'] - def test_fiscal_position(self): - cr, uid = self.cr, self.uid - country_id = self.res_country_model.search(cr, uid, [('name', '=', 'France')])[0] - partner_id = self.res_partner_model.create(cr, uid, dict( - name="George", - vat="BE0477472701", - notify_email="always", - country_id=country_id)) - fp_b2c_id = self.fiscal_position_model.create(cr, uid, dict(name="EU-VAT-FR-B2C", - auto_apply=True, - country_id=country_id, - vat_required=False, - sequence=1)) - fp_b2b_id = self.fiscal_position_model.create(cr, uid, dict(name="EU-VAT-FR-B2B", - auto_apply=True, - country_id=country_id, - vat_required=True, - sequence=2)) - res = self.fiscal_position_model.get_fiscal_position(cr, uid, partner_id) - self.assertEquals(fp_b2b_id, res, - "Fiscal position detection should pick B2B position as 1rst match") + # reset any existing FP + self.fp.search([]).write({'auto_apply': False}) - self.fiscal_position_model.write(cr, uid, [fp_b2b_id], {'auto_apply': False}) - res = self.fiscal_position_model.get_fiscal_position(cr, uid, partner_id) - self.assertEquals(fp_b2c_id, res, - "Fiscal position detection should pick B2C position as 1rst match") + self.res_partner = self.env['res.partner'] + self.be = be = self.env.ref('base.be') + self.fr = fr = self.env.ref('base.fr') + self.mx = mx = self.env.ref('base.mx') + self.eu = eu = self.env.ref('base.europe') + self.state_fr = self.env['res.country.state'].create(dict( + name="State", + code="ST", + country_id=fr.id)) + self.jc = self.res_partner.create(dict( + name="JCVD", + vat="BE0477472701", + notify_email="none", + country_id=be.id)) + self.ben = self.res_partner.create(dict( + name="BP", + notify_email="none", + country_id=be.id)) + self.george = self.res_partner.create(dict( + name="George", + vat="BE0477472701", + notify_email="none", + country_id=fr.id)) + self.alberto = self.res_partner.create(dict( + name="Alberto", + vat="BE0477472701", + notify_email="none", + country_id=mx.id)) + self.be_nat = self.fp.create(dict( + name="BE-NAT", + auto_apply=True, + country_id=be.id, + vat_required=False, + sequence=10)) + self.fr_b2c = self.fp.create(dict( + name="EU-VAT-FR-B2C", + auto_apply=True, + country_id=fr.id, + vat_required=False, + sequence=40)) + self.fr_b2b = self.fp.create(dict( + name="EU-VAT-FR-B2B", + auto_apply=True, + country_id=fr.id, + vat_required=True, + sequence=50)) + + def test_10_fp_country(self): + def assert_fp(partner, expected_pos, message): + self.assertEquals( + self.fp.get_fiscal_position(partner.id), + expected_pos.id, + message) + + george, jc, ben, alberto = self.george, self.jc, self.ben, self.alberto + + # B2B has precedence over B2C for same country even when sequence gives lower precedence + self.assertGreater(self.fr_b2b.sequence, self.fr_b2c.sequence) + assert_fp(george, self.fr_b2b, "FR-B2B should have precedence over FR-B2C") + self.fr_b2b.auto_apply = False + assert_fp(george, self.fr_b2c, "FR-B2C should match now") + self.fr_b2b.auto_apply = True + + # Create positions matching on Country Group and on NO country at all + self.eu_intra_b2b = self.fp.create(dict( + name="EU-INTRA B2B", + auto_apply=True, + country_group_id=self.eu.id, + vat_required=True, + sequence=20)) + self.world = self.fp.create(dict( + name="WORLD-EXTRA", + auto_apply=True, + vat_required=False, + sequence=30)) + + # Country match has higher precedence than group match or sequence + self.assertGreater(self.fr_b2b.sequence, self.eu_intra_b2b.sequence) + assert_fp(george, self.fr_b2b, "FR-B2B should have precedence over EU-INTRA B2B") + + # B2B has precedence regardless of country or group match + self.assertGreater(self.eu_intra_b2b.sequence, self.be_nat.sequence) + assert_fp(jc, self.eu_intra_b2b, "EU-INTRA B2B should match before BE-NAT") + + # Lower sequence = higher precedence if country/group and VAT matches + self.assertFalse(ben.vat) # No VAT set + assert_fp(ben, self.be_nat, "BE-NAT should match before EU-INTRA due to lower sequence") + + # Remove BE from EU group, now BE-NAT should be the fallback match before the wildcard WORLD + self.be.write({'country_group_ids': [(3, self.eu.id)]}) + self.assertTrue(jc.vat) # VAT set + assert_fp(jc, self.be_nat, "BE-NAT should match as fallback even w/o VAT match") + + # No country = wildcard match only if nothing else matches + self.assertTrue(alberto.vat) # with VAT + assert_fp(alberto, self.world, "WORLD-EXTRA should match anything else (1)") + alberto.vat = False # or without + assert_fp(alberto, self.world, "WORLD-EXTRA should match anything else (2)") + + # Zip range + self.fr_b2b_zip100 = self.fr_b2b.copy(dict(zip_from=0, zip_to=5000, sequence=60)) + george.zip = 6000 + assert_fp(george, self.fr_b2b, "FR-B2B with wrong zip range should not match") + george.zip = 3000 + assert_fp(george, self.fr_b2b_zip100, "FR-B2B with zip range should have precedence") + + # States + self.fr_b2b_state = self.fr_b2b.copy(dict(state_ids=[(4, self.state_fr.id)], sequence=70)) + george.state_id = self.state_fr + assert_fp(george, self.fr_b2b_zip100, "FR-B2B with zip should have precedence over states") + george.zip = 0 + assert_fp(george, self.fr_b2b_state, "FR-B2B with states should have precedence") + + # Dedicated position has max precedence + george.property_account_position_id = self.be_nat + assert_fp(george, self.be_nat, "Forced position has max precedence") diff --git a/addons/account/views/account_invoice_view.xml b/addons/account/views/account_invoice_view.xml index ac623f156d6..19721159224 100644 --- a/addons/account/views/account_invoice_view.xml +++ b/addons/account/views/account_invoice_view.xml @@ -74,7 +74,7 @@ - + @@ -108,7 +108,7 @@ - + @@ -262,7 +262,7 @@ + domain="[('company_id', '=', parent.company_id), ('account_type', '=', 'normal')]"/> @@ -285,7 +285,7 @@ - + @@ -399,7 +399,7 @@ + domain="[('company_id', '=', parent.company_id), ('account_type', '=', 'normal')]"/> @@ -521,7 +521,7 @@ - + diff --git a/addons/account/views/account_view.xml b/addons/account/views/account_view.xml index 29329f1dfa4..a38c5d8fc9c 100644 --- a/addons/account/views/account_view.xml +++ b/addons/account/views/account_view.xml @@ -715,7 +715,7 @@ - + @@ -737,7 +737,7 @@ - + @@ -1012,7 +1012,7 @@ - + @@ -1245,7 +1245,7 @@ - + diff --git a/addons/account/views/company_view.xml b/addons/account/views/company_view.xml index 06e1648b4a3..fe6bebbd2fa 100644 --- a/addons/account/views/company_view.xml +++ b/addons/account/views/company_view.xml @@ -13,6 +13,7 @@ + diff --git a/addons/account/wizard/account_reconcile.py b/addons/account/wizard/account_reconcile.py index a36f2efbc12..da87e01ad93 100644 --- a/addons/account/wizard/account_reconcile.py +++ b/addons/account/wizard/account_reconcile.py @@ -38,7 +38,7 @@ class AccountMoveLineReconcile(models.TransientModel): if not line.reconciled: credit += line.credit debit += line.debit - precision = self.company_id.currency_id.decimal_places + precision = self.env.user.company_id.currency_id.decimal_places writeoff = float_round(debit - credit, precision_digits=precision) credit = float_round(credit, precision_digits=precision) debit = float_round(debit, precision_digits=precision) @@ -70,7 +70,7 @@ class AccountMoveLineReconcileWriteoff(models.TransientModel): writeoff_acc_id = fields.Many2one('account.account', string='Write-Off account', required=True, domain=[('deprecated', '=', False)]) date_p = fields.Date(string='Date', default=fields.Date.context_today) comment = fields.Char(required=True, default='Write-off') - analytic_id = fields.Many2one('account.analytic.account', string='Analytic Account') + analytic_id = fields.Many2one('account.analytic.account', string='Analytic Account', domain=[('account_type', '=', 'normal')]) @api.multi def trans_rec_addendum(self): diff --git a/addons/account_analytic_default/account_analytic_default.py b/addons/account_analytic_default/account_analytic_default.py index 5b38ad413c1..66fed7ceb4a 100644 --- a/addons/account_analytic_default/account_analytic_default.py +++ b/addons/account_analytic_default/account_analytic_default.py @@ -13,7 +13,7 @@ class account_analytic_default(osv.osv): _order = "sequence" _columns = { 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of analytic distribution"), - 'analytic_id': fields.many2one('account.analytic.account', 'Analytic Account'), + 'analytic_id': fields.many2one('account.analytic.account', 'Analytic Account', domain=[('account_type', '=', 'normal')]), 'product_id': fields.many2one('product.product', 'Product', ondelete='cascade', help="Select a product which will use analytic account specified in analytic default (e.g. create new customer invoice or Sales order if we select this product, it will automatically take this as an analytic account)"), 'partner_id': fields.many2one('res.partner', 'Partner', ondelete='cascade', help="Select a partner which will use analytic account specified in analytic default (e.g. create new customer invoice or Sales order if we select this partner, it will automatically take this as an analytic account)"), 'user_id': fields.many2one('res.users', 'User', ondelete='cascade', help="Select a user which will use analytic account specified in analytic default."), @@ -113,7 +113,6 @@ class product_template(osv.Model): _inherit = 'product.template' def _rules_count(self, cr, uid, ids, field_name, arg, context=None): - Analytic = self.pool['account.analytic.default'] res = {} for product_tmpl_id in self.browse(cr, uid, ids, context=context): res[product_tmpl_id.id] = sum([p.rules_count for p in product_tmpl_id.product_variant_ids]) diff --git a/addons/account_analytic_default/i18n/ca.po b/addons/account_analytic_default/i18n/ca.po index e12fe55db72..06a3982ca97 100644 --- a/addons/account_analytic_default/i18n/ca.po +++ b/addons/account_analytic_default/i18n/ca.po @@ -3,13 +3,14 @@ # * account_analytic_default # # Translators: +# Marc Tormo i Bochaca , 2015 msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-07 14:40+0000\n" -"PO-Revision-Date: 2015-11-21 21:26+0000\n" -"Last-Translator: Martin Trigaux\n" +"PO-Revision-Date: 2015-12-12 09:50+0000\n" +"Last-Translator: Marc Tormo i Bochaca \n" "Language-Team: Catalan (http://www.transifex.com/odoo/odoo-9/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +22,7 @@ msgstr "" #: model:ir.model.fields,field_description:account_analytic_default.field_product_product_rules_count #: model:ir.model.fields,field_description:account_analytic_default.field_product_template_rules_count msgid "# Analytic Rules" -msgstr "" +msgstr "# Regles analítiques" #. module: account_analytic_default #: model:ir.ui.view,arch_db:account_analytic_default.view_account_analytic_default_form_search diff --git a/addons/account_analytic_default/i18n/fi.po b/addons/account_analytic_default/i18n/fi.po index eded250ebbc..3b3b1fe7d9b 100644 --- a/addons/account_analytic_default/i18n/fi.po +++ b/addons/account_analytic_default/i18n/fi.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-07 14:40+0000\n" -"PO-Revision-Date: 2015-10-02 11:48+0000\n" +"PO-Revision-Date: 2015-12-09 15:42+0000\n" "Last-Translator: Kari Lindgren \n" "Language-Team: Finnish (http://www.transifex.com/odoo/odoo-9/language/fi/)\n" "MIME-Version: 1.0\n" @@ -180,7 +180,7 @@ msgid "" "Select a company which will use analytic account specified in analytic " "default (e.g. create new customer invoice or Sales order if we select this " "company, it will automatically take this as an analytic account)" -msgstr "" +msgstr "Valitse yritys jota käytetään oletuksena analyyttista tiliä määritettäessä (esim. luotaessa uusi asiakaslasku tai myyntitilaus ja valitaan tämä yritys, valitaan automaattisesti ko. analyyttinen tili.)" #. module: account_analytic_default #: model:ir.model.fields,help:account_analytic_default.field_account_analytic_default_partner_id @@ -188,7 +188,7 @@ msgid "" "Select a partner which will use analytic account specified in analytic " "default (e.g. create new customer invoice or Sales order if we select this " "partner, it will automatically take this as an analytic account)" -msgstr "" +msgstr "Valitse kumppani jota käytetään analyyttisen tilin oletusasetuksissa (esim. luotaessa uusi asiakaslasku tai myyntitilaus ja valitaan tämä kumppani, valitaan automaattisesti ko. analyyttinen tili.)" #. module: account_analytic_default #: model:ir.model.fields,help:account_analytic_default.field_account_analytic_default_product_id @@ -196,13 +196,13 @@ msgid "" "Select a product which will use analytic account specified in analytic " "default (e.g. create new customer invoice or Sales order if we select this " "product, it will automatically take this as an analytic account)" -msgstr "" +msgstr "Valitse tuote jota käytetään analyyttisen tilin oletusasetuksissa (esim. luotaessa uusi asiakaslasku tai myyntitilaus ja valitaan tämä tuote, valitaan automaattisesti ko. analyyttinen tili.)" #. module: account_analytic_default #: model:ir.model.fields,help:account_analytic_default.field_account_analytic_default_user_id msgid "" "Select a user which will use analytic account specified in analytic default." -msgstr "" +msgstr "Valitse käyttäjä joka käyttää analyyttista tiliä joka on määritelty oletuksena." #. module: account_analytic_default #: model:ir.model.fields,field_description:account_analytic_default.field_account_analytic_default_sequence diff --git a/addons/account_analytic_default/i18n/zh_CN.po b/addons/account_analytic_default/i18n/zh_CN.po index 5c6f9c69fe7..c256d413fba 100644 --- a/addons/account_analytic_default/i18n/zh_CN.po +++ b/addons/account_analytic_default/i18n/zh_CN.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-07 14:40+0000\n" -"PO-Revision-Date: 2015-10-22 07:23+0000\n" -"Last-Translator: 卓忆科技 \n" +"PO-Revision-Date: 2015-12-09 14:17+0000\n" +"Last-Translator: jeffery chen fan \n" "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -72,12 +72,12 @@ msgstr "条件" #. module: account_analytic_default #: model:ir.model.fields,field_description:account_analytic_default.field_account_analytic_default_create_uid msgid "Created by" -msgstr "创建于" +msgstr "创建人" #. module: account_analytic_default #: model:ir.model.fields,field_description:account_analytic_default.field_account_analytic_default_create_date msgid "Created on" -msgstr "创建于" +msgstr "创建时间" #. module: account_analytic_default #: model:ir.model.fields,help:account_analytic_default.field_account_analytic_default_date_stop @@ -107,7 +107,7 @@ msgstr "分录" #. module: account_analytic_default #: model:ir.model.fields,field_description:account_analytic_default.field_product_product_expense_policy msgid "Expense Invoice Policy" -msgstr "费用发票政策" +msgstr "费用发票策略" #. module: account_analytic_default #: model:ir.model.fields,help:account_analytic_default.field_account_analytic_default_sequence @@ -131,7 +131,7 @@ msgid "" "If you invoice at cost, the expense will be invoiced on the sale order at " "the cost of the analytic line;if you invoice at sales price, the price of " "the product will be used instead." -msgstr "如果您按成本开票，将以辅助分析行上的成本费用开票到销售订单；如果您以销售价格开票，将以产品的价格开票。" +msgstr "如果您按成本开票，费用将按销售订单中分析会计明细的成本开票；如果您按销售价格开票，将使用产品的价格。" #. module: account_analytic_default #: model:ir.model,name:account_analytic_default.model_account_invoice_line @@ -146,12 +146,12 @@ msgstr "最后修改日" #. module: account_analytic_default #: model:ir.model.fields,field_description:account_analytic_default.field_account_analytic_default_write_uid msgid "Last Updated by" -msgstr "最后更新" +msgstr "最后更新人" #. module: account_analytic_default #: model:ir.model.fields,field_description:account_analytic_default.field_account_analytic_default_write_date msgid "Last Updated on" -msgstr "最后更新" +msgstr "最后更新时间" #. module: account_analytic_default #: model:ir.model.fields,field_description:account_analytic_default.field_account_analytic_default_partner_id @@ -219,7 +219,7 @@ msgstr "开始日期" #. module: account_analytic_default #: model:ir.model,name:account_analytic_default.model_stock_picking msgid "Transfer" -msgstr "转移" +msgstr "调拨" #. module: account_analytic_default #: model:ir.model.fields,field_description:account_analytic_default.field_account_analytic_default_user_id diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index 89e14541f5c..1a5fdac2c32 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -14,7 +14,7 @@ class AccountAssetCategory(models.Model): active = fields.Boolean(default=True) name = fields.Char(required=True, index=True, string="Asset Type") - account_analytic_id = fields.Many2one('account.analytic.account', string='Analytic Account') + account_analytic_id = fields.Many2one('account.analytic.account', string='Analytic Account', domain=[('account_type', '=', 'normal')]) account_asset_id = fields.Many2one('account.account', string='Asset Account', required=True, domain=[('internal_type','=','other'), ('deprecated', '=', False)]) account_income_recognition_id = fields.Many2one('account.account', string='Recognition Income Account', domain=[('internal_type','=','other'), ('deprecated', '=', False)], oldname='account_expense_depreciation_id') account_depreciation_id = fields.Many2one('account.account', string='Depreciation Account', required=True, domain=[('internal_type','=','other'), ('deprecated', '=', False)]) diff --git a/addons/account_asset/i18n/de.po b/addons/account_asset/i18n/de.po index 586bfad121e..1fee2a34000 100644 --- a/addons/account_asset/i18n/de.po +++ b/addons/account_asset/i18n/de.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-18 08:10+0000\n" -"PO-Revision-Date: 2015-11-17 13:07+0000\n" -"Last-Translator: Fabian Liesch \n" +"PO-Revision-Date: 2015-12-11 18:42+0000\n" +"Last-Translator: Henry Mineehen \n" "Language-Team: German (http://www.transifex.com/odoo/odoo-9/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -881,7 +881,7 @@ msgstr "Kaufmonat" #. module: account_asset #: selection:account.asset.category,type:0 msgid "Purchase: Asset" -msgstr "" +msgstr "Einkauf: Asset" #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_asset_modify_name @@ -1057,7 +1057,7 @@ msgstr "Jahr" #: code:addons/account_asset/account_asset.py:100 #, python-format msgid "You cannot delete a document is in %s state." -msgstr "" +msgstr "Du kannst kein Dokument löschen welches im %s Staus ist." #. module: account_asset #: code:addons/account_asset/account_asset.py:102 diff --git a/addons/account_asset/i18n/el.po b/addons/account_asset/i18n/el.po index 13631034bcd..887b28b75f3 100644 --- a/addons/account_asset/i18n/el.po +++ b/addons/account_asset/i18n/el.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-18 08:10+0000\n" -"PO-Revision-Date: 2015-12-05 23:23+0000\n" +"PO-Revision-Date: 2015-12-09 13:01+0000\n" "Last-Translator: Goutoudis Kostas \n" "Language-Team: Greek (http://www.transifex.com/odoo/odoo-9/language/el/)\n" "MIME-Version: 1.0\n" @@ -664,7 +664,7 @@ msgstr "" #. module: account_asset #: model:ir.ui.view,arch_db:account_asset.view_account_asset_asset_form msgid "Items" -msgstr "" +msgstr "Είδη" #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_account_asset_category_journal_id diff --git a/addons/account_asset/i18n/es_MX.po b/addons/account_asset/i18n/es_MX.po index 9d1a5152f58..018850a7412 100644 --- a/addons/account_asset/i18n/es_MX.po +++ b/addons/account_asset/i18n/es_MX.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-18 08:10+0000\n" -"PO-Revision-Date: 2015-11-14 19:47+0000\n" +"PO-Revision-Date: 2015-12-09 02:05+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/odoo/odoo-9/language/es_MX/)\n" "MIME-Version: 1.0\n" @@ -384,7 +384,7 @@ msgstr "Fecha de depreciación" #. module: account_asset #: model:ir.model.fields,help:account_asset.field_account_asset_asset_message_last_post msgid "Date of the last message posted on the record." -msgstr "" +msgstr "Fecha de último trabajo realizado en esta cuenta" #. module: account_asset #: model:ir.ui.view,arch_db:account_asset.view_account_asset_category_form @@ -553,7 +553,7 @@ msgstr "Seguidores" #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_message_partner_ids msgid "Followers (Partners)" -msgstr "" +msgstr "Seguidores (Socios)" #. module: account_asset #: model:ir.actions.act_window,help:account_asset.action_asset_asset_report @@ -680,7 +680,7 @@ msgstr "Pólizas" #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_message_last_post msgid "Last Message Date" -msgstr "" +msgstr "Fecha de último mensaje" #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_account_asset_asset___last_update @@ -766,7 +766,7 @@ msgstr "Nota" #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_message_needaction_counter msgid "Number of Actions" -msgstr "" +msgstr "Número de acciones" #. module: account_asset #: selection:account.asset.asset,method_time:0 @@ -790,12 +790,12 @@ msgstr "Numero de meses en un periodo." #. module: account_asset #: model:ir.model.fields,help:account_asset.field_account_asset_asset_message_needaction_counter msgid "Number of messages which requires an action" -msgstr "" +msgstr "Número de mensajes que requieren una acción" #. module: account_asset #: model:ir.model.fields,help:account_asset.field_account_asset_asset_message_unread_counter msgid "Number of unread messages" -msgstr "" +msgstr "Número de mensajes sin leer" #. module: account_asset #: code:addons/account_asset/account_asset.py:488 @@ -1019,7 +1019,7 @@ msgstr "Mensajes sin leer" #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_message_unread_counter msgid "Unread Messages Counter" -msgstr "" +msgstr "Contador de mensajes sin leer" #. module: account_asset #: model:ir.ui.view,arch_db:account_asset.view_account_asset_asset_form diff --git a/addons/account_asset/i18n/fi.po b/addons/account_asset/i18n/fi.po index a3066738fd4..ea0200e8b0b 100644 --- a/addons/account_asset/i18n/fi.po +++ b/addons/account_asset/i18n/fi.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-18 08:10+0000\n" -"PO-Revision-Date: 2015-10-02 14:59+0000\n" +"PO-Revision-Date: 2015-12-07 17:39+0000\n" "Last-Translator: Kari Lindgren \n" "Language-Team: Finnish (http://www.transifex.com/odoo/odoo-9/language/fi/)\n" "MIME-Version: 1.0\n" @@ -51,7 +51,7 @@ msgstr "Kirjanpitovienti" #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_message_needaction msgid "Action Needed" -msgstr "" +msgstr "Huomiota vaadittu" #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_active @@ -616,7 +616,7 @@ msgstr "Jos valittu, uudet viestit vaativat huomiosi." #. module: account_asset #: model:ir.model.fields,help:account_asset.field_account_asset_asset_message_needaction msgid "If checked, new messages require your attention." -msgstr "" +msgstr "Jos valittu, uudet viestit vaativat huomiosi." #. module: account_asset #: model:ir.ui.view,arch_db:account_asset.view_account_asset_category_form @@ -795,7 +795,7 @@ msgstr "" #. module: account_asset #: model:ir.model.fields,help:account_asset.field_account_asset_asset_message_unread_counter msgid "Number of unread messages" -msgstr "" +msgstr "Lukemattomien viestien määrä" #. module: account_asset #: code:addons/account_asset/account_asset.py:488 @@ -1025,7 +1025,7 @@ msgstr "" #: model:ir.ui.view,arch_db:account_asset.view_account_asset_asset_form #: model:ir.ui.view,arch_db:account_asset.view_account_asset_asset_purchase_tree msgid "Vendor" -msgstr "" +msgstr "Toimittaja" #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_website_message_ids diff --git a/addons/account_asset/i18n/id.po b/addons/account_asset/i18n/id.po index 2899115064a..fc89c28929c 100644 --- a/addons/account_asset/i18n/id.po +++ b/addons/account_asset/i18n/id.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-18 08:10+0000\n" -"PO-Revision-Date: 2015-12-02 23:38+0000\n" +"PO-Revision-Date: 2015-12-06 01:31+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Indonesian (http://www.transifex.com/odoo/odoo-9/language/id/)\n" "MIME-Version: 1.0\n" @@ -112,7 +112,7 @@ msgstr "Aset Durasi untuk memodifikasi" #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_account_invoice_line_asset_start_date msgid "Asset End Date" -msgstr "" +msgstr "Aset Akhir Bulan" #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_asset_modify_asset_method_time @@ -127,7 +127,7 @@ msgstr "Nama aset" #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_account_invoice_line_asset_end_date msgid "Asset Start Date" -msgstr "" +msgstr "Aset Tanggal Awal" #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_account_asset_category_name diff --git a/addons/account_asset/i18n/it.po b/addons/account_asset/i18n/it.po index 9b4b728ec96..294ece0f02a 100644 --- a/addons/account_asset/i18n/it.po +++ b/addons/account_asset/i18n/it.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-18 08:10+0000\n" -"PO-Revision-Date: 2015-11-18 13:51+0000\n" +"PO-Revision-Date: 2015-12-08 14:20+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Italian (http://www.transifex.com/odoo/odoo-9/language/it/)\n" "MIME-Version: 1.0\n" @@ -795,7 +795,7 @@ msgstr "" #. module: account_asset #: model:ir.model.fields,help:account_asset.field_account_asset_asset_message_unread_counter msgid "Number of unread messages" -msgstr "" +msgstr "Numero di messaggi non letti" #. module: account_asset #: code:addons/account_asset/account_asset.py:488 @@ -1019,7 +1019,7 @@ msgstr "Messaggi Non Letti" #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_message_unread_counter msgid "Unread Messages Counter" -msgstr "" +msgstr "Contatore di messsaggi non letti" #. module: account_asset #: model:ir.ui.view,arch_db:account_asset.view_account_asset_asset_form diff --git a/addons/account_asset/i18n/pt_BR.po b/addons/account_asset/i18n/pt_BR.po index 8102763b7a6..6e27b2795ef 100644 --- a/addons/account_asset/i18n/pt_BR.po +++ b/addons/account_asset/i18n/pt_BR.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-18 08:10+0000\n" -"PO-Revision-Date: 2015-11-10 15:30+0000\n" +"PO-Revision-Date: 2015-12-10 01:10+0000\n" "Last-Translator: Mateus Cerqueira Lopes \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/odoo/odoo-9/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -42,7 +42,7 @@ msgstr "" #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_asset_depreciation_confirmation_wizard_date msgid "Account Date" -msgstr "" +msgstr "Data da Conta" #. module: account_asset #: model:ir.model,name:account_asset.model_account_move @@ -113,7 +113,7 @@ msgstr "Ativos para modificar a duração" #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_account_invoice_line_asset_start_date msgid "Asset End Date" -msgstr "" +msgstr "Data de Fim de Ativo" #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_asset_modify_asset_method_time @@ -128,13 +128,13 @@ msgstr "Nome do Ativo" #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_account_invoice_line_asset_end_date msgid "Asset Start Date" -msgstr "" +msgstr "Data de Início de Ativo" #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_account_asset_category_name #: model:ir.model.fields,field_description:account_asset.field_product_template_asset_category_id msgid "Asset Type" -msgstr "" +msgstr "Tipo de Ativo" #. module: account_asset #: model:ir.actions.act_window,name:account_asset.action_account_asset_asset_list_normal_purchase @@ -231,7 +231,7 @@ msgstr "Categoria" #. module: account_asset #: model:ir.ui.view,arch_db:account_asset.view_account_asset_asset_form msgid "Category of asset" -msgstr "" +msgstr "Categoria de ativo" #. module: account_asset #: model:ir.model.fields,help:account_asset.field_account_asset_category_open_asset @@ -297,7 +297,7 @@ msgstr "Calcular Patrimônio" #. module: account_asset #: model:ir.ui.view,arch_db:account_asset.view_account_asset_asset_form msgid "Compute Depreciation" -msgstr "" +msgstr "Calcular Depreciação" #. module: account_asset #: model:ir.ui.view,arch_db:account_asset.view_account_asset_asset_form @@ -370,7 +370,7 @@ msgstr "Data" #. module: account_asset #: model:ir.ui.view,arch_db:account_asset.view_account_asset_asset_form msgid "Date of asset" -msgstr "" +msgstr "Data de ativo" #. module: account_asset #: model:ir.ui.view,arch_db:account_asset.view_asset_asset_report_search @@ -395,12 +395,12 @@ msgstr "" #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_product_template_deferred_revenue_category_id msgid "Deferred Revenue Type" -msgstr "" +msgstr "Tipo de Receita Diferida" #. module: account_asset #: model:ir.ui.view,arch_db:account_asset.view_account_asset_category_search msgid "Deferred Revenues" -msgstr "" +msgstr "Receitas Diferidas" #. module: account_asset #: selection:account.asset.asset,method:0 @@ -417,7 +417,7 @@ msgstr "Fator Degressiva" #. module: account_asset #: model:ir.ui.view,arch_db:account_asset.view_account_asset_asset_form msgid "Depreciation" -msgstr "" +msgstr "Depreciação" #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_account_asset_category_account_depreciation_id @@ -444,7 +444,7 @@ msgstr "Registro de Depreciação" #. module: account_asset #: model:ir.ui.view,arch_db:account_asset.view_account_asset_asset_form msgid "Depreciation Information" -msgstr "" +msgstr "Informação de Depreciação" #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_depreciation_line_ids @@ -586,7 +586,7 @@ msgstr "Valor Bruto" #. module: account_asset #: model:ir.ui.view,arch_db:account_asset.view_account_asset_asset_form msgid "Gross value of asset" -msgstr "" +msgstr "Valor bruto de ativos" #. module: account_asset #: model:ir.ui.view,arch_db:account_asset.view_asset_asset_report_search @@ -742,7 +742,7 @@ msgstr "Modificar Patrimônio" #. module: account_asset #: model:ir.ui.view,arch_db:account_asset.view_account_asset_asset_form msgid "Modify Depreciation" -msgstr "" +msgstr "Modificar Depreciação" #. module: account_asset #: model:ir.ui.view,arch_db:account_asset.view_account_asset_search @@ -936,7 +936,7 @@ msgstr "Procurar Categoria de Patrimônio" #. module: account_asset #: model:ir.ui.view,arch_db:account_asset.view_account_asset_asset_form msgid "Sell or Dispose" -msgstr "" +msgstr "Vender ou Dispor" #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_account_asset_depreciation_line_sequence diff --git a/addons/account_asset/i18n/sk.po b/addons/account_asset/i18n/sk.po index 26ab8d039a2..82ed4ac2b3f 100644 --- a/addons/account_asset/i18n/sk.po +++ b/addons/account_asset/i18n/sk.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-18 08:10+0000\n" -"PO-Revision-Date: 2015-10-24 10:03+0000\n" +"PO-Revision-Date: 2015-12-12 08:02+0000\n" "Last-Translator: Pavol Krnáč \n" "Language-Team: Slovak (http://www.transifex.com/odoo/odoo-9/language/sk/)\n" "MIME-Version: 1.0\n" @@ -517,7 +517,7 @@ msgstr "Návrh" #: selection:account.asset.category,method_time:0 #: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_method_end msgid "Ending Date" -msgstr "" +msgstr "Dátum ukončenia" #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_account_asset_category_method_end @@ -884,7 +884,7 @@ msgstr "" #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_asset_modify_name msgid "Reason" -msgstr "" +msgstr "Dôvod " #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_account_asset_category_account_income_recognition_id @@ -1025,7 +1025,7 @@ msgstr "Počítadlo neprečítaných správ" #: model:ir.ui.view,arch_db:account_asset.view_account_asset_asset_form #: model:ir.ui.view,arch_db:account_asset.view_account_asset_asset_purchase_tree msgid "Vendor" -msgstr "" +msgstr "Predajca" #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_website_message_ids diff --git a/addons/account_asset/i18n/zh_CN.po b/addons/account_asset/i18n/zh_CN.po index f7c7493fb59..9c49731e73c 100644 --- a/addons/account_asset/i18n/zh_CN.po +++ b/addons/account_asset/i18n/zh_CN.po @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-18 08:10+0000\n" -"PO-Revision-Date: 2015-12-02 04:42+0000\n" +"PO-Revision-Date: 2015-12-10 01:22+0000\n" "Last-Translator: jeffery chen fan \n" "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -31,7 +31,7 @@ msgstr " (副本)" #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_entry_count msgid "# Asset Entries" -msgstr "# 资产条目" +msgstr "# 资产分录" #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_asset_asset_report_depreciation_nbr @@ -51,12 +51,12 @@ msgstr "会计日期" #. module: account_asset #: model:ir.model,name:account_asset.model_account_move msgid "Account Entry" -msgstr "科目条目" +msgstr "科目分录" #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_message_needaction msgid "Action Needed" -msgstr "所需行动" +msgstr "所需动作" #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_active @@ -318,7 +318,7 @@ msgstr "新建固定资产会计凭证" #: code:addons/account_asset/wizard/wizard_asset_compute.py:20 #, python-format msgid "Created Revenue Moves" -msgstr "创建收入变动" +msgstr "创建收入凭证" #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_create_uid @@ -327,7 +327,7 @@ msgstr "创建收入变动" #: model:ir.model.fields,field_description:account_asset.field_asset_depreciation_confirmation_wizard_create_uid #: model:ir.model.fields,field_description:account_asset.field_asset_modify_create_uid msgid "Created by" -msgstr "创建于" +msgstr "创建人" #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_create_date @@ -336,7 +336,7 @@ msgstr "创建于" #: model:ir.model.fields,field_description:account_asset.field_asset_depreciation_confirmation_wizard_create_date #: model:ir.model.fields,field_description:account_asset.field_asset_modify_create_date msgid "Created on" -msgstr "创建于" +msgstr "创建时间" #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_account_asset_depreciation_line_depreciated_value @@ -443,7 +443,7 @@ msgstr "折旧日期" #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_account_asset_depreciation_line_move_id msgid "Depreciation Entry" -msgstr "折旧条目" +msgstr "折旧分录" #. module: account_asset #: model:ir.ui.view,arch_db:account_asset.view_account_asset_asset_form @@ -668,7 +668,7 @@ msgstr "折旧后资产的剩余价值金额" #. module: account_asset #: model:ir.ui.view,arch_db:account_asset.view_account_asset_asset_form msgid "Items" -msgstr "翻译项" +msgstr "项目" #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_account_asset_category_journal_id @@ -704,7 +704,7 @@ msgstr "最后修改日" #: model:ir.model.fields,field_description:account_asset.field_asset_depreciation_confirmation_wizard_write_uid #: model:ir.model.fields,field_description:account_asset.field_asset_modify_write_uid msgid "Last Updated by" -msgstr "最后更新" +msgstr "最后更新人" #. module: account_asset #: model:ir.model.fields,field_description:account_asset.field_account_asset_asset_write_date @@ -713,7 +713,7 @@ msgstr "最后更新" #: model:ir.model.fields,field_description:account_asset.field_asset_depreciation_confirmation_wizard_write_date #: model:ir.model.fields,field_description:account_asset.field_asset_modify_write_date msgid "Last Updated on" -msgstr "最后更新" +msgstr "最后更新时间" #. module: account_asset #: selection:account.asset.asset,method:0 @@ -1066,7 +1066,7 @@ msgstr "在 %s 状态, 你不能删除文档." #: code:addons/account_asset/account_asset.py:102 #, python-format msgid "You cannot delete a document that contains posted entries." -msgstr "您不能删除包含过期条目的文档" +msgstr "您不能删除包含已过账分录的文档" #. module: account_asset #: code:addons/account_asset/account_asset.py:497 diff --git a/addons/account_bank_statement_import/i18n/hr.po b/addons/account_bank_statement_import/i18n/hr.po index c7512631a1b..0148bf88ace 100644 --- a/addons/account_bank_statement_import/i18n/hr.po +++ b/addons/account_bank_statement_import/i18n/hr.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-07 14:40+0000\n" -"PO-Revision-Date: 2015-11-18 13:10+0000\n" +"PO-Revision-Date: 2015-12-09 13:55+0000\n" "Last-Translator: Ivica Dimjašević \n" "Language-Team: Croatian (http://www.transifex.com/odoo/odoo-9/language/hr/)\n" "MIME-Version: 1.0\n" @@ -413,7 +413,7 @@ msgstr "" #. module: account_bank_statement_import #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_display_on_footer msgid "Show in Invoices Footer" -msgstr "" +msgstr "Prikaži u podnožju računa" #. module: account_bank_statement_import #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_show_on_dashboard diff --git a/addons/account_bank_statement_import/i18n/pt_BR.po b/addons/account_bank_statement_import/i18n/pt_BR.po index c8128537125..013147ac4cf 100644 --- a/addons/account_bank_statement_import/i18n/pt_BR.po +++ b/addons/account_bank_statement_import/i18n/pt_BR.po @@ -4,14 +4,15 @@ # # Translators: # Gideoni Willian da Silva , 2015 +# Grazziano Duarte , 2015 # Mateus Cerqueira Lopes , 2015 msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-07 14:40+0000\n" -"PO-Revision-Date: 2015-11-16 12:42+0000\n" -"Last-Translator: Gideoni Willian da Silva \n" +"PO-Revision-Date: 2015-12-10 01:10+0000\n" +"Last-Translator: Grazziano Duarte \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/odoo/odoo-9/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,12 +30,12 @@ msgstr "%d transações já haviam sido importadas e foram ignoradas." #: code:addons/account_bank_statement_import/account_bank_statement_import.py:226 #, python-format msgid "1 transaction had already been imported and was ignored." -msgstr "" +msgstr "1 transação já havia sido importada e foi ignorada." #. module: account_bank_statement_import #: sql_constraint:account.bank.statement.line:0 msgid "A bank account transactions can be imported only once !" -msgstr "" +msgstr "Transações de contas bancárias podem ser importados apenas uma vez !" #. module: account_bank_statement_import #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_bank_acc_number @@ -44,12 +45,12 @@ msgstr "Número de Conta" #. module: account_bank_statement_import #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_type_control_ids msgid "Account Types Allowed" -msgstr "" +msgstr "Tipos de Contas Permitidas" #. module: account_bank_statement_import #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_account_control_ids msgid "Accounts Allowed" -msgstr "" +msgstr "Contas Permitidas" #. module: account_bank_statement_import #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_update_posted @@ -60,17 +61,17 @@ msgstr "Permite cancelar lançamentos" #: code:addons/account_bank_statement_import/account_bank_statement_import.py:228 #, python-format msgid "Already imported items" -msgstr "" +msgstr "Itens já importados" #. module: account_bank_statement_import #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_at_least_one_inbound msgid "At least one inbound" -msgstr "" +msgstr "Pelo menos uma entrada" #. module: account_bank_statement_import #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_at_least_one_outbound msgid "At least one outbound" -msgstr "" +msgstr "Pelo menos uma saída" #. module: account_bank_statement_import #: code:addons/account_bank_statement_import/account_bank_statement_import.py:75 @@ -92,12 +93,12 @@ msgstr "" #. module: account_bank_statement_import #: model:ir.ui.view,arch_db:account_bank_statement_import.account_bank_statement_import_journal_creation_view msgid "Bank Journal Name" -msgstr "" +msgstr "Nome do Diário Bancário" #. module: account_bank_statement_import #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_data_file msgid "Bank Statement File" -msgstr "" +msgstr "Arquivo de Extrato Bancário" #. module: account_bank_statement_import #: model:ir.model,name:account_bank_statement_import.model_account_bank_statement_line @@ -116,7 +117,7 @@ msgstr "Cancelar" msgid "" "Cannot find in which journal import this statement. Please manually select a" " journal." -msgstr "" +msgstr "Não foi possível encontrar em qual diário importar este extrato. Por favor, selecione manualmente um diário." #. module: account_bank_statement_import #: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_refund_sequence @@ -135,7 +136,7 @@ msgstr "Marque este box se você quiser permitir o cancelamento dos lançamentos #. module: account_bank_statement_import #: model:ir.ui.view,arch_db:account_bank_statement_import.account_bank_statement_import_view msgid "Choose a file to import..." -msgstr "" +msgstr "Escolha um arquivo para importar..." #. module: account_bank_statement_import #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_company_id @@ -153,7 +154,7 @@ msgstr "Empresa relacionada a este diário" msgid "" "Could not make sense of the given file.\n" "Did you install the module to support this type of file ?" -msgstr "" +msgstr "Não foi possível entender arquivo enviado.\nVocê instalou o módulo de apoio a este tipo de arquivo?" #. module: account_bank_statement_import #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_create_uid @@ -175,12 +176,12 @@ msgstr "Moeda" #. module: account_bank_statement_import #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_inbound_payment_method_ids msgid "Debit Methods" -msgstr "" +msgstr "Métodos de Débito" #. module: account_bank_statement_import #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_refund_sequence msgid "Dedicated Refund Sequence" -msgstr "" +msgstr "Seqüência de Reembolso Dedicado" #. module: account_bank_statement_import #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_default_credit_account_id @@ -210,7 +211,7 @@ msgstr "Exibir esta conta bancária no rodapé de documentos impressos como nota msgid "" "Download a bank statement from your bank and import it here. Supported " "formats:" -msgstr "" +msgstr "Baixe um extrato bancário do seu banco e importe-o aqui. Formatos suportados:" #. module: account_bank_statement_import #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_sequence_id @@ -222,7 +223,7 @@ msgstr "Sequencia de lançamento" msgid "" "Get you bank statements in electronic format from your bank and select them " "here." -msgstr "" +msgstr "Obtenha seus extratos bancários em formato eletrônico do seu banco e selecione-os aqui." #. module: account_bank_statement_import #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_group_invoice_lines @@ -265,12 +266,12 @@ msgstr "Importar Extrato Bancário" #. module: account_bank_statement_import #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_line_unique_import_id msgid "Import ID" -msgstr "" +msgstr "Importar ID" #. module: account_bank_statement_import #: model:ir.ui.view,arch_db:account_bank_statement_import.journal_dashboard_view_inherit msgid "Import Statement" -msgstr "" +msgstr "Importar Extrato" #. module: account_bank_statement_import #: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_default_credit_account_id @@ -292,7 +293,7 @@ msgstr "Diário" #: model:ir.ui.view,arch_db:account_bank_statement_import.account_bank_statement_import_journal_creation_view #, python-format msgid "Journal Creation" -msgstr "" +msgstr "Criação de Diário" #. module: account_bank_statement_import #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_name @@ -302,14 +303,14 @@ msgstr "Nome do Diário" #. module: account_bank_statement_import #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_journal_id msgid "Journal id" -msgstr "" +msgstr "ID do Diário" #. module: account_bank_statement_import #: model:ir.ui.view,arch_db:account_bank_statement_import.account_bank_statement_import_journal_creation_view msgid "" "Just click OK to create the account/journal and finish the import. If this " "was a mistake, hit cancel to abort the import." -msgstr "" +msgstr "Basta clicar em OK para criar a conta/diário e terminar a importação. Se isso foi um erro, clique em Cancelar para interromper a importação." #. module: account_bank_statement_import #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_kanban_dashboard @@ -364,7 +365,7 @@ msgstr "" #: code:addons/account_bank_statement_import/account_bank_statement_import.py:132 #, python-format msgid "No currency found matching '%s'." -msgstr "" +msgstr "Nenhuma correspondência de moeda encontrada '%s'." #. module: account_bank_statement_import #: model:ir.ui.view,arch_db:account_bank_statement_import.account_bank_statement_import_journal_creation_view @@ -384,7 +385,7 @@ msgstr "Conta de Resultados" #. module: account_bank_statement_import #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_refund_sequence_id msgid "Refund Entry Sequence" -msgstr "" +msgstr "Sequência de Reembolso de Entrada" #. module: account_bank_statement_import #: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_type @@ -399,7 +400,7 @@ msgstr "Escolha 'Venda' para diários de faturas de clientes. Escolha 'Compra' p #. module: account_bank_statement_import #: model:ir.ui.view,arch_db:account_bank_statement_import.account_bank_statement_import_view msgid "Select a bank statement file to import" -msgstr "" +msgstr "Selecione um arquivo de extrato bancário para importar" #. module: account_bank_statement_import #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_sequence @@ -409,17 +410,17 @@ msgstr "Seqüência" #. module: account_bank_statement_import #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_code msgid "Short Code" -msgstr "" +msgstr "Código Abreviado" #. module: account_bank_statement_import #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_display_on_footer msgid "Show in Invoices Footer" -msgstr "" +msgstr "Mostrar no Rodapé das Faturas" #. module: account_bank_statement_import #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_show_on_dashboard msgid "Show journal on dashboard" -msgstr "" +msgstr "Mostrar diário no dashboard" #. module: account_bank_statement_import #: model:ir.ui.view,arch_db:account_bank_statement_import.account_bank_statement_import_journal_creation_view @@ -427,14 +428,14 @@ msgid "" "The account of the statement you are importing is not yet recorded in Odoo. " "In order to proceed with the import, you need to create a bank journal for " "this account." -msgstr "" +msgstr "A conta do extrato que você está tentando importar ainda não está registrada no Odoo. A fim de prosseguir com a importação, você precisa criar um diário de banco para esta conta." #. module: account_bank_statement_import #: code:addons/account_bank_statement_import/account_bank_statement_import.py:143 #, python-format msgid "" "The account of this statement (%s) is not the same as the journal (%s)." -msgstr "" +msgstr "A conta deste extrato (%s) não é a mesma que o diário (%s)." #. module: account_bank_statement_import #: code:addons/account_bank_statement_import/account_bank_statement_import.py:156 @@ -442,7 +443,7 @@ msgstr "" msgid "" "The currency of the bank statement (%s) is not the same as the currency of " "the journal (%s) !" -msgstr "" +msgstr "A moeda do extrato bancário (%s) não é a mesma que a moeda do diário (%s) !" #. module: account_bank_statement_import #: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_currency_id @@ -452,7 +453,7 @@ msgstr "A moeda utilizada para entradas no informe/demonstrativo" #. module: account_bank_statement_import #: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_code msgid "The journal entries of this journal will be named using this prefix." -msgstr "" +msgstr "Os lançamentos deste diário serão nomeados utilizando esse prefixo." #. module: account_bank_statement_import #: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_sequence_id @@ -472,13 +473,13 @@ msgstr "Este campo contém a informação relacionada com a numeração dos lan #: code:addons/account_bank_statement_import/account_bank_statement_import.py:110 #, python-format msgid "This file doesn't contain any statement." -msgstr "" +msgstr "Este arquivo não contém qualquer extrato." #. module: account_bank_statement_import #: code:addons/account_bank_statement_import/account_bank_statement_import.py:118 #, python-format msgid "This file doesn't contain any transaction." -msgstr "" +msgstr "Este arquivo não contém qualquer transação." #. module: account_bank_statement_import #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_journal_creation_type @@ -488,7 +489,7 @@ msgstr "Tipo" #. module: account_bank_statement_import #: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_sequence msgid "Used to order Journals in the dashboard view" -msgstr "" +msgstr "Usado para organizar Diários no dashboard" #. module: account_bank_statement_import #: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_loss_account_id @@ -507,13 +508,13 @@ msgstr "" #. module: account_bank_statement_import #: model:ir.model.fields,help:account_bank_statement_import.field_account_bank_statement_import_journal_creation_show_on_dashboard msgid "Whether this journal should be displayed on the dashboard or not" -msgstr "" +msgstr "Se este diário deve ser exibid no dashboard ou não" #. module: account_bank_statement_import #: code:addons/account_bank_statement_import/account_bank_statement_import.py:218 #, python-format msgid "You have already imported that file." -msgstr "" +msgstr "Você já importou esse arquivo." #. module: account_bank_statement_import #: model:ir.ui.view,arch_db:account_bank_statement_import.account_bank_statement_import_view diff --git a/addons/account_bank_statement_import/i18n/zh_CN.po b/addons/account_bank_statement_import/i18n/zh_CN.po index b95345f4f68..a477b554caf 100644 --- a/addons/account_bank_statement_import/i18n/zh_CN.po +++ b/addons/account_bank_statement_import/i18n/zh_CN.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-07 14:40+0000\n" -"PO-Revision-Date: 2015-11-12 07:49+0000\n" -"Last-Translator: Gary Wei \n" +"PO-Revision-Date: 2015-12-09 14:14+0000\n" +"Last-Translator: jeffery chen fan \n" "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -91,7 +91,7 @@ msgstr "银行费用" #. module: account_bank_statement_import #: model:ir.ui.view,arch_db:account_bank_statement_import.account_bank_statement_import_journal_creation_view msgid "Bank Journal Name" -msgstr "银行日记账名字" +msgstr "银行日记账名称" #. module: account_bank_statement_import #: model:ir.model.fields,field_description:account_bank_statement_import.field_account_bank_statement_import_data_file diff --git a/addons/account_budget/account_budget.py b/addons/account_budget/account_budget.py index 228046587b7..965b9515b73 100644 --- a/addons/account_budget/account_budget.py +++ b/addons/account_budget/account_budget.py @@ -168,7 +168,7 @@ class crossovered_budget_lines(osv.osv): _description = "Budget Line" _columns = { 'crossovered_budget_id': fields.many2one('crossovered.budget', 'Budget', ondelete='cascade', select=True, required=True), - 'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account'), + 'analytic_account_id': fields.many2one('account.analytic.account', 'Analytic Account', domain=[('account_type', '=', 'normal')]), 'general_budget_id': fields.many2one('account.budget.post', 'Budgetary Position',required=True), 'date_from': fields.date('Start Date', required=True), 'date_to': fields.date('End Date', required=True), diff --git a/addons/account_budget/i18n/es_MX.po b/addons/account_budget/i18n/es_MX.po index 0f38a1c0f33..48c2b406126 100644 --- a/addons/account_budget/i18n/es_MX.po +++ b/addons/account_budget/i18n/es_MX.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-18 08:11+0000\n" -"PO-Revision-Date: 2015-11-14 19:47+0000\n" +"PO-Revision-Date: 2015-12-09 02:05+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/odoo/odoo-9/language/es_MX/)\n" "MIME-Version: 1.0\n" @@ -260,7 +260,7 @@ msgstr "Creado en" #. module: account_budget #: model:ir.model.fields,help:account_budget.field_crossovered_budget_message_last_post msgid "Date of the last message posted on the record." -msgstr "" +msgstr "Fecha de último trabajo realizado en esta cuenta" #. module: account_budget #: model:ir.ui.view,arch_db:account_budget.report_analyticaccountbudget @@ -327,7 +327,7 @@ msgstr "Seguidores" #. module: account_budget #: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_message_partner_ids msgid "Followers (Partners)" -msgstr "" +msgstr "Seguidores (Socios)" #. module: account_budget #: model:ir.model.fields,field_description:account_budget.field_account_budget_analytic_id @@ -361,7 +361,7 @@ msgstr "Es un Seguidor" #. module: account_budget #: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_message_last_post msgid "Last Message Date" -msgstr "" +msgstr "Fecha de último mensaje" #. module: account_budget #: model:ir.model.fields,field_description:account_budget.field_account_budget_analytic___last_update @@ -417,17 +417,17 @@ msgstr "Nombre" #. module: account_budget #: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_message_needaction_counter msgid "Number of Actions" -msgstr "" +msgstr "Número de acciones" #. module: account_budget #: model:ir.model.fields,help:account_budget.field_crossovered_budget_message_needaction_counter msgid "Number of messages which requires an action" -msgstr "" +msgstr "Número de mensajes que requieren una acción" #. module: account_budget #: model:ir.model.fields,help:account_budget.field_crossovered_budget_message_unread_counter msgid "Number of unread messages" -msgstr "" +msgstr "Número de mensajes sin leer" #. module: account_budget #: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_lines_paid_date @@ -583,7 +583,7 @@ msgstr "Mensajes sin leer" #. module: account_budget #: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_message_unread_counter msgid "Unread Messages Counter" -msgstr "" +msgstr "Contador de mensajes sin leer" #. module: account_budget #: selection:crossovered.budget,state:0 diff --git a/addons/account_budget/i18n/fi.po b/addons/account_budget/i18n/fi.po index 922dcfee231..bf496397cb2 100644 --- a/addons/account_budget/i18n/fi.po +++ b/addons/account_budget/i18n/fi.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-18 08:11+0000\n" -"PO-Revision-Date: 2015-10-02 11:55+0000\n" +"PO-Revision-Date: 2015-12-07 17:39+0000\n" "Last-Translator: Kari Lindgren \n" "Language-Team: Finnish (http://www.transifex.com/odoo/odoo-9/language/fi/)\n" "MIME-Version: 1.0\n" @@ -101,7 +101,7 @@ msgstr "" #. module: account_budget #: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_message_needaction msgid "Action Needed" -msgstr "" +msgstr "Huomiota vaadittu" #. module: account_budget #: model:ir.model,name:account_budget.model_account_analytic_account @@ -351,7 +351,7 @@ msgstr "Jos valittu, uudet viestit vaativat huomiosi." #. module: account_budget #: model:ir.model.fields,help:account_budget.field_crossovered_budget_message_needaction msgid "If checked, new messages require your attention." -msgstr "" +msgstr "Jos valittu, uudet viestit vaativat huomiosi." #. module: account_budget #: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_message_is_follower @@ -427,7 +427,7 @@ msgstr "" #. module: account_budget #: model:ir.model.fields,help:account_budget.field_crossovered_budget_message_unread_counter msgid "Number of unread messages" -msgstr "" +msgstr "Lukemattomien viestien määrä" #. module: account_budget #: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_lines_paid_date diff --git a/addons/account_budget/i18n/it.po b/addons/account_budget/i18n/it.po index 98d6864d280..b60a6e84144 100644 --- a/addons/account_budget/i18n/it.po +++ b/addons/account_budget/i18n/it.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-18 08:11+0000\n" -"PO-Revision-Date: 2015-11-24 12:32+0000\n" +"PO-Revision-Date: 2015-12-08 14:20+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Italian (http://www.transifex.com/odoo/odoo-9/language/it/)\n" "MIME-Version: 1.0\n" @@ -427,7 +427,7 @@ msgstr "" #. module: account_budget #: model:ir.model.fields,help:account_budget.field_crossovered_budget_message_unread_counter msgid "Number of unread messages" -msgstr "" +msgstr "Numero di messaggi non letti" #. module: account_budget #: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_lines_paid_date @@ -583,7 +583,7 @@ msgstr "Messaggi Non Letti" #. module: account_budget #: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_message_unread_counter msgid "Unread Messages Counter" -msgstr "" +msgstr "Contatore di messsaggi non letti" #. module: account_budget #: selection:crossovered.budget,state:0 diff --git a/addons/account_budget/i18n/pt_BR.po b/addons/account_budget/i18n/pt_BR.po index 2defa681904..ced370c6f14 100644 --- a/addons/account_budget/i18n/pt_BR.po +++ b/addons/account_budget/i18n/pt_BR.po @@ -4,14 +4,15 @@ # # Translators: # Gideoni Willian da Silva , 2015 +# Grazziano Duarte , 2015 # Mateus Cerqueira Lopes , 2015 msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-18 08:11+0000\n" -"PO-Revision-Date: 2015-11-16 12:42+0000\n" -"Last-Translator: Gideoni Willian da Silva \n" +"PO-Revision-Date: 2015-12-10 01:10+0000\n" +"Last-Translator: Grazziano Duarte \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/odoo/odoo-9/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,41 +29,41 @@ msgstr "Análise de :" #. module: account_budget #: model:ir.ui.view,arch_db:account_budget.report_analyticaccountbudget msgid "Analysis from" -msgstr "" +msgstr "Análise de " #. module: account_budget #: model:ir.ui.view,arch_db:account_budget.report_analyticaccountbudget msgid "Analytic Account" -msgstr "" +msgstr "Conta Analítica" #. module: account_budget #: model:ir.ui.view,arch_db:account_budget.report_budget #: model:ir.ui.view,arch_db:account_budget.report_crossoveredbudget msgid "Budget:" -msgstr "" +msgstr "Orçamento:" #. module: account_budget #: model:ir.ui.view,arch_db:account_budget.report_budget #: model:ir.ui.view,arch_db:account_budget.report_crossoveredbudget msgid "Currency:" -msgstr "" +msgstr "Moeda:" #. module: account_budget #: model:ir.ui.view,arch_db:account_budget.report_analyticaccountbudget msgid "Currency" -msgstr "" +msgstr "Moeda" #. module: account_budget #: model:ir.ui.view,arch_db:account_budget.report_budget msgid "Printed at:" -msgstr "" +msgstr "Impresso em:" #. module: account_budget #: model:ir.ui.view,arch_db:account_budget.report_analyticaccountbudget #: model:ir.ui.view,arch_db:account_budget.report_budget #: model:ir.ui.view,arch_db:account_budget.report_crossoveredbudget msgid "Total:" -msgstr "" +msgstr "Total:" #. module: account_budget #: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view @@ -71,7 +72,7 @@ msgid "" " expected for a period in the future. A budget is defined on some\n" " financial accounts and/or analytic accounts (that may represent\n" " projects, departments, categories of products, etc.)" -msgstr "" +msgstr "Um orçamento é uma previsão de receitas e/ou despesas\nesperadas para um período no futuro. Um orçamento é definido em algumas\ncontas financeiras e/ou contas analíticas (que podem representar\nprojetos, departamentos, categorias de produtos, etc.)" #. module: account_budget #: model:ir.model,name:account_budget.model_account_budget_crossvered_report @@ -98,7 +99,7 @@ msgstr "Contas" #. module: account_budget #: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_lines_percentage msgid "Achievement" -msgstr "" +msgstr "Obtenção" #. module: account_budget #: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_message_needaction @@ -137,7 +138,7 @@ msgstr "Orçamento" #: model:ir.actions.act_window,name:account_budget.act_account_analytic_account_cb_lines #: model:ir.ui.view,arch_db:account_budget.view_account_analytic_account_form_inherit_budget msgid "Budget Items" -msgstr "" +msgstr "Itens do Orçamento" #. module: account_budget #: model:ir.model,name:account_budget.model_crossovered_budget_lines @@ -159,7 +160,7 @@ msgstr "Linhas do Orçamento" #: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_name #: model:ir.ui.view,arch_db:account_budget.crossovered_budget_view_form msgid "Budget Name" -msgstr "" +msgstr "Nome do Orçamento" #. module: account_budget #: model:ir.model,name:account_budget.model_account_budget_post @@ -195,7 +196,7 @@ msgid "" " goals. Forecast a budget by detailing the expected revenue per\n" " analytic account and monitor its evolution based on the actuals\n" " realised during that period." -msgstr "" +msgstr "Ao manter o controle de onde vai o seu dinheiro, você pode ser menos\npropenso a gastar mais, e mais propenso a cumprir o seu objetivo financeiro.\nPrevê um orçamento, detalhando a receita esperada por\nconta analítica e monitora sua evolução com base nos valores reais\nrealizados durante esse período." #. module: account_budget #: model:ir.ui.view,arch_db:account_budget.account_budget_analytic_view @@ -218,7 +219,7 @@ msgstr "Cancelado" #. module: account_budget #: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view msgid "Click to create a new budget." -msgstr "" +msgstr "Clique para criar um novo orçamento" #. module: account_budget #: model:ir.model.fields,field_description:account_budget.field_account_budget_post_company_id @@ -353,7 +354,7 @@ msgstr "Se marcado novas mensagens solicitarão sua atenção." #. module: account_budget #: model:ir.model.fields,help:account_budget.field_crossovered_budget_message_needaction msgid "If checked, new messages require your attention." -msgstr "" +msgstr "Se marcado novas mensagens solicitarão sua atenção." #. module: account_budget #: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_message_is_follower @@ -419,7 +420,7 @@ msgstr "Nome" #. module: account_budget #: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_message_needaction_counter msgid "Number of Actions" -msgstr "" +msgstr "Número de ações" #. module: account_budget #: model:ir.model.fields,help:account_budget.field_crossovered_budget_message_needaction_counter @@ -610,17 +611,17 @@ msgstr "em" #. module: account_budget #: model:ir.model,name:account_budget.model_report_account_budget_report_analyticaccountbudget msgid "report.account_budget.report_analyticaccountbudget" -msgstr "" +msgstr "report.account_budget.report_analyticaccountbudget" #. module: account_budget #: model:ir.model,name:account_budget.model_report_account_budget_report_budget msgid "report.account_budget.report_budget" -msgstr "" +msgstr "report.account_budget.report_budget" #. module: account_budget #: model:ir.model,name:account_budget.model_report_account_budget_report_crossoveredbudget msgid "report.account_budget.report_crossoveredbudget" -msgstr "" +msgstr "report.account_budget.report_crossoveredbudget" #. module: account_budget #: model:ir.ui.view,arch_db:account_budget.report_analyticaccountbudget diff --git a/addons/account_budget/i18n/sk.po b/addons/account_budget/i18n/sk.po index 0e187f671a1..e54d0d160aa 100644 --- a/addons/account_budget/i18n/sk.po +++ b/addons/account_budget/i18n/sk.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-18 08:11+0000\n" -"PO-Revision-Date: 2015-10-13 19:36+0000\n" +"PO-Revision-Date: 2015-12-12 20:43+0000\n" "Last-Translator: Pavol Krnáč \n" "Language-Team: Slovak (http://www.transifex.com/odoo/odoo-9/language/sk/)\n" "MIME-Version: 1.0\n" @@ -60,7 +60,7 @@ msgstr "" #: model:ir.ui.view,arch_db:account_budget.report_budget #: model:ir.ui.view,arch_db:account_budget.report_crossoveredbudget msgid "Total:" -msgstr "" +msgstr "Spolu:" #. module: account_budget #: model:ir.actions.act_window,help:account_budget.act_crossovered_budget_view @@ -117,7 +117,7 @@ msgstr "" #. module: account_budget #: model:ir.ui.view,arch_db:account_budget.crossovered_budget_view_form msgid "Approve" -msgstr "" +msgstr "Schváliť" #. module: account_budget #: model:ir.actions.report.xml,name:account_budget.action_report_budget @@ -444,7 +444,7 @@ msgstr "" #. module: account_budget #: model:ir.ui.view,arch_db:account_budget.crossovered_budget_view_form msgid "Period" -msgstr "" +msgstr "Obdobie" #. module: account_budget #: model:ir.model.fields,field_description:account_budget.field_crossovered_budget_lines_planned_amount @@ -568,7 +568,7 @@ msgstr "" #. module: account_budget #: model:ir.ui.view,arch_db:account_budget.view_crossovered_budget_search msgid "To Approve" -msgstr "" +msgstr "Na schválenie" #. module: account_budget #: model:ir.ui.view,arch_db:account_budget.view_crossovered_budget_search @@ -603,7 +603,7 @@ msgstr "História komunikácie webovej stránky" #. module: account_budget #: model:ir.ui.view,arch_db:account_budget.report_budget msgid "at" -msgstr "" +msgstr "k" #. module: account_budget #: model:ir.model,name:account_budget.model_report_account_budget_report_analyticaccountbudget @@ -625,4 +625,4 @@ msgstr "" #: model:ir.ui.view,arch_db:account_budget.report_budget #: model:ir.ui.view,arch_db:account_budget.report_crossoveredbudget msgid "to" -msgstr "" +msgstr "na" diff --git a/addons/account_check_printing/i18n/pt_BR.po b/addons/account_check_printing/i18n/pt_BR.po index fd4636f6d9f..edc9ffd65c5 100644 --- a/addons/account_check_printing/i18n/pt_BR.po +++ b/addons/account_check_printing/i18n/pt_BR.po @@ -3,14 +3,15 @@ # * account_check_printing # # Translators: +# Grazziano Duarte , 2015 # Mateus Cerqueira Lopes , 2015 msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-14 10:27+0000\n" -"PO-Revision-Date: 2015-11-10 15:30+0000\n" -"Last-Translator: Mateus Cerqueira Lopes \n" +"PO-Revision-Date: 2015-12-10 01:10+0000\n" +"Last-Translator: Grazziano Duarte \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/odoo/odoo-9/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,20 +23,20 @@ msgstr "" #: code:addons/account_check_printing/account_journal.py:55 #, python-format msgid " : Check Number Sequence" -msgstr "" +msgstr ": Sequência Numérica de Cheque" #. module: account_check_printing #: code:addons/account_check_printing/account_payment.py:35 #: code:addons/account_check_printing/account_payment.py:72 #, python-format msgid " and %s/100" -msgstr "" +msgstr " e %s/100" #. module: account_check_printing #: code:addons/account_check_printing/account_payment.py:81 #, python-format msgid "A check memo cannot exceed 60 characters." -msgstr "" +msgstr "Um memorando de chque não pode exceder 60 caracteres." #. module: account_check_printing #: model:ir.model.fields,field_description:account_check_printing.field_account_payment_check_amount_in_words @@ -52,55 +53,55 @@ msgstr "Cancelar" #: model:ir.model.fields,field_description:account_check_printing.field_account_payment_check_number #: model:ir.model.fields,field_description:account_check_printing.field_account_register_payments_check_number msgid "Check Number" -msgstr "" +msgstr "Número do Cheque" #. module: account_check_printing #: model:ir.ui.view,arch_db:account_check_printing.view_account_journal_form_inherited msgid "Check Printing" -msgstr "" +msgstr "Impressão de Cheque" #. module: account_check_printing #: model:ir.model.fields,field_description:account_check_printing.field_account_journal_check_sequence_id msgid "Check Sequence" -msgstr "" +msgstr "Sequência de Cheque" #. module: account_check_printing #: model:ir.model.fields,field_description:account_check_printing.field_account_journal_check_printing_payment_method_selected msgid "Check printing payment method selected" -msgstr "" +msgstr "Método de pagamento de impressão de cheques selecionado" #. module: account_check_printing #: model:ir.model.fields,help:account_check_printing.field_account_journal_check_manual_sequencing #: model:ir.model.fields,help:account_check_printing.field_account_payment_check_manual_sequencing #: model:ir.model.fields,help:account_check_printing.field_account_register_payments_check_manual_sequencing msgid "Check this option if your pre-printed checks are not numbered." -msgstr "" +msgstr "Marque esta opção se seus cheques pré-impressos não são numerados." #. module: account_check_printing #: model:ir.ui.view,arch_db:account_check_printing.account_journal_dashboard_kanban_view_inherited msgid "Check to print" -msgstr "" +msgstr "Cheque para imprimir" #. module: account_check_printing #: model:ir.ui.view,arch_db:account_check_printing.view_payment_check_printing_search msgid "Checks To Print" -msgstr "" +msgstr "Cheques para Imprimir" #. module: account_check_printing #: model:ir.model.fields,help:account_check_printing.field_account_journal_check_sequence_id msgid "Checks numbering sequence." -msgstr "" +msgstr "Sequência de numeração de cheques." #. module: account_check_printing #: code:addons/account_check_printing/account_journal_dashboard.py:23 #, python-format msgid "Checks to Print" -msgstr "" +msgstr "Cheques para Imprimir" #. module: account_check_printing #: model:ir.ui.view,arch_db:account_check_printing.account_journal_dashboard_kanban_view_inherited msgid "Checks to print" -msgstr "" +msgstr "Cheques para Imprimir" #. module: account_check_printing #: model:ir.model.fields,field_description:account_check_printing.field_print_prenumbered_checks_create_uid @@ -128,7 +129,7 @@ msgstr "ID" msgid "" "In order to print multiple checks at once, they must belong to the same bank" " journal." -msgstr "" +msgstr "A fim de imprimir vários cheques de uma vez, eles devem pertencer ao mesmo diário bancário." #. module: account_check_printing #: model:ir.model,name:account_check_printing.model_account_journal @@ -155,7 +156,7 @@ msgstr "Última atualização em" #: model:ir.model.fields,field_description:account_check_printing.field_account_payment_check_manual_sequencing #: model:ir.model.fields,field_description:account_check_printing.field_account_register_payments_check_manual_sequencing msgid "Manual Numbering" -msgstr "" +msgstr "Numeração Manual" #. module: account_check_printing #: model:ir.model.fields,field_description:account_check_printing.field_account_journal_check_next_number @@ -169,7 +170,7 @@ msgid "" "Number of the check corresponding to this payment. If your pre-printed check" " are not already numbered, you can manage the numbering in the journal " "configuration page." -msgstr "" +msgstr "Número do cheque correspondente a esse pagamento. Se o seu cheque pré-impresso não estiver numerado, você pode gerenciar a numeração na página de configuração de diário." #. module: account_check_printing #: model:ir.model,name:account_check_printing.model_account_payment @@ -182,14 +183,14 @@ msgstr "Pagamentos" msgid "" "Payments to print as a checks must have 'Check' selected as payment method " "and not have already been reconciled" -msgstr "" +msgstr "Pagamentos para imprimir como cheques devem ter 'Cheque' selecionado como método de pagamento e não ter sido reconciliados" #. module: account_check_printing #: model:ir.ui.view,arch_db:account_check_printing.print_pre_numbered_checks_view msgid "" "Please enter the number of the first pre-printed check that you are about to" " print on." -msgstr "" +msgstr "Por favor, insira o número do primeiro cheque pré-impresso que você está prestes a imprimir." #. module: account_check_printing #: model:ir.ui.view,arch_db:account_check_printing.print_pre_numbered_checks_view @@ -212,24 +213,24 @@ msgstr "Imprimir Cheque" #: model:ir.ui.view,arch_db:account_check_printing.print_pre_numbered_checks_view #, python-format msgid "Print Pre-numbered Checks" -msgstr "" +msgstr "Imprimir Cheques Pré-numerados" #. module: account_check_printing #: model:ir.model,name:account_check_printing.model_account_register_payments msgid "Register payments on multiple invoices" -msgstr "" +msgstr "Registrar pagamentos em várias faturas" #. module: account_check_printing #: model:ir.model.fields,help:account_check_printing.field_account_journal_check_next_number msgid "Sequence number of the next printed check." -msgstr "" +msgstr "Número de seqüência do próximo cheque impresso." #. module: account_check_printing #: model:ir.model.fields,help:account_check_printing.field_account_journal_check_printing_payment_method_selected msgid "" "Technical feature used to know whether check printing was enabled as payment" " method." -msgstr "" +msgstr "Característica técnica utilizada para saber se a impressão de cheque foi habilitada como método de pagamento." #. module: account_check_printing #: code:addons/account_check_printing/account_journal.py:25 @@ -237,7 +238,7 @@ msgstr "" msgid "" "The last check number was %s. In order to avoid a check being rejected by " "the bank, you can only use a greater number." -msgstr "" +msgstr "O último número do cheque foi %s. A fim de evitar que um cheque seja rejeitado pelo banco, você só pode usar um número maior." #. module: account_check_printing #: model:ir.model.fields,help:account_check_printing.field_account_payment_check_number @@ -245,7 +246,7 @@ msgid "" "The selected journal is configured to print check numbers. If your pre-" "printed check paper already has numbers or if the current numbering is " "wrong, you can change it in the journal configuration page." -msgstr "" +msgstr "O diário selecionado está configurado para imprimir números de cheque. Se o seu papel de cheque pré-impresso já tem números ou se a numeração atual está errada, você pode mudá-la na página de configuração de diário." #. module: account_check_printing #: code:addons/account_check_printing/account_payment.py:135 @@ -253,18 +254,18 @@ msgstr "" msgid "" "There is no check layout configured.\n" "Make sure the proper check printing module is installed and its configuration (in company settings > 'Configuration' tab) is correct." -msgstr "" +msgstr "Não há nenhum layout de cheque configurado.\nVerifique se o módulo de impressão de cheque apropriado está instalado e sua configuração (em configurações da empresa > guia 'Configuração') está correta." #. module: account_check_printing #: model:ir.ui.view,arch_db:account_check_printing.print_pre_numbered_checks_view msgid "" "This will allow to save on payments the number of the corresponding check." -msgstr "" +msgstr "Isso permitirá salvar em pagamentos o número do cheque correspondente." #. module: account_check_printing #: model:ir.ui.view,arch_db:account_check_printing.view_account_payment_form_inherited msgid "Unmark Sent" -msgstr "" +msgstr "Desmarcar Enviados" #. module: account_check_printing #: model:ir.ui.view,arch_db:account_check_printing.print_pre_numbered_checks_view diff --git a/addons/account_tax_cash_basis/i18n/pt_BR.po b/addons/account_tax_cash_basis/i18n/pt_BR.po index 66733d29eb7..84342bb6e54 100644 --- a/addons/account_tax_cash_basis/i18n/pt_BR.po +++ b/addons/account_tax_cash_basis/i18n/pt_BR.po @@ -3,13 +3,14 @@ # * account_tax_cash_basis # # Translators: +# Grazziano Duarte , 2015 msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-07 14:39+0000\n" -"PO-Revision-Date: 2015-09-07 16:03+0000\n" -"Last-Translator: Martin Trigaux\n" +"PO-Revision-Date: 2015-12-09 23:15+0000\n" +"Last-Translator: Grazziano Duarte \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/odoo/odoo-9/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,7 +26,7 @@ msgstr "Lançamento Contábil" #. module: account_tax_cash_basis #: model:ir.model.fields,help:account_tax_cash_basis.field_account_tax_cash_basis_account msgid "Account use when creating entry for tax cash basis" -msgstr "" +msgstr "Conta para utilizar ao criar a entrada para o regime de caixa fiscal" #. module: account_tax_cash_basis #: model:ir.model,name:account_tax_cash_basis.model_res_company @@ -42,7 +43,7 @@ msgstr "Conciliação parcial" msgid "" "Select this if the tax should use cash basis, which will create an " "entry for this tax on a given account during reconciliation" -msgstr "" +msgstr "Selecione esta opção se o imposto deve usar regime de caixa, o que irá criar uma entrada para este imposto sobre uma determinada conta durante a reconciliação" #. module: account_tax_cash_basis #: model:ir.model,name:account_tax_cash_basis.model_account_tax @@ -52,18 +53,18 @@ msgstr "Imposto" #. module: account_tax_cash_basis #: model:ir.model.fields,field_description:account_tax_cash_basis.field_account_move_tax_cash_basis_rec_id msgid "Tax Cash Basis Entry of" -msgstr "" +msgstr "Entradas de Imposto de Regime de Caixa" #. module: account_tax_cash_basis #: model:ir.model.fields,field_description:account_tax_cash_basis.field_account_config_settings_tax_cash_basis_journal_id #: model:ir.model.fields,field_description:account_tax_cash_basis.field_res_company_tax_cash_basis_journal_id msgid "Tax Cash Basis Journal" -msgstr "" +msgstr "Diário de Imposto de Regime de Caixa" #. module: account_tax_cash_basis #: model:ir.model.fields,field_description:account_tax_cash_basis.field_account_tax_cash_basis_account msgid "Tax Received Account" -msgstr "" +msgstr "Conta de Impostos Recebidos" #. module: account_tax_cash_basis #: model:ir.model.fields,help:account_tax_cash_basis.field_account_move_tax_cash_basis_rec_id @@ -71,7 +72,7 @@ msgid "" "Technical field used to keep track of the tax cash basis reconciliation. " "This is needed when cancelling the source: it will post the inverse journal " "entry to cancel that part too." -msgstr "" +msgstr "Campo técnico usado para manter o controle da reconciliação de regime de caixa fiscal. Isto é necessário quando do cancelamento da fonte: isto vai postar uma entrada de diário inversa para cancelar essa parte também." #. module: account_tax_cash_basis #: code:addons/account_tax_cash_basis/tax_cash_basis.py:82 @@ -79,12 +80,12 @@ msgstr "" msgid "" "There is no tax cash basis journal defined for this company: \"%s\" \n" "Configure it in Accounting/Configuration/Settings" -msgstr "" +msgstr "Não há diário de regime de caixa fiscal definido para esta empresa: \"%s\"\nConfigure-o em Contabilidade/Configuração/Ajustes" #. module: account_tax_cash_basis #: model:ir.model.fields,field_description:account_tax_cash_basis.field_account_tax_use_cash_basis msgid "Use Cash Basis" -msgstr "" +msgstr "Usar Regime de Caixa" #. module: account_tax_cash_basis #: model:ir.model,name:account_tax_cash_basis.model_account_config_settings diff --git a/addons/account_tax_cash_basis/i18n/zh_CN.po b/addons/account_tax_cash_basis/i18n/zh_CN.po index cdb4caa8e7f..c8e6ad64299 100644 --- a/addons/account_tax_cash_basis/i18n/zh_CN.po +++ b/addons/account_tax_cash_basis/i18n/zh_CN.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-07 14:39+0000\n" -"PO-Revision-Date: 2015-12-01 05:10+0000\n" -"Last-Translator: Connie Xiao \n" +"PO-Revision-Date: 2015-12-09 14:15+0000\n" +"Last-Translator: jeffery chen fan \n" "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,7 +22,7 @@ msgstr "" #. module: account_tax_cash_basis #: model:ir.model,name:account_tax_cash_basis.model_account_move msgid "Account Entry" -msgstr "科目条目" +msgstr "科目分录" #. module: account_tax_cash_basis #: model:ir.model.fields,help:account_tax_cash_basis.field_account_tax_cash_basis_account diff --git a/addons/account_tax_python/i18n/pt_BR.po b/addons/account_tax_python/i18n/pt_BR.po index fddde0674a9..f057aa09194 100644 --- a/addons/account_tax_python/i18n/pt_BR.po +++ b/addons/account_tax_python/i18n/pt_BR.po @@ -3,13 +3,14 @@ # * account_tax_python # # Translators: +# Grazziano Duarte , 2015 msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-07 14:40+0000\n" -"PO-Revision-Date: 2015-09-07 16:04+0000\n" -"Last-Translator: Martin Trigaux\n" +"PO-Revision-Date: 2015-12-09 23:20+0000\n" +"Last-Translator: Grazziano Duarte \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/odoo/odoo-9/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,7 +35,7 @@ msgid "" ":param company: res.company recordset singleton\n" ":param product: product.product recordset singleton or None\n" ":param partner: res.partner recordset singleton or None" -msgstr "" +msgstr "Calcular o montante do imposto, definindo a variável 'result'.\n\n:param base_amount: float, montante real em que é aplicado o imposto\n:param price_unit: float\n:param quantity: float\n:param company: res.company recordset singleton\n:param product: product.product recordset singleton ou None\n:param partner: res.partner recordset singleton ou None" #. module: account_tax_python #: model:ir.model.fields,help:account_tax_python.field_account_tax_template_python_compute @@ -46,7 +47,7 @@ msgid "" ":param quantity: float\n" ":param product: product.product recordset singleton or None\n" ":param partner: res.partner recordset singleton or None" -msgstr "" +msgstr "Calcular o montante do imposto, definindo a variável 'result'.\n\n:param base_amount: float, montante real em que é aplicado o imposto\n:param price_unit: float\n:param quantity: float\n:param product: product.product recordset singleton ou None\n:param partner: res.partner recordset singleton ou None" #. module: account_tax_python #: model:ir.model.fields,help:account_tax_python.field_account_tax_python_applicable @@ -58,7 +59,7 @@ msgid "" ":param company: res.company recordset singleton\n" ":param product: product.product recordset singleton or None\n" ":param partner: res.partner recordset singleton or None" -msgstr "" +msgstr "Determinar se o imposto será aplicado definindo a variável 'result' para True ou False.\n\n:param price_unit: float\n:param quantity: float\n:param company: res.company recordset singleton\n:param product: product.product recordset singleton ou None\n:param partner: res.partner recordset singleton ou None" #. module: account_tax_python #: model:ir.model.fields,help:account_tax_python.field_account_tax_template_python_applicable @@ -69,7 +70,7 @@ msgid "" ":param quantity: float\n" ":param product: product.product recordset singleton or None\n" ":param partner: res.partner recordset singleton or None" -msgstr "" +msgstr "Determinar se o imposto será aplicado definindo a variável 'result' para True ou False.\n\n:param price_unit: float\n:param quantity: float\n:param product: product.product recordset singleton ou None\n:param partner: res.partner recordset singleton ou None" #. module: account_tax_python #: model:ir.model.fields,field_description:account_tax_python.field_account_tax_python_compute diff --git a/addons/account_test/i18n/pt_BR.po b/addons/account_test/i18n/pt_BR.po index 924ef8f1b12..4326cf12613 100644 --- a/addons/account_test/i18n/pt_BR.po +++ b/addons/account_test/i18n/pt_BR.po @@ -4,14 +4,15 @@ # # Translators: # Gideoni Willian da Silva , 2015 +# Grazziano Duarte , 2015 # Mateus Cerqueira Lopes , 2015 msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-07 14:40+0000\n" -"PO-Revision-Date: 2015-11-16 12:42+0000\n" -"Last-Translator: Gideoni Willian da Silva \n" +"PO-Revision-Date: 2015-12-10 01:10+0000\n" +"Last-Translator: Grazziano Duarte \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/odoo/odoo-9/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,7 +30,7 @@ msgstr "
\n Descrição:" #. module: account_test #: model:ir.ui.view,arch_db:account_test.report_accounttest msgid "Name:" -msgstr "" +msgstr "Nome:" #. module: account_test #: model:ir.actions.act_window,name:account_test.action_accounting_assert @@ -87,7 +88,7 @@ msgstr "Verifique o balanço: Soma dos Débitos = Soma dos Créditos" #. module: account_test #: model:ir.actions.act_window,help:account_test.action_accounting_assert msgid "Click to create Accounting Test." -msgstr "" +msgstr "Clique para criar a Contabilidade Teste." #. module: account_test #: model:ir.ui.view,arch_db:account_test.account_assert_form @@ -243,4 +244,4 @@ msgstr "accounting.assert.test" #. module: account_test #: model:ir.model,name:account_test.model_report_account_test_report_accounttest msgid "report.account_test.report_accounttest" -msgstr "" +msgstr "report.account_test.report_accounttest" diff --git a/addons/account_test/i18n/sq.po b/addons/account_test/i18n/sq.po index 2014cfaa56b..9a1b3b29927 100644 --- a/addons/account_test/i18n/sq.po +++ b/addons/account_test/i18n/sq.po @@ -44,7 +44,7 @@ msgstr "" #. module: account_test #: model:ir.model.fields,field_description:account_test.field_accounting_assert_test_active msgid "Active" -msgstr "" +msgstr "Aktiv" #. module: account_test #: model:accounting.assert.test,desc:account_test.account_test_03 diff --git a/addons/account_test/i18n/uk.po b/addons/account_test/i18n/uk.po index 822ba37847c..d306a262b65 100644 --- a/addons/account_test/i18n/uk.po +++ b/addons/account_test/i18n/uk.po @@ -3,14 +3,15 @@ # * account_test # # Translators: +# Bogdan, 2015 # ТАрас , 2015 msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-07 14:40+0000\n" -"PO-Revision-Date: 2015-11-15 20:00+0000\n" -"Last-Translator: ТАрас \n" +"PO-Revision-Date: 2015-12-09 12:25+0000\n" +"Last-Translator: Bogdan\n" "Language-Team: Ukrainian (http://www.transifex.com/odoo/odoo-9/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -189,18 +190,18 @@ msgstr "Тест 1: Загальний баланс" #. module: account_test #: model:accounting.assert.test,name:account_test.account_test_03 msgid "Test 3: Movement lines" -msgstr "Тест 3: Криві графіків" +msgstr "Тест 3: рядки проведень" #. module: account_test #: model:accounting.assert.test,name:account_test.account_test_05 msgid "" "Test 5.1 : Payable and Receivable accountant lines of reconciled invoices" -msgstr "Тест 5.1: Дебет і Кредит ухвалених рахунків" +msgstr "Тест 5.1: Дебет і Кредит узгоджених рахунків" #. module: account_test #: model:accounting.assert.test,name:account_test.account_test_05_2 msgid "Test 5.2 : Reconcilied invoices and Payable/Receivable accounts" -msgstr "Тест 5.2: Ухвалені рахунки і Дебет/Кредит" +msgstr "Тест 5.2: Узгоджені рахунки і Дебет/Кредит" #. module: account_test #: model:accounting.assert.test,name:account_test.account_test_06 @@ -210,7 +211,7 @@ msgstr "Тест 6: Статус рахунків" #. module: account_test #: model:accounting.assert.test,name:account_test.account_test_07 msgid "Test 7 : Closing balance on bank statements" -msgstr "Тест 7: Закриття банківського рахунку " +msgstr "Тест 7: Закриття балансу по виписці" #. module: account_test #: model:ir.model.fields,field_description:account_test.field_accounting_assert_test_desc diff --git a/addons/account_test/i18n/zh_CN.po b/addons/account_test/i18n/zh_CN.po index 7c027431fbf..1e293d3f78f 100644 --- a/addons/account_test/i18n/zh_CN.po +++ b/addons/account_test/i18n/zh_CN.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-07 14:40+0000\n" -"PO-Revision-Date: 2015-11-12 07:49+0000\n" -"Last-Translator: Gary Wei \n" +"PO-Revision-Date: 2015-12-09 14:14+0000\n" +"Last-Translator: jeffery chen fan \n" "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -69,14 +69,14 @@ msgstr "检查支付/对账发票并未在'开启'状态" msgid "" "Check that reconciled account moves, that define Payable and Receivable " "accounts, are belonging to reconciled invoices" -msgstr "检查已核销的科目的变动，包括属于已核销发票的应付科目和应收科目" +msgstr "检查已调节的会计凭证，属于已调节发票的应付科目和应收科目" #. module: account_test #: model:accounting.assert.test,desc:account_test.account_test_05 msgid "" "Check that reconciled invoice for Sales/Purchases has reconciled entries for" " Payable and Receivable Accounts" -msgstr "检查已收和已付科目中已被核销的条目相关的销售/采购发票" +msgstr "检查已收和已付科目中已被核销的分录相关的销售/采购发票" #. module: account_test #: model:accounting.assert.test,desc:account_test.account_test_01 @@ -195,7 +195,7 @@ msgstr "测试 3: 凭证行" #: model:accounting.assert.test,name:account_test.account_test_05 msgid "" "Test 5.1 : Payable and Receivable accountant lines of reconciled invoices" -msgstr "测试 5.1 : 已核销发票的应收及应付条目" +msgstr "测试 5.1 : 已核销发票的应收及应付分录" #. module: account_test #: model:accounting.assert.test,name:account_test.account_test_05_2 diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py index 8475868e8d0..d9073b0c737 100644 --- a/addons/account_voucher/account_voucher.py +++ b/addons/account_voucher/account_voucher.py @@ -4,7 +4,6 @@ from openerp import fields, models, api, _ import openerp.addons.decimal_precision as dp -from openerp.tools import float_compare from openerp.exceptions import UserError @@ -22,6 +21,10 @@ class AccountVoucher(models.Model): return journal.currency_id.id return self.env.user.company_id.currency_id.id + @api.model + def _get_company(self): + return self._context.get('company_id', self.env.user.company_id.id) + @api.multi @api.depends('name', 'number') def name_get(self): @@ -76,7 +79,7 @@ class AccountVoucher(models.Model): states={'draft': [('readonly', False)]}) narration = fields.Text('Notes', readonly=True, states={'draft': [('readonly', False)]}) currency_id = fields.Many2one('res.currency', compute='_get_journal_currency', string='Currency', readonly=True, required=True, default=lambda self: self._get_currency()) - company_id = fields.Many2one('res.company', 'Company', required=True, readonly=True, states={'draft': [('readonly', False)]}, default=lambda self: self.env['res.company']._company_default_get('account.voucher')) + company_id = fields.Many2one('res.company', 'Company', required=True, readonly=True, states={'draft': [('readonly', False)]}, related='journal_id.company_id', default=lambda self: self._get_company()) state = fields.Selection( [('draft', 'Draft'), ('cancel', 'Cancelled'), @@ -104,7 +107,7 @@ class AccountVoucher(models.Model): @api.onchange('partner_id', 'pay_now') def onchange_partner_id(self): - if self.pay_now =='pay_now': + if self.pay_now == 'pay_now': liq_journal = self.env['account.journal'].search([('type', 'in', ('bank', 'cash'))], limit=1) self.account_id = liq_journal.default_debit_account_id \ if self.voucher_type == 'sale' else liq_journal.default_credit_account_id diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml index 8ca0df1f7b8..44f051a9999 100644 --- a/addons/account_voucher/account_voucher_view.xml +++ b/addons/account_voucher/account_voucher_view.xml @@ -83,7 +83,7 @@ - + @@ -102,7 +102,7 @@ on_change="product_id_change(product_id, parent.partner_id, price_unit, company_id, parent.currency_id, parent.voucher_type)" /> - + diff --git a/addons/account_voucher/i18n/es_MX.po b/addons/account_voucher/i18n/es_MX.po index 7c2bc2135da..8250a86f823 100644 --- a/addons/account_voucher/i18n/es_MX.po +++ b/addons/account_voucher/i18n/es_MX.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-18 08:10+0000\n" -"PO-Revision-Date: 2015-11-14 19:47+0000\n" +"PO-Revision-Date: 2015-12-09 02:05+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/odoo/odoo-9/language/es_MX/)\n" "MIME-Version: 1.0\n" @@ -150,7 +150,7 @@ msgstr "Fecha" #. module: account_voucher #: model:ir.model.fields,help:account_voucher.field_account_voucher_message_last_post msgid "Date of the last message posted on the record." -msgstr "" +msgstr "Fecha de último trabajo realizado en esta cuenta" #. module: account_voucher #: model:ir.model.fields,field_description:account_voucher.field_account_voucher_line_name @@ -201,7 +201,7 @@ msgstr "Seguidores" #. module: account_voucher #: model:ir.model.fields,field_description:account_voucher.field_account_voucher_message_partner_ids msgid "Followers (Partners)" -msgstr "" +msgstr "Seguidores (Socios)" #. module: account_voucher #: model:ir.model.fields,help:account_voucher.field_account_voucher_line_sequence @@ -270,7 +270,7 @@ msgstr "Apuntes contables" #. module: account_voucher #: model:ir.model.fields,field_description:account_voucher.field_account_voucher_message_last_post msgid "Last Message Date" -msgstr "" +msgstr "Fecha de último mensaje" #. module: account_voucher #: model:ir.model.fields,field_description:account_voucher.field_account_voucher___last_update @@ -313,17 +313,17 @@ msgstr "Número" #. module: account_voucher #: model:ir.model.fields,field_description:account_voucher.field_account_voucher_message_needaction_counter msgid "Number of Actions" -msgstr "" +msgstr "Número de acciones" #. module: account_voucher #: model:ir.model.fields,help:account_voucher.field_account_voucher_message_needaction_counter msgid "Number of messages which requires an action" -msgstr "" +msgstr "Número de mensajes que requieren una acción" #. module: account_voucher #: model:ir.model.fields,help:account_voucher.field_account_voucher_message_unread_counter msgid "Number of unread messages" -msgstr "" +msgstr "Número de mensajes sin leer" #. module: account_voucher #: model:ir.model.fields,help:account_voucher.field_account_voucher_line_tax_ids @@ -550,7 +550,7 @@ msgstr "Mensajes sin leer" #. module: account_voucher #: model:ir.model.fields,field_description:account_voucher.field_account_voucher_message_unread_counter msgid "Unread Messages Counter" -msgstr "" +msgstr "Contador de mensajes sin leer" #. module: account_voucher #: model:ir.ui.view,arch_db:account_voucher.view_purchase_receipt_form diff --git a/addons/account_voucher/i18n/fi.po b/addons/account_voucher/i18n/fi.po index 559cd4a2860..337364293e1 100644 --- a/addons/account_voucher/i18n/fi.po +++ b/addons/account_voucher/i18n/fi.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-18 08:10+0000\n" -"PO-Revision-Date: 2015-12-04 21:19+0000\n" +"PO-Revision-Date: 2015-12-07 17:39+0000\n" "Last-Translator: Kari Lindgren \n" "Language-Team: Finnish (http://www.transifex.com/odoo/odoo-9/language/fi/)\n" "MIME-Version: 1.0\n" @@ -45,7 +45,7 @@ msgstr "Kirjanpitotosite" #. module: account_voucher #: model:ir.model.fields,field_description:account_voucher.field_account_voucher_message_needaction msgid "Action Needed" -msgstr "" +msgstr "Huomiota vaadittu" #. module: account_voucher #: model:ir.model.fields,field_description:account_voucher.field_account_voucher_line_price_subtotal @@ -229,7 +229,7 @@ msgstr "Jos valittu, uudet viestit vaativat huomiosi." #. module: account_voucher #: model:ir.model.fields,help:account_voucher.field_account_voucher_message_needaction msgid "If checked, new messages require your attention." -msgstr "" +msgstr "Jos valittu, uudet viestit vaativat huomiosi." #. module: account_voucher #: model:ir.model.fields,help:account_voucher.field_account_voucher_tax_correction @@ -323,7 +323,7 @@ msgstr "" #. module: account_voucher #: model:ir.model.fields,help:account_voucher.field_account_voucher_message_unread_counter msgid "Number of unread messages" -msgstr "" +msgstr "Lukemattomien viestien määrä" #. module: account_voucher #: model:ir.model.fields,help:account_voucher.field_account_voucher_line_tax_ids @@ -563,7 +563,7 @@ msgstr "Vahvista" #: model:ir.ui.view,arch_db:account_voucher.view_voucher_filter_vendor #: model:ir.ui.view,arch_db:account_voucher.view_voucher_tree_purchase msgid "Vendor" -msgstr "" +msgstr "Toimittaja" #. module: account_voucher #: model:ir.ui.view,arch_db:account_voucher.view_purchase_receipt_form diff --git a/addons/account_voucher/i18n/fr.po b/addons/account_voucher/i18n/fr.po index e4d1840b555..636653ab295 100644 --- a/addons/account_voucher/i18n/fr.po +++ b/addons/account_voucher/i18n/fr.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-18 08:10+0000\n" -"PO-Revision-Date: 2015-11-24 23:07+0000\n" +"PO-Revision-Date: 2015-12-07 19:40+0000\n" "Last-Translator: Maxime Chambreuil \n" "Language-Team: French (http://www.transifex.com/odoo/odoo-9/language/fr/)\n" "MIME-Version: 1.0\n" @@ -232,7 +232,7 @@ msgstr "Si coché, de nouveaux messages demandent votre attention." #. module: account_voucher #: model:ir.model.fields,help:account_voucher.field_account_voucher_message_needaction msgid "If checked, new messages require your attention." -msgstr "si elle est cochée, de nouveaux messages requièrent votre attention." +msgstr "Si coché, de nouveaux messages demandent votre attention." #. module: account_voucher #: model:ir.model.fields,help:account_voucher.field_account_voucher_tax_correction diff --git a/addons/account_voucher/i18n/it.po b/addons/account_voucher/i18n/it.po index b94a058f51b..6d82bf6ccd0 100644 --- a/addons/account_voucher/i18n/it.po +++ b/addons/account_voucher/i18n/it.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-18 08:10+0000\n" -"PO-Revision-Date: 2015-11-18 13:51+0000\n" +"PO-Revision-Date: 2015-12-08 14:20+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Italian (http://www.transifex.com/odoo/odoo-9/language/it/)\n" "MIME-Version: 1.0\n" @@ -323,7 +323,7 @@ msgstr "" #. module: account_voucher #: model:ir.model.fields,help:account_voucher.field_account_voucher_message_unread_counter msgid "Number of unread messages" -msgstr "" +msgstr "Numero di messaggi non letti" #. module: account_voucher #: model:ir.model.fields,help:account_voucher.field_account_voucher_line_tax_ids @@ -550,7 +550,7 @@ msgstr "Messaggi Non Letti" #. module: account_voucher #: model:ir.model.fields,field_description:account_voucher.field_account_voucher_message_unread_counter msgid "Unread Messages Counter" -msgstr "" +msgstr "Contatore di messsaggi non letti" #. module: account_voucher #: model:ir.ui.view,arch_db:account_voucher.view_purchase_receipt_form diff --git a/addons/account_voucher/i18n/pt_BR.po b/addons/account_voucher/i18n/pt_BR.po index ee540d03dc6..8afa88bcf10 100644 --- a/addons/account_voucher/i18n/pt_BR.po +++ b/addons/account_voucher/i18n/pt_BR.po @@ -3,14 +3,15 @@ # * account_voucher # # Translators: +# Grazziano Duarte , 2015 # Mateus Cerqueira Lopes , 2015 msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-18 08:10+0000\n" -"PO-Revision-Date: 2015-11-10 16:20+0000\n" -"Last-Translator: Mateus Cerqueira Lopes \n" +"PO-Revision-Date: 2015-12-10 01:10+0000\n" +"Last-Translator: Grazziano Duarte \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/odoo/odoo-9/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,7 +26,7 @@ msgid "" " * The 'Pro-forma' status is used when the voucher does not have a voucher number.\n" " * The 'Posted' status is used when user create voucher,a voucher number is generated and voucher entries are created in account.\n" " * The 'Cancelled' status is used when user cancel voucher." -msgstr "" +msgstr "* O status 'Rascunho' é usado quando um usuário está codificando uma nova Comprovante.\n* O status 'Pro-forma' é usada quando o comprovante não tem um número de comprovante.\n* O status 'Postado' é usado quando o usuário cria um comprovante, um número de comprovante é gerado e comprovantes são criados na conta.\n* O status 'Cancelado' é usado quando o usuário cancela o comprovante." #. module: account_voucher #: model:ir.model.fields,field_description:account_voucher.field_account_voucher_account_id @@ -36,7 +37,7 @@ msgstr "Conta Contábil" #. module: account_voucher #: model:ir.ui.view,arch_db:account_voucher.view_voucher_filter_sale msgid "Account Date" -msgstr "" +msgstr "Data da Conta" #. module: account_voucher #: model:ir.model,name:account_voucher.model_account_voucher @@ -77,7 +78,7 @@ msgstr "Informação de Cobrança" #. module: account_voucher #: model:ir.model.fields,field_description:account_voucher.field_account_voucher_reference msgid "Bill Reference" -msgstr "" +msgstr "Conta de Referência" #. module: account_voucher #: model:ir.ui.view,arch_db:account_voucher.view_purchase_receipt_form @@ -103,12 +104,12 @@ msgstr "Não é possivel excluir comprovante(s) que já foi aberto ou pago." #. module: account_voucher #: model:ir.actions.act_window,help:account_voucher.action_sale_receipt msgid "Click to create a sale receipt." -msgstr "" +msgstr "Clique para criar um recibo de venda." #. module: account_voucher #: model:ir.actions.act_window,help:account_voucher.action_purchase_receipt msgid "Click to register a purchase receipt." -msgstr "" +msgstr "Clique para registrar um recibo de compra." #. module: account_voucher #: model:ir.model.fields,field_description:account_voucher.field_account_voucher_company_id @@ -236,7 +237,7 @@ msgstr "" #: model:ir.model.fields,help:account_voucher.field_account_voucher_tax_correction msgid "" "In case we have a rounding problem in the tax, use this field to correct it" -msgstr "" +msgstr "No caso, temos um problema de arredondamento do imposto, utilize este campo para corrigi-lo" #. module: account_voucher #: model:ir.ui.view,arch_db:account_voucher.view_purchase_receipt_form @@ -355,7 +356,7 @@ msgstr "Pagar Diretamente" #. module: account_voucher #: selection:account.voucher,pay_now:0 msgid "Pay Later" -msgstr "" +msgstr "Pagar Depois" #. module: account_voucher #: model:ir.model.fields,field_description:account_voucher.field_account_voucher_pay_now @@ -495,12 +496,12 @@ msgstr "Imposto" #. module: account_voucher #: model:ir.model.fields,field_description:account_voucher.field_account_voucher_tax_amount msgid "Tax amount" -msgstr "" +msgstr "Valor do imposto" #. module: account_voucher #: model:ir.model.fields,field_description:account_voucher.field_account_voucher_tax_correction msgid "Tax correction" -msgstr "" +msgstr "Correção de imposto" #. module: account_voucher #: model:ir.model.fields,help:account_voucher.field_account_voucher_paid @@ -515,7 +516,7 @@ msgstr "A conta de receita ou despesa relacionada ao produto selecionado." #. module: account_voucher #: model:ir.model.fields,help:account_voucher.field_account_voucher_reference msgid "The partner reference of this document." -msgstr "" +msgstr "A referência do parceiro deste documento." #. module: account_voucher #: model:ir.ui.view,arch_db:account_voucher.view_voucher_filter @@ -569,7 +570,7 @@ msgstr "" #. module: account_voucher #: model:ir.ui.view,arch_db:account_voucher.view_purchase_receipt_form msgid "Vendor Voucher" -msgstr "" +msgstr "Comprovante do Fornecedor" #. module: account_voucher #: code:addons/account_voucher/account_voucher.py:28 @@ -623,14 +624,14 @@ msgstr "Histórico de Comunicação do Site" msgid "" "When the purchase receipt is confirmed, you can record the\n" " vendor payment related to this purchase receipt." -msgstr "" +msgstr "Quando o recibo de compra for confirmado, você pode gravar o\npagamento de fornecedores relacionados a este recibo de compra." #. module: account_voucher #: model:ir.actions.act_window,help:account_voucher.action_sale_receipt msgid "" "When the sale receipt is confirmed, you can record the customer\n" " payment related to this sales receipt." -msgstr "" +msgstr "Quando o recibo de venda é confirmado, você pode gravar o pagamento\nrelacionado do cliente a este recibo de venda." #. module: account_voucher #: code:addons/account_voucher/account_voucher.py:345 diff --git a/addons/account_voucher/i18n/sk.po b/addons/account_voucher/i18n/sk.po index 2339a375866..6851b3d9d49 100644 --- a/addons/account_voucher/i18n/sk.po +++ b/addons/account_voucher/i18n/sk.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-18 08:10+0000\n" -"PO-Revision-Date: 2015-12-01 09:43+0000\n" +"PO-Revision-Date: 2015-12-06 18:19+0000\n" "Last-Translator: Pavol Krnáč \n" "Language-Team: Slovak (http://www.transifex.com/odoo/odoo-9/language/sk/)\n" "MIME-Version: 1.0\n" @@ -564,7 +564,7 @@ msgstr "Overenie" #: model:ir.ui.view,arch_db:account_voucher.view_voucher_filter_vendor #: model:ir.ui.view,arch_db:account_voucher.view_voucher_tree_purchase msgid "Vendor" -msgstr "" +msgstr "Predajca" #. module: account_voucher #: model:ir.ui.view,arch_db:account_voucher.view_purchase_receipt_form diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml index e0a9b542bc7..3d6316c5cc2 100644 --- a/addons/account_voucher/voucher_sales_purchase_view.xml +++ b/addons/account_voucher/voucher_sales_purchase_view.xml @@ -85,7 +85,7 @@ on_change="product_id_change(product_id, parent.partner_id, price_unit, company_id, parent.currency_id, parent.voucher_type)" /> - + @@ -201,7 +201,7 @@ on_change="product_id_change(product_id, parent.partner_id, price_unit, company_id, parent.currency_id, parent.voucher_type)" /> - + diff --git a/addons/analytic/i18n/es_MX.po b/addons/analytic/i18n/es_MX.po index 00f6726ab91..a09813e9ebc 100644 --- a/addons/analytic/i18n/es_MX.po +++ b/addons/analytic/i18n/es_MX.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-29 10:25+0000\n" -"PO-Revision-Date: 2015-11-14 19:47+0000\n" +"PO-Revision-Date: 2015-12-09 02:05+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/odoo/odoo-9/language/es_MX/)\n" "MIME-Version: 1.0\n" @@ -201,7 +201,7 @@ msgstr "Fecha" #. module: analytic #: model:ir.model.fields,help:analytic.field_account_analytic_account_message_last_post msgid "Date of the last message posted on the record." -msgstr "" +msgstr "Fecha de último trabajo realizado en esta cuenta" #. module: analytic #: model:ir.model.fields,field_description:analytic.field_account_analytic_account_debit @@ -234,7 +234,7 @@ msgstr "Seguidores" #. module: analytic #: model:ir.model.fields,field_description:analytic.field_account_analytic_account_message_partner_ids msgid "Followers (Partners)" -msgstr "" +msgstr "Seguidores (Socios)" #. module: analytic #: model:ir.model.fields,field_description:analytic.field_account_analytic_chart_from_date @@ -282,7 +282,7 @@ msgstr "Es un Seguidor" #. module: analytic #: model:ir.model.fields,field_description:analytic.field_account_analytic_account_message_last_post msgid "Last Message Date" -msgstr "" +msgstr "Fecha de último mensaje" #. module: analytic #: model:ir.model.fields,field_description:analytic.field_account_analytic_account___last_update @@ -331,17 +331,17 @@ msgstr "" #. module: analytic #: model:ir.model.fields,field_description:analytic.field_account_analytic_account_message_needaction_counter msgid "Number of Actions" -msgstr "" +msgstr "Número de acciones" #. module: analytic #: model:ir.model.fields,help:analytic.field_account_analytic_account_message_needaction_counter msgid "Number of messages which requires an action" -msgstr "" +msgstr "Número de mensajes que requieren una acción" #. module: analytic #: model:ir.model.fields,help:analytic.field_account_analytic_account_message_unread_counter msgid "Number of unread messages" -msgstr "" +msgstr "Número de mensajes sin leer" #. module: analytic #: model:ir.ui.view,arch_db:analytic.account_analytic_chart_view @@ -423,7 +423,7 @@ msgstr "Mensajes sin leer" #. module: analytic #: model:ir.model.fields,field_description:analytic.field_account_analytic_account_message_unread_counter msgid "Unread Messages Counter" -msgstr "" +msgstr "Contador de mensajes sin leer" #. module: analytic #: model:ir.model.fields,field_description:analytic.field_account_analytic_line_user_id diff --git a/addons/analytic/i18n/fi.po b/addons/analytic/i18n/fi.po index ca9c264a947..d5c04131e3a 100644 --- a/addons/analytic/i18n/fi.po +++ b/addons/analytic/i18n/fi.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-29 10:25+0000\n" -"PO-Revision-Date: 2015-12-04 20:23+0000\n" +"PO-Revision-Date: 2015-12-07 17:39+0000\n" "Last-Translator: Kari Lindgren \n" "Language-Team: Finnish (http://www.transifex.com/odoo/odoo-9/language/fi/)\n" "MIME-Version: 1.0\n" @@ -35,7 +35,7 @@ msgstr "Tilin valuutta" #. module: analytic #: model:ir.model.fields,field_description:analytic.field_account_analytic_account_message_needaction msgid "Action Needed" -msgstr "" +msgstr "Huomiota vaadittu" #. module: analytic #: model:ir.model.fields,field_description:analytic.field_account_analytic_line_amount @@ -263,7 +263,7 @@ msgstr "Jos valittu, uudet viestit vaativat huomiosi." #. module: analytic #: model:ir.model.fields,help:analytic.field_account_analytic_account_message_needaction msgid "If checked, new messages require your attention." -msgstr "" +msgstr "Jos valittu, uudet viestit vaativat huomiosi." #. module: analytic #: model:ir.actions.act_window,help:analytic.account_analytic_line_action @@ -341,7 +341,7 @@ msgstr "" #. module: analytic #: model:ir.model.fields,help:analytic.field_account_analytic_account_message_unread_counter msgid "Number of unread messages" -msgstr "" +msgstr "Lukemattomien viestien määrä" #. module: analytic #: model:ir.ui.view,arch_db:analytic.account_analytic_chart_view diff --git a/addons/analytic/i18n/it.po b/addons/analytic/i18n/it.po index 598f70a63b5..661d7ec0a51 100644 --- a/addons/analytic/i18n/it.po +++ b/addons/analytic/i18n/it.po @@ -3,13 +3,14 @@ # * analytic # # Translators: +# Francesco Garganese , 2015 msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-29 10:25+0000\n" -"PO-Revision-Date: 2015-11-12 16:52+0000\n" -"Last-Translator: Martin Trigaux\n" +"PO-Revision-Date: 2015-12-08 14:20+0000\n" +"Last-Translator: Francesco Garganese \n" "Language-Team: Italian (http://www.transifex.com/odoo/odoo-9/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -331,17 +332,17 @@ msgstr "" #. module: analytic #: model:ir.model.fields,field_description:analytic.field_account_analytic_account_message_needaction_counter msgid "Number of Actions" -msgstr "" +msgstr "Numero di Azioni" #. module: analytic #: model:ir.model.fields,help:analytic.field_account_analytic_account_message_needaction_counter msgid "Number of messages which requires an action" -msgstr "" +msgstr "Numero di messaggi che richiedono un'azione" #. module: analytic #: model:ir.model.fields,help:analytic.field_account_analytic_account_message_unread_counter msgid "Number of unread messages" -msgstr "" +msgstr "Numero di messaggi non letti" #. module: analytic #: model:ir.ui.view,arch_db:analytic.account_analytic_chart_view @@ -423,7 +424,7 @@ msgstr "Messaggi Non Letti" #. module: analytic #: model:ir.model.fields,field_description:analytic.field_account_analytic_account_message_unread_counter msgid "Unread Messages Counter" -msgstr "" +msgstr "Contatore di messsaggi non letti" #. module: analytic #: model:ir.model.fields,field_description:analytic.field_account_analytic_line_user_id diff --git a/addons/analytic/i18n/zh_CN.po b/addons/analytic/i18n/zh_CN.po index e78aca2000b..f9043c3bca5 100644 --- a/addons/analytic/i18n/zh_CN.po +++ b/addons/analytic/i18n/zh_CN.po @@ -3,13 +3,14 @@ # * analytic # # Translators: +# mrshelly , 2015 # Rona Lin , 2015 msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-29 10:25+0000\n" -"PO-Revision-Date: 2015-11-12 07:49+0000\n" +"PO-Revision-Date: 2015-12-11 09:40+0000\n" "Last-Translator: Gary Wei \n" "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -36,7 +37,7 @@ msgstr "会计币种" #. module: analytic #: model:ir.model.fields,field_description:analytic.field_account_analytic_account_message_needaction msgid "Action Needed" -msgstr "所需行动" +msgstr "消息提醒" #. module: analytic #: model:ir.model.fields,field_description:analytic.field_account_analytic_line_amount @@ -96,12 +97,12 @@ msgstr "分析行" #. module: analytic #: model:ir.model.fields,field_description:analytic.field_account_analytic_tag_name msgid "Analytic Tag" -msgstr "分析标签" +msgstr "核算标签" #. module: analytic #: model:ir.model,name:analytic.model_account_analytic_tag msgid "Analytic Tags" -msgstr "分析标签" +msgstr "核算标签" #. module: analytic #: selection:account.analytic.account,account_type:0 @@ -132,7 +133,7 @@ msgstr "分析账户表" #. module: analytic #: model:ir.actions.act_window,help:analytic.action_analytic_account_form msgid "Click to add an analytic account." -msgstr "辅助核算项" +msgstr "点击添加辅助核算项." #. module: analytic #: model:ir.model.fields,field_description:analytic.field_account_analytic_tag_color @@ -264,7 +265,7 @@ msgstr "查看是否有需要留意的新信息。" #. module: analytic #: model:ir.model.fields,help:analytic.field_account_analytic_account_message_needaction msgid "If checked, new messages require your attention." -msgstr "确认后, 会出现新消息." +msgstr "勾选此项后, 会出现消息提醒." #. module: analytic #: model:ir.actions.act_window,help:analytic.account_analytic_line_action @@ -273,7 +274,7 @@ msgid "" "In Odoo, sale orders and projects are implemented using\n" " analytic accounts. You can track costs and revenues to analyse\n" " your margins easily." -msgstr "在Odoo中，用分析账来实施销售订单和项目。你可以通过追踪成本和营收来分析利润" +msgstr "在Odoo中，销售订单和项目使用辅助核算，就可以通过追踪成本和收入方便地进行利润分析。" #. module: analytic #: model:ir.model.fields,field_description:analytic.field_account_analytic_account_message_is_follower @@ -322,12 +323,12 @@ msgstr "消息和通信历史" #. module: analytic #: model:ir.actions.act_window,help:analytic.account_analytic_line_action msgid "No activity yet on this account." -msgstr "这个科目目前还没哟被激活" +msgstr "这个科目目前尚未启用." #. module: analytic #: model:ir.actions.act_window,help:analytic.account_analytic_line_action_entries msgid "No activity yet." -msgstr "还没被激活" +msgstr "还没启用." #. module: analytic #: model:ir.model.fields,field_description:analytic.field_account_analytic_account_message_needaction_counter @@ -434,4 +435,4 @@ msgstr "用户" #. module: analytic #: model:ir.ui.view,arch_db:analytic.view_account_analytic_account_form msgid "e.g. Project XYZ" -msgstr "例如项目XYZ" +msgstr "项目 XYZ" diff --git a/addons/analytic/models/analytic.py b/addons/analytic/models/analytic.py index 45de1c26198..aa4cc3a330b 100644 --- a/addons/analytic/models/analytic.py +++ b/addons/analytic/models/analytic.py @@ -43,10 +43,11 @@ class account_analytic_account(models.Model): name = fields.Char(string='Analytic Account', index=True, required=True, track_visibility='onchange') code = fields.Char(string='Reference', index=True, track_visibility='onchange') - # FIXME: account_type is probably not necessary anymore, could be removed in v10 + # FIXME: we reused account_type to implement the closed accounts (feature removed by mistake on release of v9) without modifying the schemas on already released v9, but it would be more clean to rename it account_type = fields.Selection([ - ('normal', 'Analytic View') - ], string='Type of Account', required=True, default='normal') + ('normal', 'Active'), + ('closed', 'Archived') + ], string='State', required=True, default='normal') tag_ids = fields.Many2many('account.analytic.tag', 'account_analytic_account_tag_rel', 'account_id', 'tag_id', string='Tags', copy=True) line_ids = fields.One2many('account.analytic.line', 'account_id', string="Analytic Lines") @@ -92,7 +93,7 @@ class account_analytic_line(models.Model): @api.model def _default_user(self): - return self.env.user.id + return self.env.context.get('user_id', self.env.user.id) name = fields.Char('Description', required=True) date = fields.Date('Date', required=True, index=True, default=fields.Date.context_today) diff --git a/addons/analytic/views/analytic_view.xml b/addons/analytic/views/analytic_view.xml index 8b7e76b4ef0..c6bea569973 100644 --- a/addons/analytic/views/analytic_view.xml +++ b/addons/analytic/views/analytic_view.xml @@ -88,14 +88,14 @@
- + - - - + + + @@ -135,6 +135,7 @@ + @@ -148,6 +149,7 @@ form tree,form + {'search_default_active':1}

@@ -160,7 +162,8 @@ Analytic Accounts ir.actions.act_window account.analytic.account - {} + + {'search_default_active':1} form tree,form @@ -176,7 +179,7 @@ - + diff --git a/addons/analytic/wizard/account_analytic_chart.py b/addons/analytic/wizard/account_analytic_chart.py index acee07822d0..0881cb2e329 100644 --- a/addons/analytic/wizard/account_analytic_chart.py +++ b/addons/analytic/wizard/account_analytic_chart.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- # Part of Odoo. See LICENSE file for full copyright and licensing details. from openerp.osv import fields, osv +from openerp.tools.safe_eval import safe_eval class account_analytic_chart(osv.osv_memory): _name = 'account.analytic.chart' @@ -14,12 +15,12 @@ class account_analytic_chart(osv.osv_memory): def analytic_account_chart_open_window(self, cr, uid, ids, context=None): mod_obj = self.pool.get('ir.model.data') act_obj = self.pool.get('ir.actions.act_window') - result_context = {} if context is None: context = {} result = mod_obj.get_object_reference(cr, uid, 'analytic', 'action_analytic_account_form') id = result and result[1] or False result = act_obj.read(cr, uid, [id], context=context)[0] + result_context = safe_eval(result.get('context', '{}')) data = self.read(cr, uid, ids, [])[0] if data['from_date']: result_context.update({'from_date': data['from_date']}) diff --git a/addons/anonymization/anonymization.py b/addons/anonymization/anonymization.py index 4ac95f413c4..581a5d8f586 100644 --- a/addons/anonymization/anonymization.py +++ b/addons/anonymization/anonymization.py @@ -10,6 +10,7 @@ except ImportError: import pickle import random import datetime +from openerp.release import version_info from openerp.osv import fields, osv from openerp.tools.translate import _ from openerp.tools.safe_eval import safe_eval as eval @@ -523,7 +524,7 @@ class ir_model_fields_anonymize_wizard(osv.osv_memory): data = pickle.loads(base64.decodestring(wizard.file_import)) migration_fix_obj = self.pool.get('ir.model.fields.anonymization.migration.fix') - fix_ids = migration_fix_obj.search(cr, uid, [('target_version', '=', '8.0')]) + fix_ids = migration_fix_obj.search(cr, uid, [('target_version', '=', '.'.join(map(str, version_info[:2])))]) fixes = migration_fix_obj.read(cr, uid, fix_ids, ['model_name', 'field_name', 'query', 'query_type', 'sequence']) fixes = group(fixes, ('model_name', 'field_name')) diff --git a/addons/auth_oauth/i18n/de.po b/addons/auth_oauth/i18n/de.po index 497536fb664..d2583046b9c 100644 --- a/addons/auth_oauth/i18n/de.po +++ b/addons/auth_oauth/i18n/de.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-07 14:40+0000\n" -"PO-Revision-Date: 2015-12-01 21:09+0000\n" +"PO-Revision-Date: 2015-12-11 15:04+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: German (http://www.transifex.com/odoo/odoo-9/language/de/)\n" "MIME-Version: 1.0\n" @@ -319,7 +319,7 @@ msgstr "Gesamtschulden dieses Kunden" #. module: auth_oauth #: model:ir.model.fields,help:auth_oauth.field_res_users_debit msgid "Total amount you have to pay to this vendor." -msgstr "" +msgstr "Gesamtsumme zahlbar an Lieferant." #. module: auth_oauth #: model:ir.model,name:auth_oauth.model_res_users diff --git a/addons/auth_oauth/i18n/pt.po b/addons/auth_oauth/i18n/pt.po index b3826318da1..4214de843fc 100644 --- a/addons/auth_oauth/i18n/pt.po +++ b/addons/auth_oauth/i18n/pt.po @@ -4,13 +4,14 @@ # # Translators: # Ricardo Correia , 2015 +# Vitor Fernandes , 2015 msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-07 14:40+0000\n" -"PO-Revision-Date: 2015-11-25 13:51+0000\n" -"Last-Translator: Ricardo Correia \n" +"PO-Revision-Date: 2015-12-12 12:12+0000\n" +"Last-Translator: Vitor Fernandes \n" "Language-Team: Portuguese (http://www.transifex.com/odoo/odoo-9/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,7 +29,7 @@ msgid "" " - Edit settings and set both Authorized Redirect URIs and Authorized JavaScript Origins to your hostname.
\n" "
\n" " Now copy paste the client_id here:" -msgstr "
\n- Criar um novo projeto
\n- Vá até Acesso API
\n- Criar um cliente_id oauth
\n- Editar as configuração e fazer com que ambos os campos Autorized Redirect URIs e Authorized JavaScript Origins tenham o valor do seu domínio.
\n
\nCopie e cole o client_id aqui:" +msgstr "
\n- Criar um novo projeto
\n- Vá até Acesso API
\n- Criar um client_id oauth
\n- Editar as configuração e fazer com que ambos os campos Authorized Redirect URIs e Authorized JavaScript Origins tenham o valor do seu domínio.
\n
\nCopie e cole o client_id aqui:" #. module: auth_oauth #: code:addons/auth_oauth/controllers/main.py:99 @@ -295,7 +296,7 @@ msgid "" "To setup the signin process with Google, first you have to perform the following steps:
\n" "
\n" " - Go to the" -msgstr "Para configurar o processo de início de sessão com o Google, terá que executar os seguintes passos:
\n
\n- Vá a" +msgstr "Para configurar o processo de início de sessão com o Google, terá que executar os seguintes passos:
\n
\n- Vá a" #. module: auth_oauth #: model:ir.model.fields,field_description:auth_oauth.field_res_users_total_invoiced diff --git a/addons/auth_oauth/i18n/pt_BR.po b/addons/auth_oauth/i18n/pt_BR.po index 000e827e403..c93edc223d8 100644 --- a/addons/auth_oauth/i18n/pt_BR.po +++ b/addons/auth_oauth/i18n/pt_BR.po @@ -4,13 +4,15 @@ # # Translators: # Adriel Kotviski , 2015 +# Grazziano Duarte , 2015 +# Mateus Cerqueira Lopes , 2015 msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-07 14:40+0000\n" -"PO-Revision-Date: 2015-10-11 23:11+0000\n" -"Last-Translator: Adriel Kotviski \n" +"PO-Revision-Date: 2015-12-10 01:10+0000\n" +"Last-Translator: Grazziano Duarte \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/odoo/odoo-9/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,7 +30,7 @@ msgid "" " - Edit settings and set both Authorized Redirect URIs and Authorized JavaScript Origins to your hostname.
\n" "
\n" " Now copy paste the client_id here:" -msgstr "" +msgstr "
\n- Criar um novo projeto
\n- Ir para a API de Acesso
\n- Criar um oauth client_id
\n- Editar configurações e definir Redirecionamento de URIs Autorizadas e Origens JavaScript Autorizadas a seu hostname
.\n
\nAgora copiar e colar o client_id aqui:" #. module: auth_oauth #: code:addons/auth_oauth/controllers/main.py:99 @@ -175,7 +177,7 @@ msgid "" "Last time the invoices & payments matching was performed for this partner. " "It is set either if there's not at least an unreconciled debit and an " "unreconciled credit or if you click the \"Done\" button." -msgstr "" +msgstr "A última vez em que a correspondência de faturas e pagamentos foi realizada para este parceiro. Ele é definido se não houver pelo menos um débito não reconciliado e um crédito não reconciliado ou se você clicar no botão \"Concluído\"." #. module: auth_oauth #: model:ir.model.fields,field_description:auth_oauth.field_res_users_last_time_entries_checked @@ -259,7 +261,7 @@ msgstr "A posição fiscal irá determinar os impostos e contas usadas para o pa msgid "" "The partner has at least one unreconciled debit and credit since last time " "the invoices & payments matching was performed." -msgstr "" +msgstr "O parceiro tem pelo menos um débito e crédito não reconciliado desde última vez que a correspondência de faturas e pagamentos foi realizada." #. module: auth_oauth #: model:ir.model.fields,help:auth_oauth.field_res_users_property_account_payable_id @@ -280,7 +282,7 @@ msgstr "Esta conta será usada em vez da conta padrão, como conta de recebimen msgid "" "This payment term will be used instead of the default one for purchase " "orders and vendor bills" -msgstr "" +msgstr "Este prazo de pagamento será usado em vez do padrão de ordens de compra" #. module: auth_oauth #: model:ir.model.fields,help:auth_oauth.field_res_users_property_payment_term_id @@ -295,7 +297,7 @@ msgid "" "To setup the signin process with Google, first you have to perform the following steps:
\n" "
\n" " - Go to the" -msgstr "" +msgstr "Para definir o processo de login com Google, primeiro você deve seguir os seguintes passos:
\n
\n - Ir para o" #. module: auth_oauth #: model:ir.model.fields,field_description:auth_oauth.field_res_users_total_invoiced diff --git a/addons/auth_signup/i18n/af.po b/addons/auth_signup/i18n/af.po index c5f6a1638ad..d45ceed3331 100644 --- a/addons/auth_signup/i18n/af.po +++ b/addons/auth_signup/i18n/af.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-14 10:27+0000\n" -"PO-Revision-Date: 2015-11-16 19:18+0000\n" +"PO-Revision-Date: 2015-12-08 09:07+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Afrikaans (http://www.transifex.com/odoo/odoo-9/language/af/)\n" "MIME-Version: 1.0\n" @@ -289,7 +289,7 @@ msgstr "" #: model:ir.ui.view,arch_db:auth_signup.fields #: model:ir.ui.view,arch_db:auth_signup.reset_password msgid "Your Email" -msgstr "" +msgstr "Jou Epos" #. module: auth_signup #: model:ir.ui.view,arch_db:auth_signup.fields diff --git a/addons/auth_signup/i18n/de.po b/addons/auth_signup/i18n/de.po index 35cacaad030..93d85ce15c3 100644 --- a/addons/auth_signup/i18n/de.po +++ b/addons/auth_signup/i18n/de.po @@ -3,14 +3,16 @@ # * auth_signup # # Translators: +# David , 2015 +# Henry Mineehen , 2015 # Magdalena Zimprich , 2015 msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-14 10:27+0000\n" -"PO-Revision-Date: 2015-11-13 14:46+0000\n" -"Last-Translator: Magdalena Zimprich \n" +"PO-Revision-Date: 2015-12-11 18:44+0000\n" +"Last-Translator: Henry Mineehen \n" "Language-Team: German (http://www.transifex.com/odoo/odoo-9/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -57,7 +59,7 @@ msgid "" "

You may change your password by following this link, which will remain valid during 24 hours.

\n" "\n" "

Note: If you do not expect this, you can safely ignore this email.

" -msgstr "" +msgstr "\n

Eine Aufforderung zur Kennwortwiederherstellung zu dem Odoo Konto verknüpft mit dieser E-mail-Adresse wurde gesendet.

\n\n

Das Kennwort kann mit folgendem Link, welcher 24 Stunden gültig ist, geändert werden.

\n\n

Hinweis: Falls keine Anfrage gestartet wurde, kann diese E-mail ignoriert werden.

" #. module: auth_signup #: model:mail.template,subject:auth_signup.set_password_email @@ -93,7 +95,7 @@ msgstr "Es wurde eine E-Mail mit Zugangsdaten zur Änderung Ihres Passworts gese #: code:addons/auth_signup/controllers/main.py:108 #, python-format msgid "Authentication Failed." -msgstr "" +msgstr "Authentifizierung fehlgeschlagen" #. module: auth_signup #: model:ir.ui.view,arch_db:auth_signup.reset_password @@ -167,7 +169,7 @@ msgstr "Passwort zurücksetzen" #. module: auth_signup #: model:ir.model.fields,field_description:auth_signup.field_res_users_website_private msgid "Private Profile" -msgstr "" +msgstr "Privates Profil" #. module: auth_signup #: model:ir.ui.view,arch_db:auth_signup.login @@ -178,7 +180,7 @@ msgstr "Passwort zurücksetzen" #: code:addons/auth_signup/res_users.py:250 #, python-format msgid "Reset password: invalid username or email" -msgstr "" +msgstr "Passwort zurücksetzen: Falscher Benutzername oder E-mail" #. module: auth_signup #: model:ir.ui.view,arch_db:auth_signup.res_users_form_view diff --git a/addons/auth_signup/i18n/pt_BR.po b/addons/auth_signup/i18n/pt_BR.po index a0cf999db29..3d0cd2c3126 100644 --- a/addons/auth_signup/i18n/pt_BR.po +++ b/addons/auth_signup/i18n/pt_BR.po @@ -3,14 +3,15 @@ # * auth_signup # # Translators: +# Grazziano Duarte , 2015 # Mateus Cerqueira Lopes , 2015 msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-14 10:27+0000\n" -"PO-Revision-Date: 2015-11-10 15:53+0000\n" -"Last-Translator: Mateus Cerqueira Lopes \n" +"PO-Revision-Date: 2015-12-09 23:48+0000\n" +"Last-Translator: Grazziano Duarte \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/odoo/odoo-9/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -57,7 +58,7 @@ msgid "" "

You may change your password by following this link, which will remain valid during 24 hours.

\n" "\n" "

Note: If you do not expect this, you can safely ignore this email.

" -msgstr "" +msgstr "\n

A redefinição de senha foi solicitada para a conta Odoo vinculada para este e-mail.

\n\n

Você pode mudar sua senha seguindo este link, que permanecerá válido durante 24 horas.

\n\n

Nota: Se você não esperava isso, você pode ignorar este e-mail.

" #. module: auth_signup #: model:mail.template,subject:auth_signup.set_password_email @@ -69,14 +70,14 @@ msgstr "${object.company_id.name} convite para conectar-se ao Odoo" msgid "" "A password reset has been requested for this user. An email " "containing the following link has been sent:" -msgstr "" +msgstr "A redefinição de senha foi solicitada para este usuário. Um e-mail contendo o seguinte link foi enviado:" #. module: auth_signup #: model:ir.ui.view,arch_db:auth_signup.res_users_form_view msgid "" "An invitation email containing the following subscription link has " "been sent:" -msgstr "" +msgstr "Um e-mail de convite contendo o seguinte link de subscrição foi enviado:" #. module: auth_signup #: model:ir.model.fields,field_description:auth_signup.field_base_config_settings_auth_signup_uninvited @@ -93,7 +94,7 @@ msgstr "Um email foi enviado com as credenciais para resetar sua senha" #: code:addons/auth_signup/controllers/main.py:108 #, python-format msgid "Authentication Failed." -msgstr "" +msgstr "Falha na Autenticação." #. module: auth_signup #: model:ir.ui.view,arch_db:auth_signup.reset_password @@ -120,7 +121,7 @@ msgstr "Confirmar Senha" #. module: auth_signup #: selection:res.users,state:0 msgid "Connected" -msgstr "" +msgstr "Conectado" #. module: auth_signup #: code:addons/auth_signup/controllers/main.py:62 @@ -167,7 +168,7 @@ msgstr "Redefinir Senha" #. module: auth_signup #: model:ir.model.fields,field_description:auth_signup.field_res_users_website_private msgid "Private Profile" -msgstr "" +msgstr "Perfil Privado" #. module: auth_signup #: model:ir.ui.view,arch_db:auth_signup.login @@ -178,7 +179,7 @@ msgstr "Redefinir Senha" #: code:addons/auth_signup/res_users.py:250 #, python-format msgid "Reset password: invalid username or email" -msgstr "" +msgstr "Redefinição de senha: nome de usuário ou e-mail inválido" #. module: auth_signup #: model:ir.ui.view,arch_db:auth_signup.res_users_form_view @@ -239,7 +240,7 @@ msgstr "Modelo de usuário para novos usuários criados através de inscrição" #. module: auth_signup #: model:ir.model.fields,help:auth_signup.field_res_users_website_url msgid "The full URL to access the document through the website." -msgstr "" +msgstr "A URL completa para acessar o documento através do site." #. module: auth_signup #: model:ir.model.fields,help:auth_signup.field_base_config_settings_auth_signup_reset_password diff --git a/addons/auth_signup/i18n/sv.po b/addons/auth_signup/i18n/sv.po index d4d993f1372..bcd51d4eb1f 100644 --- a/addons/auth_signup/i18n/sv.po +++ b/addons/auth_signup/i18n/sv.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-14 10:27+0000\n" -"PO-Revision-Date: 2015-11-23 17:20+0000\n" +"PO-Revision-Date: 2015-12-08 07:44+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Swedish (http://www.transifex.com/odoo/odoo-9/language/sv/)\n" "MIME-Version: 1.0\n" @@ -253,7 +253,7 @@ msgstr "Användare" #. module: auth_signup #: model:ir.model.fields,field_description:auth_signup.field_res_users_website_published msgid "Visible in Website" -msgstr "" +msgstr "Synlig på webbplats" #. module: auth_signup #: model:ir.model.fields,field_description:auth_signup.field_res_users_website_description diff --git a/addons/auth_signup/i18n/zh_CN.po b/addons/auth_signup/i18n/zh_CN.po index 4dbf9581562..0ea9ff4dbed 100644 --- a/addons/auth_signup/i18n/zh_CN.po +++ b/addons/auth_signup/i18n/zh_CN.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-14 10:27+0000\n" -"PO-Revision-Date: 2015-11-20 07:16+0000\n" -"Last-Translator: Gary Wei \n" +"PO-Revision-Date: 2015-12-08 08:46+0000\n" +"Last-Translator: jeffery chen fan \n" "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -200,7 +200,7 @@ msgstr "注册" #: model:ir.model.fields,field_description:auth_signup.field_res_partner_signup_expiration #: model:ir.model.fields,field_description:auth_signup.field_res_users_signup_expiration msgid "Signup Expiration" -msgstr "注册过期" +msgstr "注册到期" #. module: auth_signup #: model:ir.model.fields,field_description:auth_signup.field_res_partner_signup_token @@ -259,7 +259,7 @@ msgstr "在网站可见" #. module: auth_signup #: model:ir.model.fields,field_description:auth_signup.field_res_users_website_description msgid "Website Partner Full Description" -msgstr "网站业务伙伴的详细描述" +msgstr "网站业务伙伴的详细说明" #. module: auth_signup #: model:ir.model.fields,field_description:auth_signup.field_res_users_website_short_description diff --git a/addons/auth_signup/res_users.py b/addons/auth_signup/res_users.py index 92ebcb093b0..4d3babfb988 100644 --- a/addons/auth_signup/res_users.py +++ b/addons/auth_signup/res_users.py @@ -256,6 +256,8 @@ class res_users(osv.Model): def action_reset_password(self, cr, uid, ids, context=None): """ create signup token for each user, and send their signup url by email """ # prepare reset password signup + if not context: + context = {} create_mode = bool(context.get('create_user')) res_partner = self.pool.get('res.partner') partner_ids = [user.partner_id.id for user in self.browse(cr, uid, ids, context)] diff --git a/addons/barcodes/i18n/de.po b/addons/barcodes/i18n/de.po index 45a7728971d..80acd00fa90 100644 --- a/addons/barcodes/i18n/de.po +++ b/addons/barcodes/i18n/de.po @@ -5,13 +5,14 @@ # Translators: # Charly Chimpo , 2015 # Fabian Liesch , 2015 +# Henry Mineehen , 2015 msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-14 10:27+0000\n" -"PO-Revision-Date: 2015-12-02 14:49+0000\n" -"Last-Translator: Charly Chimpo \n" +"PO-Revision-Date: 2015-12-11 18:44+0000\n" +"Last-Translator: Henry Mineehen \n" "Language-Team: German (http://www.transifex.com/odoo/odoo-9/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -145,7 +146,7 @@ msgstr "Codierung" #: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:51 #, python-format msgid "Error : Document not editable" -msgstr "" +msgstr "Fehler: Dokument ist nicht editierbar" #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature_id diff --git a/addons/barcodes/i18n/es_EC.po b/addons/barcodes/i18n/es_EC.po index 00e6cb359c9..35bcf4b5d9b 100644 --- a/addons/barcodes/i18n/es_EC.po +++ b/addons/barcodes/i18n/es_EC.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-14 10:27+0000\n" -"PO-Revision-Date: 2015-11-16 05:27+0000\n" -"Last-Translator: Martin Trigaux\n" +"PO-Revision-Date: 2015-12-10 17:58+0000\n" +"Last-Translator: Rick Hunter \n" "Language-Team: Spanish (Ecuador) (http://www.transifex.com/odoo/odoo-9/language/es_EC/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -60,7 +60,7 @@ msgstr "" #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_alias msgid "Alias" -msgstr "" +msgstr "Alías" #. module: barcodes #: selection:barcode.nomenclature,upc_ean_conv:0 diff --git a/addons/barcodes/i18n/fr.po b/addons/barcodes/i18n/fr.po index 9ae51231135..b3ed71cc0d6 100644 --- a/addons/barcodes/i18n/fr.po +++ b/addons/barcodes/i18n/fr.po @@ -3,6 +3,7 @@ # * barcodes # # Translators: +# Clo , 2015 # Maxime Chambreuil , 2015 # Quentin THEURET , 2015 # Sylvain GROS-DESORMEAUX , 2015 @@ -12,8 +13,8 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-14 10:27+0000\n" -"PO-Revision-Date: 2015-12-02 16:08+0000\n" -"Last-Translator: Saad Thaifa \n" +"PO-Revision-Date: 2015-12-07 19:48+0000\n" +"Last-Translator: Maxime Chambreuil \n" "Language-Team: French (http://www.transifex.com/odoo/odoo-9/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,7 +26,7 @@ msgstr "" #: code:addons/barcodes/barcodes.py:223 #, python-format msgid " '*' is not a valid Regex Barcode Pattern. Did you mean '.*' ?" -msgstr "" +msgstr " '*' n'est pas un modèle de code-barres Regex. Vouliez-vous indiquer '.*' ?" #. module: barcodes #: code:addons/barcodes/barcodes.py:221 @@ -194,7 +195,7 @@ msgid "" " decimals indicated with D's, such as {NNNDD}. In these cases, \n" " the barcode field on the associated records must show these digits as \n" " zeroes." -msgstr "" +msgstr "Les modèles peuvent aussi définir comment les valeur numériques telles que le poids ou le prix, peuvent être\n encodées dans le code-barres. Ils sont indiqués par le {NNN} où les N's\n définissent où les chiffres du numéro sont encodés. Les flotteurs sont également pris en charge avec les\n decimales indiquées avec les D's, tel que {NNNDD}. Dans ces cas, \n le champs du code-barres sur les enregistrements associés doivent montrer ces chiffres commes \n zéros." #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_name @@ -229,7 +230,7 @@ msgstr "Liste des règles des codes barres" #. module: barcodes #: model:ir.model.fields,help:barcodes.field_barcode_rule_alias msgid "The matched pattern will alias to this barcode" -msgstr "Le modèle correspondant " +msgstr "Le motif correspondant sera un alias pour ce code-barres" #. module: barcodes #: code:addons/barcodes/barcodes.py:217 code:addons/barcodes/barcodes.py:219 @@ -263,7 +264,7 @@ msgid "" "UPC Codes can be converted to EAN by prefixing them with a zero. This " "setting determines if a UPC/EAN barcode should be automatically converted in" " one way or another when trying to match a rule with the other encoding." -msgstr "" +msgstr "Les codes UPC peuvent être converti en EAN en mettant un zéro comme préfixe. Ce réglage détermine si un code-barres UPC/EAN devrait être automatiquement converti dans un sens ou dans l'autre en faisant correspondre une règle avec l'autre encodage." #. module: barcodes #: selection:barcode.nomenclature,upc_ean_conv:0 @@ -279,7 +280,7 @@ msgstr "Conversion UPC/EAN" #: model:ir.model.fields,help:barcodes.field_barcode_rule_sequence msgid "" "Used to order rules such that rules with a smaller sequence match first" -msgstr "" +msgstr "Utilisé pour commander des règles telles que les règles avec une séquence similaire correspondent en premier" #. module: barcodes #: model:ir.model.fields,help:barcodes.field_barcodes_barcode_events_mixin__barcode_scanned @@ -289,14 +290,14 @@ msgstr "Valeur du dernier code-barres scanné" #. module: barcodes #: model:ir.model,name:barcodes.model_barcode_nomenclature msgid "barcode.nomenclature" -msgstr "" +msgstr "barcode.nomenclature" #. module: barcodes #: model:ir.model,name:barcodes.model_barcode_rule msgid "barcode.rule" -msgstr "" +msgstr "barcode.rule" #. module: barcodes #: model:ir.model,name:barcodes.model_barcodes_barcode_events_mixin msgid "barcodes.barcode_events_mixin" -msgstr "" +msgstr "barcodes.barcode_events_mixin" diff --git a/addons/barcodes/i18n/pt.po b/addons/barcodes/i18n/pt.po index f1291068b59..44bfa3d3783 100644 --- a/addons/barcodes/i18n/pt.po +++ b/addons/barcodes/i18n/pt.po @@ -4,13 +4,15 @@ # # Translators: # Cristina Loureiro , 2015 +# Manuela Silva , 2015 +# Vitor Fernandes , 2015 msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-14 10:27+0000\n" -"PO-Revision-Date: 2015-11-19 23:11+0000\n" -"Last-Translator: Cristina Loureiro \n" +"PO-Revision-Date: 2015-12-12 13:13+0000\n" +"Last-Translator: Vitor Fernandes \n" "Language-Team: Portuguese (http://www.transifex.com/odoo/odoo-9/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -28,19 +30,19 @@ msgstr "" #: code:addons/barcodes/barcodes.py:221 #, python-format msgid ": a rule can only contain one pair of braces." -msgstr "" +msgstr ": uma regra só pode conter um par de chavetas." #. module: barcodes #: code:addons/barcodes/barcodes.py:217 #, python-format msgid ": braces can only contain N's followed by D's." -msgstr "" +msgstr ": as chavetas só podem conter N's seguidos por D's." #. module: barcodes #: code:addons/barcodes/barcodes.py:219 #, python-format msgid ": empty braces." -msgstr "" +msgstr ": chavetas vazias." #. module: barcodes #: model:ir.ui.view,arch_db:barcodes.view_barcode_nomenclature_form @@ -56,7 +58,7 @@ msgstr "" msgid "" "A barcode nomenclature defines how the point of sale identify and interprets" " barcodes" -msgstr "" +msgstr "Uma nomenclatura do código de barras define como um ponto de venda identifica e interpreta códigos de barras" #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_alias @@ -71,24 +73,24 @@ msgstr "Sempre" #. module: barcodes #: model:ir.model.fields,help:barcodes.field_barcode_rule_name msgid "An internal identification for this barcode nomenclature rule" -msgstr "" +msgstr "Uma identificação interna para a regra de nomenclatura deste código de barras" #. module: barcodes #: model:ir.model.fields,help:barcodes.field_barcode_nomenclature_name msgid "An internal identification of the barcode nomenclature" -msgstr "" +msgstr "Uma identificação interna da nomenclatura do código de barras" #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_barcode_nomenclature_id #: model:ir.ui.view,arch_db:barcodes.view_barcode_nomenclature_form msgid "Barcode Nomenclature" -msgstr "Nomenclatura de código de barras" +msgstr "Nomenclatura do Código de Barras" #. module: barcodes #: model:ir.actions.act_window,name:barcodes.action_barcode_nomenclature_form #: model:ir.ui.view,arch_db:barcodes.view_barcode_nomenclature_tree msgid "Barcode Nomenclatures" -msgstr "Nomenclaturas de códigos de barras" +msgstr "Nomenclaturas do Código de Barras" #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_pattern @@ -98,17 +100,17 @@ msgstr "Padrão do código de barras" #. module: barcodes #: model:ir.ui.view,arch_db:barcodes.view_barcode_rule_form msgid "Barcode Rule" -msgstr "" +msgstr "Regra do Código de Barras" #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcodes_barcode_events_mixin__barcode_scanned msgid "Barcode Scanned" -msgstr "" +msgstr "Código de Barras lido" #. module: barcodes #: model:ir.actions.act_window,help:barcodes.action_barcode_nomenclature_form msgid "Click to add a Barcode Nomenclature ." -msgstr "" +msgstr "Clique para adicionar uma Nomenclatura do Código de Barras." #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature_create_uid @@ -132,19 +134,19 @@ msgstr "Nome a Mostrar" #. module: barcodes #: selection:barcode.nomenclature,upc_ean_conv:0 msgid "EAN-13 to UPC-A" -msgstr "" +msgstr "EAN-13 até UPC-A" #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_encoding msgid "Encoding" -msgstr "" +msgstr "Codificação" #. module: barcodes #. openerp-web #: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:51 #, python-format msgid "Error : Document not editable" -msgstr "" +msgstr "Erro : Documento não editável" #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature_id @@ -180,7 +182,7 @@ msgstr "Nunca" #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature_name msgid "Nomenclature Name" -msgstr "" +msgstr "Nome de Nomenclatura" #. module: barcodes #: model:ir.ui.view,arch_db:barcodes.view_barcode_nomenclature_form @@ -191,7 +193,7 @@ msgid "" " decimals indicated with D's, such as {NNNDD}. In these cases, \n" " the barcode field on the associated records must show these digits as \n" " zeroes." -msgstr "" +msgstr "Os padrões podem também definir como os valores numéricos, tais como peso ou preço,\npodem ser codificados no código de barras. Eles são indicados por [NNN]\nonde os N's definem onde os dígitos do número são codificados. Os números de\nvirgula flutuante são também suportados com a parte decimal indicada por D's, tal como\n[NNNDD]. Nestes casos, o campo do código de barras nos registos\nassociados deve mostrar estes dígitos com zeros." #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_name @@ -211,17 +213,17 @@ msgstr "Sequência" #. module: barcodes #: model:ir.ui.view,arch_db:barcodes.view_barcode_nomenclature_form msgid "Tables" -msgstr "" +msgstr "Tabelas" #. module: barcodes #: model:ir.model.fields,help:barcodes.field_barcode_rule_pattern msgid "The barcode matching pattern" -msgstr "" +msgstr "O padrão de correspondência do código de barras" #. module: barcodes #: model:ir.model.fields,help:barcodes.field_barcode_nomenclature_rule_ids msgid "The list of barcode rules" -msgstr "" +msgstr "A lista de regras do código de barras" #. module: barcodes #: model:ir.model.fields,help:barcodes.field_barcode_rule_alias @@ -233,7 +235,7 @@ msgstr "" #: code:addons/barcodes/barcodes.py:221 #, python-format msgid "There is a syntax error in the barcode pattern " -msgstr "" +msgstr "Há um erro de sintaxe no padrão do código de barras" #. module: barcodes #: model:ir.model.fields,help:barcodes.field_barcode_rule_encoding @@ -247,7 +249,7 @@ msgstr "" #: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:51 #, python-format msgid "To modify this document, please first start edition." -msgstr "" +msgstr "Para alterar este documento, por favor inicie a edição primeiro." #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_type @@ -260,33 +262,33 @@ msgid "" "UPC Codes can be converted to EAN by prefixing them with a zero. This " "setting determines if a UPC/EAN barcode should be automatically converted in" " one way or another when trying to match a rule with the other encoding." -msgstr "" +msgstr "Os Códigos UPC podem ser convertidos para EAN prefixando-os com um zero. Esta configuração determina se um código de barras UPC/EAN deve ser convertido automaticamente num sentido ou noutro quando é feita a comparação com uma regra com a outra codificação." #. module: barcodes #: selection:barcode.nomenclature,upc_ean_conv:0 msgid "UPC-A to EAN-13" -msgstr "" +msgstr "UPC-A para EAN-13" #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature_upc_ean_conv msgid "UPC/EAN Conversion" -msgstr "" +msgstr "Conversão UPC/EAN" #. module: barcodes #: model:ir.model.fields,help:barcodes.field_barcode_rule_sequence msgid "" "Used to order rules such that rules with a smaller sequence match first" -msgstr "" +msgstr "Usado para ordenar regras de maneira a que regras com uma sequência menor correspondem primeiro" #. module: barcodes #: model:ir.model.fields,help:barcodes.field_barcodes_barcode_events_mixin__barcode_scanned msgid "Value of the last barcode scanned." -msgstr "" +msgstr "Valor do último código de barras lido." #. module: barcodes #: model:ir.model,name:barcodes.model_barcode_nomenclature msgid "barcode.nomenclature" -msgstr "" +msgstr "barcode.nomenclature" #. module: barcodes #: model:ir.model,name:barcodes.model_barcode_rule @@ -296,4 +298,4 @@ msgstr "barcode.rule" #. module: barcodes #: model:ir.model,name:barcodes.model_barcodes_barcode_events_mixin msgid "barcodes.barcode_events_mixin" -msgstr "" +msgstr "barcodes.barcode_events_mixin" diff --git a/addons/barcodes/i18n/pt_BR.po b/addons/barcodes/i18n/pt_BR.po index a3e3dc2a952..ebd282cfacf 100644 --- a/addons/barcodes/i18n/pt_BR.po +++ b/addons/barcodes/i18n/pt_BR.po @@ -3,13 +3,15 @@ # * barcodes # # Translators: +# Grazziano Duarte , 2015 +# Mateus Cerqueira Lopes , 2015 msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-14 10:27+0000\n" -"PO-Revision-Date: 2015-09-12 17:44+0000\n" -"Last-Translator: Martin Trigaux\n" +"PO-Revision-Date: 2015-12-10 01:10+0000\n" +"Last-Translator: Grazziano Duarte \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/odoo/odoo-9/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,25 +23,25 @@ msgstr "" #: code:addons/barcodes/barcodes.py:223 #, python-format msgid " '*' is not a valid Regex Barcode Pattern. Did you mean '.*' ?" -msgstr "" +msgstr " '*' não é um Padrão Regex de Código de Barras válido . Você quis dizer '.*' ?" #. module: barcodes #: code:addons/barcodes/barcodes.py:221 #, python-format msgid ": a rule can only contain one pair of braces." -msgstr "" +msgstr ": uma regra só pode conter um par de chaves." #. module: barcodes #: code:addons/barcodes/barcodes.py:217 #, python-format msgid ": braces can only contain N's followed by D's." -msgstr "" +msgstr ": chaves só podem conter N's seguidos por D's." #. module: barcodes #: code:addons/barcodes/barcodes.py:219 #, python-format msgid ": empty braces." -msgstr "" +msgstr ": chaves vazias." #. module: barcodes #: model:ir.ui.view,arch_db:barcodes.view_barcode_nomenclature_form @@ -48,14 +50,14 @@ msgid "" " When a barcode is scanned it is associated to the first rule with a matching\n" " pattern. The pattern syntax is that of regular expression, and a barcode is matched\n" " if the regular expression matches a prefix of the barcode." -msgstr "" +msgstr "Nomenclaturas de Códigos de Barras definem como os códigos de barras são reconhecidos e categorizados.\nQuando um código de barras é digitalizado, é associado à primeira regra com um padrão de\ncombinação.O padrão de sintaxe é o da expressão regular, e um código de barras é combinado\nse a expressão regular corresponde a um prefixo do código de barras." #. module: barcodes #: model:ir.actions.act_window,help:barcodes.action_barcode_nomenclature_form msgid "" "A barcode nomenclature defines how the point of sale identify and interprets" " barcodes" -msgstr "" +msgstr "Uma nomenclatura de código de barras define como o ponto de venda identifica e interpreta os códigos de barras" #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_alias @@ -70,44 +72,44 @@ msgstr "Sempre" #. module: barcodes #: model:ir.model.fields,help:barcodes.field_barcode_rule_name msgid "An internal identification for this barcode nomenclature rule" -msgstr "" +msgstr "Uma identificação interna para esta regra de nomenclatura de código de barras" #. module: barcodes #: model:ir.model.fields,help:barcodes.field_barcode_nomenclature_name msgid "An internal identification of the barcode nomenclature" -msgstr "" +msgstr "Uma identificação interna da nomenclatura de código de barras" #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_barcode_nomenclature_id #: model:ir.ui.view,arch_db:barcodes.view_barcode_nomenclature_form msgid "Barcode Nomenclature" -msgstr "" +msgstr "Nomenclatura de Código de Barras" #. module: barcodes #: model:ir.actions.act_window,name:barcodes.action_barcode_nomenclature_form #: model:ir.ui.view,arch_db:barcodes.view_barcode_nomenclature_tree msgid "Barcode Nomenclatures" -msgstr "" +msgstr "Nomenclaturas de Código de Barras" #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_pattern msgid "Barcode Pattern" -msgstr "" +msgstr "Padrão de Código de Barras" #. module: barcodes #: model:ir.ui.view,arch_db:barcodes.view_barcode_rule_form msgid "Barcode Rule" -msgstr "" +msgstr "Regra de Código de Barras" #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcodes_barcode_events_mixin__barcode_scanned msgid "Barcode Scanned" -msgstr "" +msgstr "Código de Barras Digitalizado" #. module: barcodes #: model:ir.actions.act_window,help:barcodes.action_barcode_nomenclature_form msgid "Click to add a Barcode Nomenclature ." -msgstr "" +msgstr "Clique para adicionar uma Nomenclatura de Código de Barras." #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature_create_uid @@ -126,24 +128,24 @@ msgstr "Criado em" #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_display_name #: model:ir.model.fields,field_description:barcodes.field_barcodes_barcode_events_mixin_display_name msgid "Display Name" -msgstr "" +msgstr "Nome de Exibição" #. module: barcodes #: selection:barcode.nomenclature,upc_ean_conv:0 msgid "EAN-13 to UPC-A" -msgstr "" +msgstr "EAN-13 para UPC-A" #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_encoding msgid "Encoding" -msgstr "" +msgstr "Codificação" #. module: barcodes #. openerp-web #: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:51 #, python-format msgid "Error : Document not editable" -msgstr "" +msgstr "Erro: Documento não editável" #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature_id @@ -179,7 +181,7 @@ msgstr "Nunca" #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature_name msgid "Nomenclature Name" -msgstr "" +msgstr "Nome da Nomenclatura" #. module: barcodes #: model:ir.ui.view,arch_db:barcodes.view_barcode_nomenclature_form @@ -190,7 +192,7 @@ msgid "" " decimals indicated with D's, such as {NNNDD}. In these cases, \n" " the barcode field on the associated records must show these digits as \n" " zeroes." -msgstr "" +msgstr "Padrões também podem definir valores como numéricos, como peso ou preço, podem ser\ncodificados no código de barras. Eles são indicados por {NNN}, onde N's\ndefinem onde os dígitos numéricos são codificados. Flutuantes também são suportados com os\ndecimais indicados com D's, tais como {NNNDD}. Nestes casos,\no campo de código de barras nos registros associados devem mostrar esses dígitos como\nzeros." #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_name @@ -210,43 +212,43 @@ msgstr "Seqüência" #. module: barcodes #: model:ir.ui.view,arch_db:barcodes.view_barcode_nomenclature_form msgid "Tables" -msgstr "" +msgstr "Tabelas" #. module: barcodes #: model:ir.model.fields,help:barcodes.field_barcode_rule_pattern msgid "The barcode matching pattern" -msgstr "" +msgstr "A combinação de padrões de código de barras" #. module: barcodes #: model:ir.model.fields,help:barcodes.field_barcode_nomenclature_rule_ids msgid "The list of barcode rules" -msgstr "" +msgstr "A lista de regras de código de barras" #. module: barcodes #: model:ir.model.fields,help:barcodes.field_barcode_rule_alias msgid "The matched pattern will alias to this barcode" -msgstr "" +msgstr "O padrão combinado vai apelidar este código de barras" #. module: barcodes #: code:addons/barcodes/barcodes.py:217 code:addons/barcodes/barcodes.py:219 #: code:addons/barcodes/barcodes.py:221 #, python-format msgid "There is a syntax error in the barcode pattern " -msgstr "" +msgstr "Há um erro de sintaxe no padrão de código de barras" #. module: barcodes #: model:ir.model.fields,help:barcodes.field_barcode_rule_encoding msgid "" "This rule will apply only if the barcode is encoded with the specified " "encoding" -msgstr "" +msgstr "Esta regra será aplicada somente se o código de barras for codificado com a codificação especificada" #. module: barcodes #. openerp-web #: code:addons/barcodes/static/src/js/form_view_barcode_handler.js:51 #, python-format msgid "To modify this document, please first start edition." -msgstr "" +msgstr "Para modificar este documento, por favor iniciar primeiro a edição." #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_type @@ -259,40 +261,40 @@ msgid "" "UPC Codes can be converted to EAN by prefixing them with a zero. This " "setting determines if a UPC/EAN barcode should be automatically converted in" " one way or another when trying to match a rule with the other encoding." -msgstr "" +msgstr "Códigos UPC podem ser convertido para EAN pela junção deles com um zero. Essa configuração determina se um código de barras UPC/EAN deve ser automaticamente convertido em uma forma ou outra ao tentar corresponder a uma regra com a outra codificação." #. module: barcodes #: selection:barcode.nomenclature,upc_ean_conv:0 msgid "UPC-A to EAN-13" -msgstr "" +msgstr "UPC-A para EAN-13" #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature_upc_ean_conv msgid "UPC/EAN Conversion" -msgstr "" +msgstr "Conversão UPC/EAN" #. module: barcodes #: model:ir.model.fields,help:barcodes.field_barcode_rule_sequence msgid "" "Used to order rules such that rules with a smaller sequence match first" -msgstr "" +msgstr "Usado para ordenar regras de tal modo que as regras com uma sequência combinem primeiro" #. module: barcodes #: model:ir.model.fields,help:barcodes.field_barcodes_barcode_events_mixin__barcode_scanned msgid "Value of the last barcode scanned." -msgstr "" +msgstr "Valor do último código de barras digitalizado." #. module: barcodes #: model:ir.model,name:barcodes.model_barcode_nomenclature msgid "barcode.nomenclature" -msgstr "" +msgstr "barcode.nomenclature" #. module: barcodes #: model:ir.model,name:barcodes.model_barcode_rule msgid "barcode.rule" -msgstr "" +msgstr "barcode.rule" #. module: barcodes #: model:ir.model,name:barcodes.model_barcodes_barcode_events_mixin msgid "barcodes.barcode_events_mixin" -msgstr "" +msgstr "barcodes.barcode_events_mixin" diff --git a/addons/barcodes/i18n/ru.po b/addons/barcodes/i18n/ru.po index db7e911e579..38fc611f05c 100644 --- a/addons/barcodes/i18n/ru.po +++ b/addons/barcodes/i18n/ru.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-14 10:27+0000\n" -"PO-Revision-Date: 2015-10-06 09:07+0000\n" +"PO-Revision-Date: 2015-12-07 16:59+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Russian (http://www.transifex.com/odoo/odoo-9/language/ru/)\n" "MIME-Version: 1.0\n" @@ -81,13 +81,13 @@ msgstr "" #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_barcode_nomenclature_id #: model:ir.ui.view,arch_db:barcodes.view_barcode_nomenclature_form msgid "Barcode Nomenclature" -msgstr "" +msgstr "Штрих-Код Номенклатура" #. module: barcodes #: model:ir.actions.act_window,name:barcodes.action_barcode_nomenclature_form #: model:ir.ui.view,arch_db:barcodes.view_barcode_nomenclature_tree msgid "Barcode Nomenclatures" -msgstr "" +msgstr "Штрих-Код Номенклатуры" #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_pattern diff --git a/addons/barcodes/i18n/zh_CN.po b/addons/barcodes/i18n/zh_CN.po index 1afe8ef728c..920406a919b 100644 --- a/addons/barcodes/i18n/zh_CN.po +++ b/addons/barcodes/i18n/zh_CN.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-14 10:27+0000\n" -"PO-Revision-Date: 2015-11-13 06:10+0000\n" +"PO-Revision-Date: 2015-12-11 02:52+0000\n" "Last-Translator: Gary Wei \n" "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -49,7 +49,7 @@ msgid "" " When a barcode is scanned it is associated to the first rule with a matching\n" " pattern. The pattern syntax is that of regular expression, and a barcode is matched\n" " if the regular expression matches a prefix of the barcode." -msgstr "条码术语定义条码的辨识和分类。\n　　　　　　　　　　　　　　　　　　　　当条码被扫码前扫了之后，它就会匹配到相关的第一条规则。模式的语法是正则表达式，如果正则表达式匹配的是条码的前缀，则匹配一个条码" +msgstr "条码名录定义条码的辨识和分类。\n　　　　　　　　　　　　　　　　　　　　当条码被扫码前扫了之后，它就会匹配到相关的第一条规则。模式的语法是正则表达式，如果正则表达式匹配的是条码的前缀，则匹配一个条码" #. module: barcodes #: model:ir.actions.act_window,help:barcodes.action_barcode_nomenclature_form @@ -82,13 +82,13 @@ msgstr "条形码命名的内部识别" #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_barcode_nomenclature_id #: model:ir.ui.view,arch_db:barcodes.view_barcode_nomenclature_form msgid "Barcode Nomenclature" -msgstr "条码术语" +msgstr "条码名录" #. module: barcodes #: model:ir.actions.act_window,name:barcodes.action_barcode_nomenclature_form #: model:ir.ui.view,arch_db:barcodes.view_barcode_nomenclature_tree msgid "Barcode Nomenclatures" -msgstr "条码术语" +msgstr "条码名录" #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_pattern @@ -108,19 +108,19 @@ msgstr "条码扫描" #. module: barcodes #: model:ir.actions.act_window,help:barcodes.action_barcode_nomenclature_form msgid "Click to add a Barcode Nomenclature ." -msgstr "点击添加条码术语" +msgstr "点击添加条码名录" #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature_create_uid #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_create_uid msgid "Created by" -msgstr "创建于" +msgstr "创建人" #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature_create_date #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_create_date msgid "Created on" -msgstr "创建于" +msgstr "创建时间" #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature_display_name @@ -164,13 +164,13 @@ msgstr "最后修改日" #: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature_write_uid #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_write_uid msgid "Last Updated by" -msgstr "最后更新" +msgstr "最后更新人" #. module: barcodes #: model:ir.model.fields,field_description:barcodes.field_barcode_nomenclature_write_date #: model:ir.model.fields,field_description:barcodes.field_barcode_rule_write_date msgid "Last Updated on" -msgstr "最后更新" +msgstr "最后更新时间" #. module: barcodes #: selection:barcode.nomenclature,upc_ean_conv:0 diff --git a/addons/base_action_rule/base_action_rule.py b/addons/base_action_rule/base_action_rule.py index 9d5c76e4130..39dd7b1f3e3 100644 --- a/addons/base_action_rule/base_action_rule.py +++ b/addons/base_action_rule/base_action_rule.py @@ -396,6 +396,8 @@ class base_action_rule(osv.osv): def _check(self, cr, uid, automatic=False, use_new_cursor=False, context=None): """ This Function is called by scheduler. """ context = context or {} + if '__action_done' not in context: + context = dict(context, __action_done={}) # retrieve all the action rules to run based on a timed condition action_dom = [('kind', '=', 'on_time')] action_ids = self.search(cr, uid, action_dom, context=dict(context, active_test=True)) @@ -439,8 +441,7 @@ class base_action_rule(osv.osv): action_dt = self._check_delay(cr, uid, action, record, record_dt, context=context) if last_run <= action_dt < now: try: - context = dict(context or {}, action=True) - self._process(cr, uid, action, [record.id], context=context) + action._process(record) except Exception: import traceback _logger.error(traceback.format_exc()) diff --git a/addons/base_action_rule/i18n/de.po b/addons/base_action_rule/i18n/de.po index 9653ed6a366..450b8e262dd 100644 --- a/addons/base_action_rule/i18n/de.po +++ b/addons/base_action_rule/i18n/de.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-10-20 04:50+0000\n" +"PO-Revision-Date: 2015-12-11 14:17+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: German (http://www.transifex.com/odoo/odoo-9/language/de/)\n" "MIME-Version: 1.0\n" @@ -236,7 +236,7 @@ msgstr "Wählen Sie in In der gleichen 'Suche' Ansicht den Button 'Speichere akt #. module: base_action_rule #: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_lead_test_customer msgid "Is a Customer" -msgstr "" +msgstr "Ist ein Kunde" #. module: base_action_rule #: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_lead_test_date_action_last diff --git a/addons/base_action_rule/i18n/es.po b/addons/base_action_rule/i18n/es.po index f59598b2972..7234a8f4249 100644 --- a/addons/base_action_rule/i18n/es.po +++ b/addons/base_action_rule/i18n/es.po @@ -3,13 +3,14 @@ # * base_action_rule # # Translators: +# Ana Juaristi , 2015 msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-10-10 09:48+0000\n" -"Last-Translator: Martin Trigaux\n" +"PO-Revision-Date: 2015-12-07 23:39+0000\n" +"Last-Translator: Ana Juaristi \n" "Language-Team: Spanish (http://www.transifex.com/odoo/odoo-9/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,7 +21,7 @@ msgstr "" #. module: base_action_rule #: model:ir.ui.view,arch_db:base_action_rule.view_base_action_rule_form msgid "Please choose the document type before setting the conditions." -msgstr "" +msgstr "Por favor, escoja el tipo de documento antes de establecer las condiciones." #. module: base_action_rule #: model:ir.ui.view,arch_db:base_action_rule.view_base_action_rule_form @@ -88,7 +89,7 @@ msgstr "Cancelada" #. module: base_action_rule #: model:ir.model.fields,help:base_action_rule.field_base_action_rule_lead_test_customer msgid "Check this box if this contact is a customer." -msgstr "" +msgstr "Click en esta casilla si el contacto es un cliente" #. module: base_action_rule #: model:ir.actions.act_window,help:base_action_rule.base_action_rule_act @@ -367,7 +368,7 @@ msgstr "Establecer responsable" #. module: base_action_rule #: model:ir.ui.view,arch_db:base_action_rule.view_base_action_rule_form msgid "Set selection based on a search filter:" -msgstr "" +msgstr "Establezca la selección basada en el filtro de búsqueda" #. module: base_action_rule #: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_lead_test_state diff --git a/addons/base_action_rule/i18n/es_EC.po b/addons/base_action_rule/i18n/es_EC.po index dbfc48c6623..f1c719bcca2 100644 --- a/addons/base_action_rule/i18n/es_EC.po +++ b/addons/base_action_rule/i18n/es_EC.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-10-14 04:16+0000\n" -"Last-Translator: Martin Trigaux\n" +"PO-Revision-Date: 2015-12-10 17:58+0000\n" +"Last-Translator: Rick Hunter \n" "Language-Team: Spanish (Ecuador) (http://www.transifex.com/odoo/odoo-9/language/es_EC/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -52,7 +52,7 @@ msgstr "Activo" #. module: base_action_rule #: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_act_followers msgid "Add Followers" -msgstr "" +msgstr "Añadir Seguidores" #. module: base_action_rule #: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act @@ -236,7 +236,7 @@ msgstr "" #. module: base_action_rule #: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_lead_test_customer msgid "Is a Customer" -msgstr "" +msgstr "¿Es un cliente?" #. module: base_action_rule #: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_lead_test_date_action_last diff --git a/addons/base_action_rule/i18n/pt_BR.po b/addons/base_action_rule/i18n/pt_BR.po index c1df0228fb8..76877f36902 100644 --- a/addons/base_action_rule/i18n/pt_BR.po +++ b/addons/base_action_rule/i18n/pt_BR.po @@ -4,14 +4,15 @@ # # Translators: # Gideoni Willian da Silva , 2015 +# Grazziano Duarte , 2015 # Mateus Cerqueira Lopes , 2015 msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-11-16 12:43+0000\n" -"Last-Translator: Gideoni Willian da Silva \n" +"PO-Revision-Date: 2015-12-10 01:10+0000\n" +"Last-Translator: Grazziano Duarte \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/odoo/odoo-9/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -238,7 +239,7 @@ msgstr "Nesta mesma tela,, selecione o menu \"Salvar o filtro atual\", em seguid #. module: base_action_rule #: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_lead_test_customer msgid "Is a Customer" -msgstr "" +msgstr "É um Cliente" #. module: base_action_rule #: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_lead_test_date_action_last diff --git a/addons/base_action_rule/i18n/zh_CN.po b/addons/base_action_rule/i18n/zh_CN.po index 59abfb85d58..53d16f023eb 100644 --- a/addons/base_action_rule/i18n/zh_CN.po +++ b/addons/base_action_rule/i18n/zh_CN.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-11-21 10:10+0000\n" -"Last-Translator: Gary Wei \n" +"PO-Revision-Date: 2015-12-11 07:20+0000\n" +"Last-Translator: jeffery chen fan \n" "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -119,12 +119,12 @@ msgstr "创建日期" #: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_create_uid #: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_lead_test_create_uid msgid "Created by" -msgstr "创建于" +msgstr "创建人" #. module: base_action_rule #: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_lead_test_create_date msgid "Created on" -msgstr "创建于" +msgstr "创建时间" #. module: base_action_rule #: selection:base.action.rule,trg_date_range_type:0 @@ -241,7 +241,7 @@ msgstr "是一个客户" #. module: base_action_rule #: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_lead_test_date_action_last msgid "Last Action" -msgstr "最近行动" +msgstr "最近动作" #. module: base_action_rule #: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule___last_update @@ -258,13 +258,13 @@ msgstr "最后运行" #: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_lead_test_write_uid #: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_write_uid msgid "Last Updated by" -msgstr "最后更新" +msgstr "最后更新人" #. module: base_action_rule #: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_lead_test_write_date #: model:ir.model.fields,field_description:base_action_rule.field_base_action_rule_write_date msgid "Last Updated on" -msgstr "最后更新" +msgstr "最后更新时间" #. module: base_action_rule #: selection:base.action.rule,trg_date_range_type:0 diff --git a/addons/base_gengo/i18n/af.po b/addons/base_gengo/i18n/af.po index c2b1686320c..06fd4799f23 100644 --- a/addons/base_gengo/i18n/af.po +++ b/addons/base_gengo/i18n/af.po @@ -232,7 +232,7 @@ msgstr "" #. module: base_gengo #: selection:ir.translation,gengo_translation:0 msgid "Standard" -msgstr "" +msgstr "Standaard" #. module: base_gengo #: model:ir.model.fields,field_description:base_gengo.field_base_gengo_translations_sync_type diff --git a/addons/base_geolocalize/i18n/pt_BR.po b/addons/base_geolocalize/i18n/pt_BR.po index a17cc4527d9..e4697962238 100644 --- a/addons/base_geolocalize/i18n/pt_BR.po +++ b/addons/base_geolocalize/i18n/pt_BR.po @@ -4,13 +4,14 @@ # # Translators: # Gideoni Willian da Silva , 2015 +# Grazziano Duarte , 2015 msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-07 14:40+0000\n" -"PO-Revision-Date: 2015-11-16 12:43+0000\n" -"Last-Translator: Gideoni Willian da Silva \n" +"PO-Revision-Date: 2015-12-09 23:50+0000\n" +"Last-Translator: Grazziano Duarte \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/odoo/odoo-9/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,12 +27,12 @@ msgstr " ( Em " #. module: base_geolocalize #: model:ir.ui.view,arch_db:base_geolocalize.view_crm_partner_geo_form msgid " : Lat : " -msgstr "" +msgstr " : Lat : " #. module: base_geolocalize #: model:ir.ui.view,arch_db:base_geolocalize.view_crm_partner_geo_form msgid " ; Long: " -msgstr "" +msgstr " ; Long: " #. module: base_geolocalize #: code:addons/base_geolocalize/models/res_partner.py:23 @@ -59,7 +60,7 @@ msgstr "Localização Geográfica" #. module: base_geolocalize #: model:ir.ui.view,arch_db:base_geolocalize.view_crm_partner_geo_form msgid "Geo Location" -msgstr "" +msgstr "Geo Locatização" #. module: base_geolocalize #: model:ir.model.fields,field_description:base_geolocalize.field_res_partner_partner_longitude diff --git a/addons/base_iban/i18n/pt_BR.po b/addons/base_iban/i18n/pt_BR.po index 56c451ebd1e..9ddc8110171 100644 --- a/addons/base_iban/i18n/pt_BR.po +++ b/addons/base_iban/i18n/pt_BR.po @@ -3,14 +3,15 @@ # * base_iban # # Translators: +# Grazziano Duarte , 2015 # Mateus Cerqueira Lopes , 2015 msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-07 14:40+0000\n" -"PO-Revision-Date: 2015-11-09 20:08+0000\n" -"Last-Translator: Mateus Cerqueira Lopes \n" +"PO-Revision-Date: 2015-12-09 23:53+0000\n" +"Last-Translator: Grazziano Duarte \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/odoo/odoo-9/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -27,13 +28,13 @@ msgstr "Contas Bancárias" #: code:addons/base_iban/base_iban.py:57 #, python-format msgid "Cannot compute the BBAN because the account number is not an IBAN." -msgstr "" +msgstr "Não é possível calcular o BBAN porque o número de conta não é um IBAN." #. module: base_iban #: code:addons/base_iban/base_iban.py:26 #, python-format msgid "No IBAN !" -msgstr "" +msgstr "Nenhum IBAN !" #. module: base_iban #: code:addons/base_iban/base_iban.py:34 @@ -41,7 +42,7 @@ msgstr "" msgid "" "The IBAN does not seem to be correct. You should have entered something like this %s\n" "Where B = National bank code, S = Branch code, C = Account No, k = Check digit" -msgstr "" +msgstr "O IBAN não parece estar correto. Você deveria ter entrado algo como isto %s\nOnde B = Código do banco nacional, S = Código de ramo, C = Número da conta, k = Dígito de verificador" #. module: base_iban #: code:addons/base_iban/base_iban.py:30 diff --git a/addons/base_import/i18n/base_import.pot b/addons/base_import/i18n/base_import.pot index 3c72d0d67f8..de9dc117fbe 100644 --- a/addons/base_import/i18n/base_import.pot +++ b/addons/base_import/i18n/base_import.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 9.0\n" +"Project-Id-Version: Odoo Server 9.0e\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-07 14:40+0000\n" -"PO-Revision-Date: 2015-09-07 14:40+0000\n" +"POT-Creation-Date: 2015-12-18 13:40+0000\n" +"PO-Revision-Date: 2015-12-18 13:40+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -31,7 +31,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:141 +#: code:addons/base_import/static/src/xml/import.xml:161 #, python-format msgid "According to your need, you should use \n" " one of these 3 ways to reference records in relations. \n" @@ -41,7 +41,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:214 +#: code:addons/base_import/static/src/xml/import.xml:234 #, python-format msgid "As an example, here is \n" " purchase.order_functional_error_line_cant_adpat.CSV \n" @@ -51,7 +51,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:279 +#: code:addons/base_import/static/src/xml/import.xml:299 #, python-format msgid "As an example, suppose you have a SQL database \n" " with two tables you want to import: companies and \n" @@ -63,7 +63,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:311 +#: code:addons/base_import/static/src/xml/import.xml:331 #, python-format msgid "As you can see in this file, Fabien and Laurence \n" " are working for the Bigees company (company_1) and \n" @@ -78,7 +78,18 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:86 +#: code:addons/base_import/static/src/xml/import.xml:87 +#, python-format +msgid "Because CSV files are used internally and in\n" +" multiple external processes, interoperability is a\n" +" significant issue. To limit incorrect\n" +" interpretation of data, they are strictly limited\n" +" to dates following" +msgstr "" + +#. module: base_import +#. openerp-web +#: code:addons/base_import/static/src/xml/import.xml:106 #, python-format msgid "By default the Import preview is set on commas as \n" " field separators and quotation marks as text \n" @@ -90,42 +101,42 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:20 +#: code:addons/base_import/static/src/xml/import.xml:21 #, python-format msgid "CSV Format Options…" msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:197 +#: code:addons/base_import/static/src/xml/import.xml:217 #, python-format msgid "CSV file for Manufacturer, Retailer" msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:161 +#: code:addons/base_import/static/src/xml/import.xml:181 #, python-format msgid "CSV file for Products" msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:160 +#: code:addons/base_import/static/src/xml/import.xml:180 #, python-format msgid "CSV file for categories" msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:230 +#: code:addons/base_import/static/src/xml/import.xml:250 #, python-format msgid "Can I import several times the same record?" msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:338 +#: code:addons/base_import/static/src/xml/import.xml:358 #, python-format msgid "Cancel" msgstr "" @@ -140,7 +151,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:139 +#: code:addons/base_import/static/src/xml/import.xml:159 #, python-format msgid "Country/Database \n" " ID: 21" @@ -148,7 +159,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:133 +#: code:addons/base_import/static/src/xml/import.xml:153 #, python-format msgid "Country/Database ID: the unique Odoo ID for a \n" " record, defined by the ID postgresql column" @@ -156,14 +167,14 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:140 +#: code:addons/base_import/static/src/xml/import.xml:160 #, python-format msgid "Country/External ID: base.be" msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:135 +#: code:addons/base_import/static/src/xml/import.xml:155 #, python-format msgid "Country/External ID: the ID of this record \n" " referenced in another application (or the .XML file \n" @@ -172,14 +183,14 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:139 +#: code:addons/base_import/static/src/xml/import.xml:159 #, python-format msgid "Country: Belgium" msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:132 +#: code:addons/base_import/static/src/xml/import.xml:152 #, python-format msgid "Country: the name or code of the country" msgstr "" @@ -222,7 +233,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:224 +#: code:addons/base_import/static/src/xml/import.xml:244 #, python-format msgid "Customers and their respective contacts" msgstr "" @@ -283,15 +294,15 @@ msgstr "" #. openerp-web #: code:addons/base_import/models.py:112 #: code:addons/base_import/models.py:146 -#: code:addons/base_import/static/src/xml/import.xml:68 -#: code:addons/base_import/static/src/xml/import.xml:73 +#: code:addons/base_import/static/src/xml/import.xml:69 +#: code:addons/base_import/static/src/xml/import.xml:74 #, python-format msgid "External ID" msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:305 +#: code:addons/base_import/static/src/xml/import.xml:325 #, python-format msgid "External ID,Name,Is a \n" " Company,Related Company/External ID" @@ -299,7 +310,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:293 +#: code:addons/base_import/static/src/xml/import.xml:313 #, python-format msgid "External ID,Name,Is a Company" msgstr "" @@ -321,7 +332,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:218 +#: code:addons/base_import/static/src/xml/import.xml:238 #, python-format msgid "File for some Quotations" msgstr "" @@ -333,21 +344,21 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:11 +#: code:addons/base_import/static/src/xml/import.xml:12 #, python-format msgid "File:" msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:364 +#: code:addons/base_import/static/src/xml/import.xml:384 #, python-format msgid "For CSV files, the issue could be an incorrect encoding." msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:129 +#: code:addons/base_import/static/src/xml/import.xml:149 #, python-format msgid "For example, to \n" " reference the country of a contact, Odoo proposes \n" @@ -356,7 +367,18 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:137 +#: code:addons/base_import/static/src/xml/import.xml:93 +#, python-format +msgid "For more familiar or\n" +" flexible formatting, use Excel files, date cells\n" +" are stored as genuine dates and the familiar and\n" +" locale-aware display of dates is independent from\n" +" the way it is stored." +msgstr "" + +#. module: base_import +#. openerp-web +#: code:addons/base_import/static/src/xml/import.xml:157 #, python-format msgid "For the country \n" " Belgium, you can use one of these 3 ways to import:" @@ -364,7 +386,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:59 +#: code:addons/base_import/static/src/xml/import.xml:60 #, python-format msgid "Frequently Asked Questions" msgstr "" @@ -385,14 +407,14 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:365 +#: code:addons/base_import/static/src/xml/import.xml:385 #, python-format msgid "Here is the start of the file we could not import:" msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:100 +#: code:addons/base_import/static/src/xml/import.xml:120 #, python-format msgid "How can I change the CSV file format options when \n" " saving in my spreadsheet application?" @@ -400,7 +422,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:188 +#: code:addons/base_import/static/src/xml/import.xml:208 #, python-format msgid "How can I import a many2many relationship field \n" " (e.g. a customer that has multiple tags)?" @@ -408,7 +430,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:203 +#: code:addons/base_import/static/src/xml/import.xml:223 #, python-format msgid "How can I import a one2many relationship (e.g. several \n" " Order Lines of a Sales Order)?" @@ -416,7 +438,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:262 +#: code:addons/base_import/static/src/xml/import.xml:282 #, python-format msgid "How to export/import different tables from an SQL \n" " application to Odoo?" @@ -424,7 +446,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:179 +#: code:addons/base_import/static/src/xml/import.xml:199 #, python-format msgid "However if you do not wish to change your \n" " configuration of product categories, we recommend you \n" @@ -434,8 +456,8 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:68 -#: code:addons/base_import/static/src/xml/import.xml:73 +#: code:addons/base_import/static/src/xml/import.xml:69 +#: code:addons/base_import/static/src/xml/import.xml:74 #: model:ir.model.fields,field_description:base_import.field_base_import_import_id #: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_id #: model:ir.model.fields,field_description:base_import.field_base_import_tests_models_char_noreadonly_id @@ -456,7 +478,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:170 +#: code:addons/base_import/static/src/xml/import.xml:190 #, python-format msgid "If for example you have two product categories \n" " with the child name \"Sellable\" (ie. \"Misc. \n" @@ -472,7 +494,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:50 +#: code:addons/base_import/static/src/xml/import.xml:51 #, python-format msgid "If the file contains\n" " the column names, Odoo can try auto-detecting the\n" @@ -482,14 +504,14 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:39 +#: code:addons/base_import/static/src/xml/import.xml:40 #, python-format msgid "If the model uses openchatter, history tracking will set up subscriptions and send notifications during the import, but lead to a slower import." msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:252 +#: code:addons/base_import/static/src/xml/import.xml:272 #, python-format msgid "If you do not set all fields in your CSV file, \n" " Odoo will assign the default value for every non \n" @@ -501,7 +523,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:104 +#: code:addons/base_import/static/src/xml/import.xml:124 #, python-format msgid "If you edit and save CSV files in speadsheet \n" " applications, your computer's regional settings will \n" @@ -514,7 +536,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:233 +#: code:addons/base_import/static/src/xml/import.xml:253 #, python-format msgid "If you import a file that contains one of the \n" " column \"External ID\" or \"Database ID\", records that \n" @@ -528,7 +550,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:266 +#: code:addons/base_import/static/src/xml/import.xml:286 #, python-format msgid "If you need to import data from different tables, \n" " you will have to recreate relations between records \n" @@ -540,7 +562,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:207 +#: code:addons/base_import/static/src/xml/import.xml:227 #, python-format msgid "If you want to import sales order having several \n" " order lines; for each order line, you need to reserve \n" @@ -553,8 +575,8 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:337 -#: code:addons/base_import/static/src/xml/import.xml:397 +#: code:addons/base_import/static/src/xml/import.xml:357 +#: code:addons/base_import/static/src/xml/import.xml:417 #, python-format msgid "Import" msgstr "" @@ -568,14 +590,14 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:363 +#: code:addons/base_import/static/src/xml/import.xml:383 #, python-format msgid "Import preview failed due to:" msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:65 +#: code:addons/base_import/static/src/xml/import.xml:66 #, python-format msgid "In order to re-create relationships between\n" " different records, you should use the unique\n" @@ -585,7 +607,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:304 +#: code:addons/base_import/static/src/xml/import.xml:324 #, python-format msgid "It will produce the following CSV file:" msgstr "" @@ -646,14 +668,14 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:36 +#: code:addons/base_import/static/src/xml/import.xml:37 #, python-format msgid "Map your data to Odoo" msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:110 +#: code:addons/base_import/static/src/xml/import.xml:130 #, python-format msgid "Microsoft Excel will allow \n" " you to modify only the encoding when saving \n" @@ -673,7 +695,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:62 +#: code:addons/base_import/static/src/xml/import.xml:63 #, python-format msgid "Need to import data from an other application?" msgstr "" @@ -687,7 +709,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:91 +#: code:addons/base_import/static/src/xml/import.xml:111 #, python-format msgid "Note that if your CSV file \n" " has a tabulation as separator, Odoo will not \n" @@ -703,7 +725,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:221 +#: code:addons/base_import/static/src/xml/import.xml:241 #, python-format msgid "Purchase orders with their respective purchase order lines" msgstr "" @@ -724,14 +746,14 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:16 +#: code:addons/base_import/static/src/xml/import.xml:17 #, python-format msgid "Reload data to check changes." msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:8 +#: code:addons/base_import/static/src/xml/import.xml:9 #, python-format msgid "Select the file to import. If you need a sample importable file, you\n" " can use the export tool to generate one." @@ -758,7 +780,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:122 +#: code:addons/base_import/static/src/xml/import.xml:142 #, python-format msgid "Some fields define a relationship with another \n" " object. For example, the country of a contact is a \n" @@ -786,14 +808,14 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:73 +#: code:addons/base_import/static/src/xml/import.xml:74 #, python-format msgid "The" msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:48 +#: code:addons/base_import/static/src/xml/import.xml:49 #, python-format msgid "The first row of the\n" " file contains the label of the column" @@ -801,7 +823,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:222 +#: code:addons/base_import/static/src/xml/import.xml:242 #, python-format msgid "The following CSV file shows how to import \n" " customers and their respective contacts" @@ -809,7 +831,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:219 +#: code:addons/base_import/static/src/xml/import.xml:239 #, python-format msgid "The following CSV file shows how to import purchase \n" " orders with their respective purchase order lines:" @@ -817,7 +839,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:192 +#: code:addons/base_import/static/src/xml/import.xml:212 #, python-format msgid "The tags should be separated by a comma without any \n" " spacing. For example, if you want your customer to be \n" @@ -828,7 +850,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:320 +#: code:addons/base_import/static/src/xml/import.xml:340 #, python-format msgid "The two files produced are ready to be imported in \n" " Odoo without any modifications. After having \n" @@ -840,14 +862,14 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:292 +#: code:addons/base_import/static/src/xml/import.xml:312 #, python-format msgid "This SQL command will create the following CSV file:" msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:240 +#: code:addons/base_import/static/src/xml/import.xml:260 #, python-format msgid "This feature \n" " allows you to use the Import/Export tool of Odoo to \n" @@ -857,7 +879,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:297 +#: code:addons/base_import/static/src/xml/import.xml:317 #, python-format msgid "To create the CSV file for persons, linked to \n" " companies, we will use the following SQL command in \n" @@ -866,7 +888,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:271 +#: code:addons/base_import/static/src/xml/import.xml:291 #, python-format msgid "To manage relations between tables, \n" " you can use the \"External ID\" facilities of Odoo. \n" @@ -880,7 +902,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:42 +#: code:addons/base_import/static/src/xml/import.xml:43 #, python-format msgid "Track history during import" msgstr "" @@ -899,7 +921,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:146 +#: code:addons/base_import/static/src/xml/import.xml:166 #, python-format msgid "Use \n" " Country/Database ID: You should rarely use this \n" @@ -911,7 +933,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:151 +#: code:addons/base_import/static/src/xml/import.xml:171 #, python-format msgid "Use \n" " Country/External ID: Use External ID when you import \n" @@ -920,7 +942,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:144 +#: code:addons/base_import/static/src/xml/import.xml:164 #, python-format msgid "Use Country: This is \n" " the easiest way when your data come from CSV files \n" @@ -929,14 +951,14 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:335 +#: code:addons/base_import/static/src/xml/import.xml:355 #, python-format msgid "Validate" msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:286 +#: code:addons/base_import/static/src/xml/import.xml:306 #, python-format msgid "We will first export all companies and their \n" " \"External ID\". In PSQL, write the following command:" @@ -944,22 +966,22 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:166 +#: code:addons/base_import/static/src/xml/import.xml:186 #, python-format msgid "What can I do if I have multiple matches for a field?" msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:82 +#: code:addons/base_import/static/src/xml/import.xml:102 #, python-format -msgid "What can I do when the Import preview table isn't \n" +msgid "What can I do when the Import preview table isn't\n" " displayed correctly?" msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:248 +#: code:addons/base_import/static/src/xml/import.xml:268 #, python-format msgid "What happens if I do not provide a value for a \n" " specific field?" @@ -967,7 +989,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:118 +#: code:addons/base_import/static/src/xml/import.xml:138 #, python-format msgid "What's the difference between Database ID and \n" " External ID?" @@ -975,7 +997,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:154 +#: code:addons/base_import/static/src/xml/import.xml:174 #, python-format msgid "When you use External IDs, you can import CSV files \n" " with the \"External ID\" column to define the External \n" @@ -987,14 +1009,21 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:71 +#: code:addons/base_import/static/src/xml/import.xml:83 +#, python-format +msgid "Why don't CSV file use my date format?" +msgstr "" + +#. module: base_import +#. openerp-web +#: code:addons/base_import/static/src/xml/import.xml:72 #, python-format msgid "XXX/External ID" msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:71 +#: code:addons/base_import/static/src/xml/import.xml:72 #, python-format msgid "XXX/ID" msgstr "" @@ -1091,7 +1120,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:68 +#: code:addons/base_import/static/src/xml/import.xml:69 #, python-format msgid "column in Odoo. When you\n" " import an other record that links to the first\n" @@ -1100,28 +1129,28 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:294 +#: code:addons/base_import/static/src/xml/import.xml:314 #, python-format msgid "company_1,Bigees,True" msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:295 +#: code:addons/base_import/static/src/xml/import.xml:315 #, python-format msgid "company_2,Organi,True" msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:296 +#: code:addons/base_import/static/src/xml/import.xml:316 #, python-format msgid "company_3,Boum,True" msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:288 +#: code:addons/base_import/static/src/xml/import.xml:308 #, python-format msgid "copy \n" " (select 'company_'||id as \"External ID\",company_name \n" @@ -1131,7 +1160,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:299 +#: code:addons/base_import/static/src/xml/import.xml:319 #, python-format msgid "copy (select \n" " 'person_'||id as \"External ID\",person_name as \n" @@ -1142,42 +1171,50 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:284 +#: code:addons/base_import/static/src/xml/import.xml:304 #, python-format msgid "dump of such a PostgreSQL database" msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:307 +#: code:addons/base_import/static/src/xml/import.xml:327 #, python-format msgid "person_1,Fabien,False,company_1" msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:308 +#: code:addons/base_import/static/src/xml/import.xml:328 #, python-format msgid "person_2,Laurence,False,company_1" msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:309 +#: code:addons/base_import/static/src/xml/import.xml:329 #, python-format msgid "person_3,Eric,False,company_2" msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:310 +#: code:addons/base_import/static/src/xml/import.xml:330 #, python-format msgid "person_4,Ramsy,False,company_3" msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:71 +#: code:addons/base_import/static/src/xml/import.xml:92 +#, python-format +msgid "the\n" +" ISO 8601 format" +msgstr "" + +#. module: base_import +#. openerp-web +#: code:addons/base_import/static/src/xml/import.xml:72 #, python-format msgid "to the original unique identifier." msgstr "" @@ -1201,7 +1238,7 @@ msgstr "" #. module: base_import #. openerp-web -#: code:addons/base_import/static/src/xml/import.xml:73 +#: code:addons/base_import/static/src/xml/import.xml:74 #, python-format msgid "will also be used to update the original\n" " import if you need to re-import modified data\n" diff --git a/addons/base_import/i18n/el.po b/addons/base_import/i18n/el.po index e98071d2b77..f033674a4d9 100644 --- a/addons/base_import/i18n/el.po +++ b/addons/base_import/i18n/el.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-07 14:40+0000\n" -"PO-Revision-Date: 2015-12-05 19:26+0000\n" +"PO-Revision-Date: 2015-12-09 13:35+0000\n" "Last-Translator: Goutoudis Kostas \n" "Language-Team: Greek (http://www.transifex.com/odoo/odoo-9/language/el/)\n" "MIME-Version: 1.0\n" @@ -759,7 +759,7 @@ msgstr "Σχετιζόμενα Πεδία" #: code:addons/base_import/static/src/xml/import.xml:16 #, python-format msgid "Reload data to check changes." -msgstr "Επαναφορτώστε τα δεδομένα για έλεγχο των αλλαγών." +msgstr "Ανανέωση δεδομένων για έλεγχο των αλλαγών." #. module: base_import #. openerp-web diff --git a/addons/base_import/i18n/zh_CN.po b/addons/base_import/i18n/zh_CN.po index 6ae08cc4eee..675148bec59 100644 --- a/addons/base_import/i18n/zh_CN.po +++ b/addons/base_import/i18n/zh_CN.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-07 14:40+0000\n" -"PO-Revision-Date: 2015-10-22 08:04+0000\n" -"Last-Translator: liu \n" +"PO-Revision-Date: 2015-12-09 14:14+0000\n" +"Last-Translator: jeffery chen fan \n" "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -919,7 +919,7 @@ msgid "" " objects, so it's a good practice to prefix this \n" " \"External ID\" with the name of the application or \n" " table. (like 'company_1', 'person_1' instead of '1')" -msgstr "为管理表间关系,您可以使用Odoo的\"外部ID\"机制.\n一个记录的\"外部ID\"另一个应用里面记录的唯一值.\n所有对象记录的\"外部ID\"必须是唯一的,一个好的做法是在\"外部ID\"\n加上应用或者表的名字.(例如'company_1', 'person_1'，不要仅仅是'1')" +msgstr "为管理表间关系,您可以使用Odoo的\"外部ID\"机制.\n一个记录的\"外部ID\"另一个应用里面记录的唯一值.\n所有对象记录的\"外部ID\"必须是唯一的,一个好的做法是在\"外部ID\"\n加上应用或者表的名称.(例如'company_1', 'person_1'，不要仅仅是'1')" #. module: base_import #. openerp-web diff --git a/addons/base_import/static/src/xml/import.xml b/addons/base_import/static/src/xml/import.xml index 7723f7b5266..f173263e187 100644 --- a/addons/base_import/static/src/xml/import.xml +++ b/addons/base_import/static/src/xml/import.xml @@ -81,7 +81,26 @@
- What can I do when the Import preview table isn't + Why don't CSV file use my date format? +
+
+

Because CSV files are used internally and in + multiple external processes, interoperability is a + significant issue. To limit incorrect + interpretation of data, they are strictly limited + to dates following the + ISO 8601 format

.

For more familiar or + flexible formatting, use Excel files, date cells + are stored as genuine dates and the familiar and + locale-aware display of dates is independent from + the way it is stored.

+
+
+ +
+
+ What can I do when the Import preview table isn't displayed correctly?

By default the Import preview is set on commas as diff --git a/addons/base_import_module/i18n/pt_BR.po b/addons/base_import_module/i18n/pt_BR.po index 8265712d123..f9cc816c8d6 100644 --- a/addons/base_import_module/i18n/pt_BR.po +++ b/addons/base_import_module/i18n/pt_BR.po @@ -3,13 +3,14 @@ # * base_import_module # # Translators: +# Grazziano Duarte , 2015 msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-07 14:40+0000\n" -"PO-Revision-Date: 2015-10-11 23:09+0000\n" -"Last-Translator: Martin Trigaux\n" +"PO-Revision-Date: 2015-12-10 01:10+0000\n" +"Last-Translator: Grazziano Duarte \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/odoo/odoo-9/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -73,7 +74,7 @@ msgstr "ID" #. module: base_import_module #: model:ir.ui.view,arch_db:base_import_module.view_base_module_import msgid "Import App" -msgstr "" +msgstr "Importar App" #. module: base_import_module #: model:ir.actions.act_window,name:base_import_module.action_view_base_module_import @@ -96,7 +97,7 @@ msgstr "Importar módulo" #. module: base_import_module #: model:ir.model.fields,field_description:base_import_module.field_ir_module_module_imported msgid "Imported Module" -msgstr "" +msgstr "Importar Módulo" #. module: base_import_module #: model:ir.model.fields,field_description:base_import_module.field_base_import_module___last_update diff --git a/addons/base_setup/i18n/pt_BR.po b/addons/base_setup/i18n/pt_BR.po index e29ae7c6477..d874f8f6237 100644 --- a/addons/base_setup/i18n/pt_BR.po +++ b/addons/base_setup/i18n/pt_BR.po @@ -3,13 +3,15 @@ # * base_setup # # Translators: +# Grazziano Duarte , 2015 +# Mateus Cerqueira Lopes , 2015 msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-29 10:25+0000\n" -"PO-Revision-Date: 2015-10-11 23:08+0000\n" -"Last-Translator: Martin Trigaux\n" +"PO-Revision-Date: 2015-12-10 01:10+0000\n" +"Last-Translator: Grazziano Duarte \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/odoo/odoo-9/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -35,7 +37,7 @@ msgstr "Permite que usuários sincronizem suas agendas com a agenda do Google" #. module: base_setup #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_base_import msgid "Allow users to import data from CSV/XLS/XLSX/ODS files" -msgstr "" +msgstr "Permite aos usuários importar dados de arquivos CSV/XLS/XLSX/ODS" #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.view_general_configuration @@ -140,7 +142,7 @@ msgstr "Google Drive" #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.view_general_configuration msgid "Google Integration" -msgstr "" +msgstr "Integração com Google" #. module: base_setup #: selection:base.setup.terminology,partner:0 @@ -167,7 +169,7 @@ msgstr "Importar / Exportar" #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.view_general_configuration msgid "Inter company" -msgstr "" +msgstr "Multi-empresa" #. module: base_setup #: model:ir.model.fields,field_description:base_setup.field_base_config_settings___last_update @@ -193,7 +195,7 @@ msgstr "Última atualização em" #. module: base_setup #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_inter_company_rules msgid "Manage Inter Company" -msgstr "" +msgstr "Gerenciar Multi-empresa" #. module: base_setup #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_group_light_multi_company @@ -240,7 +242,7 @@ msgstr "Compartilhar ou incorporar qualquer tela do Odoo." #. module: base_setup #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_company_share_partner msgid "Share partners to all companies" -msgstr "" +msgstr "Compartilhar parceiros para todas as empresas" #. module: base_setup #: model:ir.model.fields,help:base_setup.field_base_config_settings_company_share_partner @@ -248,12 +250,12 @@ msgid "" "Share your partners to all companies defined in your instance.\n" " * Checked : Partners are visible for every companies, even if a company is defined on the partner.\n" " * Unchecked : Each company can see only its partner (partners where company is defined). Partners not related to a company are visible for all companies." -msgstr "" +msgstr "Compartilhe seus parceiros a todas as empresas definidas na sua instância.\n* Marcado: Parceiros são visíveis para todas as empresas, mesmo se uma empresa está definida no parceiro.\n* Desmarcado: Cada empresa pode ver apenas seus parceiros (parceiros onde empresa está definida). Os parceiros não relacionados a uma empresa são visíveis para todas as empresas." #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.view_general_configuration msgid "Shared ressources" -msgstr "" +msgstr "Recursos compartilhados" #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.base_setup_terminology_form @@ -280,7 +282,7 @@ msgstr "Isto instala o módulo google_docs." msgid "" "This installs the module inter_company_rules.\n" " Configure company rules to automatically create SO/PO when one of your company sells/buys to another of your company." -msgstr "" +msgstr "Isso instala o módulo inter_company_rules.\nConfigure as regras da empresa para criar automaticamente SO/PO quando uma de suas empresa vende/compra para outra de suas empresas." #. module: base_setup #: model:ir.actions.act_window,name:base_setup.action_partner_terminology_config_form @@ -290,7 +292,7 @@ msgstr "Use uma outra palavra para dizer \"Cliente\"" #. module: base_setup #: model:ir.model.fields,field_description:base_setup.field_base_config_settings_module_auth_oauth msgid "Use external authentication providers, sign in with Google..." -msgstr "" +msgstr "Usar provedores de autenticação externos, entrar com Google..." #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.view_general_configuration @@ -307,7 +309,7 @@ msgstr "Quando você enviar um documento para um cliente\n            msgid "" "Work in multi-company environments, with appropriate security access between" " companies." -msgstr "" +msgstr "Trabalhar em ambientes multi-empresa, com acessos de segurança adequados entre empresas." #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.base_setup_terminology_form diff --git a/addons/base_setup/i18n/uk.po b/addons/base_setup/i18n/uk.po index fc08f996c63..b62ca3312c3 100644 --- a/addons/base_setup/i18n/uk.po +++ b/addons/base_setup/i18n/uk.po @@ -3,12 +3,13 @@ # * base_setup # # Translators: +# Bogdan, 2015 msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-29 10:25+0000\n" -"PO-Revision-Date: 2015-11-27 14:10+0000\n" +"PO-Revision-Date: 2015-12-09 12:34+0000\n" "Last-Translator: Bogdan\n" "Language-Team: Ukrainian (http://www.transifex.com/odoo/odoo-9/language/uk/)\n" "MIME-Version: 1.0\n" @@ -135,7 +136,7 @@ msgstr "" #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.view_general_configuration msgid "Google Drive" -msgstr "Google Drive" +msgstr "Google диск" #. module: base_setup #: model:ir.ui.view,arch_db:base_setup.view_general_configuration diff --git a/addons/base_vat/i18n/ca.po b/addons/base_vat/i18n/ca.po index ecd97e3e779..69dd9113dd8 100644 --- a/addons/base_vat/i18n/ca.po +++ b/addons/base_vat/i18n/ca.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-07 14:40+0000\n" -"PO-Revision-Date: 2015-12-05 15:08+0000\n" +"PO-Revision-Date: 2015-12-08 21:35+0000\n" "Last-Translator: Marc Tormo i Bochaca \n" "Language-Team: Catalan (http://www.transifex.com/odoo/odoo-9/language/ca/)\n" "MIME-Version: 1.0\n" @@ -34,7 +34,7 @@ msgstr "" #: code:addons/base_vat/base_vat.py:111 #, python-format msgid "Importing VAT Number [%s] is not valid !" -msgstr "" +msgstr "Importació del nombre [%s] d'IVA no és vàlid !" #. module: base_vat #: model:ir.model,name:base_vat.model_res_partner @@ -47,7 +47,7 @@ msgstr "Empresa" msgid "" "The VAT number [%s] for partner [%s] does not seem to be valid. \n" "Note: the expected format is %s" -msgstr "" +msgstr "El nombre [%s] d'IVA per al soci [%s] no sembla ser vàlid.\nNota: el format esperat és %s" #. module: base_vat #: code:addons/base_vat/base_vat.py:127 diff --git a/addons/board/i18n/pt_BR.po b/addons/board/i18n/pt_BR.po index 59682118801..917e9ee4c05 100644 --- a/addons/board/i18n/pt_BR.po +++ b/addons/board/i18n/pt_BR.po @@ -3,13 +3,15 @@ # * board # # Translators: +# Grazziano Duarte , 2015 +# Mateus Cerqueira Lopes , 2015 msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-07 14:40+0000\n" -"PO-Revision-Date: 2015-09-12 17:44+0000\n" -"Last-Translator: Martin Trigaux\n" +"PO-Revision-Date: 2015-12-10 01:10+0000\n" +"Last-Translator: Grazziano Duarte \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/odoo/odoo-9/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,12 +31,12 @@ msgstr " " #: code:addons/board/static/src/js/dashboard.js:406 #, python-format msgid "'%s' added to dashboard" -msgstr "" +msgstr "'%s' adicionado ao painel" #. module: board #: model:ir.actions.act_window,help:board.open_board_my_dash_action msgid "Your personal dashboard is empty." -msgstr "" +msgstr "Seu painel pessoal esta vazio." #. module: board #. openerp-web @@ -48,7 +50,7 @@ msgstr "Adicionar" #: code:addons/board/static/src/xml/board.xml:64 #, python-format msgid "Add to my Dashboard" -msgstr "" +msgstr "Adicionar ao Meu Painel" #. module: board #. openerp-web @@ -135,7 +137,7 @@ msgstr "Criado em" #: model:ir.model.fields,field_description:board.field_board_board_display_name #: model:ir.model.fields,field_description:board.field_board_create_display_name msgid "Display Name" -msgstr "" +msgstr "Nome de Exibição" #. module: board #. openerp-web @@ -184,11 +186,11 @@ msgid "" "To add your first report into this dashboard, go to any\n" " menu, switch to list or graph view, and click 'Add to\n" " Dashboard' in the extended search options." -msgstr "" +msgstr "Para adicionar o seu primeiro relatório no dashboard, vá a qualquer\nmenu, mude para lista ou vista de gráfico e clique em 'Adicionar ao\nDashboard' nas opções de pesquisa avançada." #. module: board #: model:ir.actions.act_window,help:board.open_board_my_dash_action msgid "" "You can filter and group data before inserting into the\n" " dashboard using the search options." -msgstr "" +msgstr "Você pode filtrar e agrupar dados antes de inserir no\ndashboard utilizando as opções de pesquisa." diff --git a/addons/board/i18n/zh_CN.po b/addons/board/i18n/zh_CN.po index f64cea70a69..80535f4e3cc 100644 --- a/addons/board/i18n/zh_CN.po +++ b/addons/board/i18n/zh_CN.po @@ -4,13 +4,14 @@ # # Translators: # fausthuang, 2015 +# fausthuang, 2015 msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-07 14:40+0000\n" -"PO-Revision-Date: 2015-11-13 03:38+0000\n" -"Last-Translator: fausthuang\n" +"PO-Revision-Date: 2015-12-11 06:30+0000\n" +"Last-Translator: Gary Wei \n" "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,12 +31,12 @@ msgstr " " #: code:addons/board/static/src/js/dashboard.js:406 #, python-format msgid "'%s' added to dashboard" -msgstr "'%s' 添加到面板" +msgstr "'%s' 添加到仪表板" #. module: board #: model:ir.actions.act_window,help:board.open_board_my_dash_action msgid "Your personal dashboard is empty." -msgstr "您的个人仪表盘是空的." +msgstr "您的个人仪表板是空的." #. module: board #. openerp-web @@ -56,7 +57,7 @@ msgstr "添加到我的仪表板" #: code:addons/board/static/src/js/dashboard.js:139 #, python-format msgid "Are you sure you want to remove this item ?" -msgstr "您确定要移除此条目吗？" +msgstr "您确定要移除此分录吗？" #. module: board #: model:ir.model,name:board.model_board_board @@ -125,12 +126,12 @@ msgstr "创建新的仪表板" #. module: board #: model:ir.model.fields,field_description:board.field_board_create_create_uid msgid "Created by" -msgstr "创建于" +msgstr "创建人" #. module: board #: model:ir.model.fields,field_description:board.field_board_create_create_date msgid "Created on" -msgstr "创建于" +msgstr "创建时间" #. module: board #: model:ir.model.fields,field_description:board.field_board_board_display_name @@ -160,12 +161,12 @@ msgstr "最后修改日" #. module: board #: model:ir.model.fields,field_description:board.field_board_create_write_uid msgid "Last Updated by" -msgstr "最后更新" +msgstr "最后更新人" #. module: board #: model:ir.model.fields,field_description:board.field_board_create_write_date msgid "Last Updated on" -msgstr "最后更新" +msgstr "最后更新时间" #. module: board #: model:ir.actions.act_window,name:board.open_board_my_dash_action @@ -192,4 +193,4 @@ msgstr "要添加第一个报表到这个仪表板，去任意\n菜单，切换 msgid "" "You can filter and group data before inserting into the\n" " dashboard using the search options." -msgstr "您可以使用搜索选项过滤或分组数据在添加到\n仪表盘之前。" +msgstr "您可以使用搜索选项过滤或分组数据在添加到\n仪表板之前。" diff --git a/addons/board/static/src/js/dashboard.js b/addons/board/static/src/js/dashboard.js index 6ad67d433fd..c465222519b 100644 --- a/addons/board/static/src/js/dashboard.js +++ b/addons/board/static/src/js/dashboard.js @@ -256,8 +256,8 @@ var DashBoard = form_common.FormWidget.extend({ var kanban = am.inner_widget.views.kanban; if (kanban) { kanban.created.done(function() { - kanban.controller.open_record = function(id, editable) { - new_form_action(id, editable); + kanban.controller.open_record = function(event, editable) { + new_form_action(event.data.id, editable); }; }); } diff --git a/addons/bus/__openerp__.py b/addons/bus/__openerp__.py index 2489f6a38f9..2a7185fdaf7 100644 --- a/addons/bus/__openerp__.py +++ b/addons/bus/__openerp__.py @@ -6,6 +6,7 @@ 'description': "Instant Messaging Bus allow you to send messages to users, in live.", 'depends': ['base', 'web'], 'data': [ + 'bus_presence_cron.xml', 'views/bus.xml', 'security/ir.model.access.csv', ], diff --git a/addons/bus/bus_presence_cron.xml b/addons/bus/bus_presence_cron.xml new file mode 100644 index 00000000000..4ac5d5ed199 --- /dev/null +++ b/addons/bus/bus_presence_cron.xml @@ -0,0 +1,13 @@ + + + + Check User Disconnections + 5 + minutes + -1 + + + + + + diff --git a/addons/bus/controllers/main.py b/addons/bus/controllers/main.py index 050eb684625..d755cabe54f 100644 --- a/addons/bus/controllers/main.py +++ b/addons/bus/controllers/main.py @@ -19,6 +19,7 @@ class BusController(openerp.http.Controller): # override to add channels def _poll(self, dbname, channels, last, options): + channels.append((request.db, 'bus.presence')) # update the user presence if request.session.uid and 'im_presence' in options: request.env['bus.presence'].update(options.get('im_presence')) diff --git a/addons/bus/i18n/el.po b/addons/bus/i18n/el.po index 39d91350b78..7018806c751 100644 --- a/addons/bus/i18n/el.po +++ b/addons/bus/i18n/el.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-07 14:40+0000\n" -"PO-Revision-Date: 2015-12-05 22:56+0000\n" +"PO-Revision-Date: 2015-12-09 13:01+0000\n" "Last-Translator: Goutoudis Kostas \n" "Language-Team: Greek (http://www.transifex.com/odoo/odoo-9/language/el/)\n" "MIME-Version: 1.0\n" @@ -26,7 +26,7 @@ msgstr "Ένας χρήστης μπορεί να έχει μόνο μία κα #. module: bus #: selection:bus.presence,status:0 msgid "Away" -msgstr "" +msgstr "Εκτός" #. module: bus #: model:ir.model.fields,field_description:bus.field_bus_bus_channel @@ -77,7 +77,7 @@ msgstr "Τελευταία αλλαγή στις" #. module: bus #: model:ir.model.fields,field_description:bus.field_bus_presence_last_poll msgid "Last Poll" -msgstr "" +msgstr "Τελευταία Δημοσκόπηση" #. module: bus #: model:ir.model.fields,field_description:bus.field_bus_presence_last_presence @@ -104,12 +104,12 @@ msgstr "Μήνυμα" #. module: bus #: selection:bus.presence,status:0 msgid "Offline" -msgstr "" +msgstr "Offline" #. module: bus #: selection:bus.presence,status:0 msgid "Online" -msgstr "" +msgstr "Online" #. module: bus #: model:ir.model,name:bus.model_res_partner diff --git a/addons/bus/i18n/zh_CN.po b/addons/bus/i18n/zh_CN.po index 7f66bad1647..0e90d9550e5 100644 --- a/addons/bus/i18n/zh_CN.po +++ b/addons/bus/i18n/zh_CN.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-07 14:40+0000\n" -"PO-Revision-Date: 2015-11-13 06:54+0000\n" +"PO-Revision-Date: 2015-12-11 02:54+0000\n" "Last-Translator: Gary Wei \n" "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -41,12 +41,12 @@ msgstr "创建日期" #: model:ir.model.fields,field_description:bus.field_bus_bus_create_uid #: model:ir.model.fields,field_description:bus.field_bus_presence_create_uid msgid "Created by" -msgstr "创建于" +msgstr "创建人" #. module: bus #: model:ir.model.fields,field_description:bus.field_bus_presence_create_date msgid "Created on" -msgstr "创建于" +msgstr "创建时间" #. module: bus #: model:ir.model.fields,field_description:bus.field_bus_bus_display_name @@ -87,13 +87,13 @@ msgstr "最后登录" #: model:ir.model.fields,field_description:bus.field_bus_bus_write_uid #: model:ir.model.fields,field_description:bus.field_bus_presence_write_uid msgid "Last Updated by" -msgstr "最后更新" +msgstr "最后更新人" #. module: bus #: model:ir.model.fields,field_description:bus.field_bus_bus_write_date #: model:ir.model.fields,field_description:bus.field_bus_presence_write_date msgid "Last Updated on" -msgstr "最后更新" +msgstr "最后更新时间" #. module: bus #: model:ir.model.fields,field_description:bus.field_bus_bus_message @@ -103,7 +103,7 @@ msgstr "消息" #. module: bus #: selection:bus.presence,status:0 msgid "Offline" -msgstr "断网" +msgstr "离线" #. module: bus #: selection:bus.presence,status:0 diff --git a/addons/bus/models/bus_presence.py b/addons/bus/models/bus_presence.py index 445e9491a75..70aa9ef9726 100644 --- a/addons/bus/models/bus_presence.py +++ b/addons/bus/models/bus_presence.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- import datetime -import random import time from openerp import api, fields, models @@ -11,6 +10,8 @@ from openerp.addons.bus.models.bus import TIMEOUT DISCONNECTION_TIMER = TIMEOUT + 5 AWAY_TIMER = 600 # 10 minutes +DISCONNECTIONS_CHECK_PERIOD = datetime.timedelta(minutes=1) # check for user disconnections every minute +last_disconnections_check = datetime.datetime.utcnow() class BusPresence(models.Model): @@ -34,7 +35,7 @@ class BusPresence(models.Model): @api.model def update(self, user_presence=True): """ Register the given presence of the current user, and trigger a im_status change if necessary. - The status will not be written or sent if not necessary. + The status will not be sent if not necessary. :param user_presence : True, if the user (self._uid) is still detected using its browser. :type user_presence : boolean """ @@ -51,37 +52,31 @@ class BusPresence(models.Model): values['user_id'] = self._uid self.create(values) else: # write the user presence if necessary - if user_presence: - values['last_presence'] = time.strftime(DEFAULT_SERVER_DATETIME_FORMAT) - values['status'] = 'online' - else: - threshold = datetime.datetime.now() - datetime.timedelta(seconds=AWAY_TIMER) - if datetime.datetime.strptime(presence.last_presence, DEFAULT_SERVER_DATETIME_FORMAT) < threshold: - values['status'] = 'away' + values['status'] = 'online' if user_presence else 'away' send_notification = presence.status != values['status'] - # write only if the last_poll is passed TIMEOUT, or if the status has changed - delta = datetime.datetime.utcnow() - datetime.datetime.strptime(presence.last_poll, DEFAULT_SERVER_DATETIME_FORMAT) - if delta > datetime.timedelta(seconds=TIMEOUT) or send_notification: - # Hide transaction serialization errors, which can be ignored, the presence update is not essential - with tools.mute_logger('openerp.sql_db'): - presence.write(values) + # Hide transaction serialization errors, which can be ignored, the presence update is not essential + with tools.mute_logger('openerp.sql_db'): + presence.write(values) # avoid TransactionRollbackError self.env.cr.commit() # TODO : check if still necessary # notify if the status has changed if send_notification: # TODO : add user_id to the channel tuple to allow using user_watch in controller presence - self.env['bus.bus'].sendone((self._cr.dbname, 'bus.presence'), {'id': self._uid, 'im_status': values['status']}) - # gc : disconnect the users having a too old last_poll. 1 on 100 chance to do it. - if random.random() < 0.01: - self.check_users_disconnection() + self.env['bus.bus'].sendone((self._cr.dbname, 'bus.presence'), {'id': self.env.user.partner_id.id, 'im_status': values['status']}) + # check for disconnected users + self.check_users_disconnection() return True @api.model def check_users_disconnection(self): """ Disconnect the users having a too old last_poll """ - limit_date = (datetime.datetime.utcnow() - datetime.timedelta(0, DISCONNECTION_TIMER)).strftime(DEFAULT_SERVER_DATETIME_FORMAT) - presences = self.search([('last_poll', '<', limit_date), ('status', '!=', 'offline')]) - presences.write({'status': 'offline'}) + global last_disconnections_check + now = datetime.datetime.utcnow() notifications = [] - for presence in presences: - notifications.append([(self._cr.dbname, 'bus.presence'), {'id': presence.user_id.id, 'im_status': presence.status}]) + if (now - DISCONNECTIONS_CHECK_PERIOD) > last_disconnections_check: + last_disconnections_check = now + limit_date = (now - datetime.timedelta(0, DISCONNECTION_TIMER)).strftime(DEFAULT_SERVER_DATETIME_FORMAT) + presences = self.search([('last_poll', '<', limit_date), ('status', '!=', 'offline')]) + presences.write({'status': 'offline'}) + for presence in presences: + notifications.append([(self._cr.dbname, 'bus.presence'), {'id': presence.user_id.partner_id.id, 'im_status': presence.status}]) self.env['bus.bus'].sendmany(notifications) diff --git a/addons/bus/static/src/js/bus.js b/addons/bus/static/src/js/bus.js index 9373b7c7b1c..29540b36cdf 100644 --- a/addons/bus/static/src/js/bus.js +++ b/addons/bus/static/src/js/bus.js @@ -7,11 +7,15 @@ var Widget = require('web.Widget'); var bus = {}; bus.ERROR_DELAY = 10000; +bus.AWAY_TIMEOUT = 300000; // 5 minutes bus.Bus = Widget.extend({ init: function(){ + var self = this; this._super(); - this.options = {}; + this.options = { + im_presence: true, + }; this.activated = false; this.channels = []; this.last = 0; @@ -21,9 +25,14 @@ bus.Bus = Widget.extend({ // bus presence this.set("window_focus", true); this.on("change:window_focus", this, function () { - this.options.im_presence = this.get("window_focus"); + clearTimeout(self.away_timeout); if (this.get("window_focus")) { + this.options.im_presence = true; this.trigger('window_focus', this.is_master); + } else { + this.away_timeout = setTimeout(function () { + self.options.im_presence = false; + }, bus.AWAY_TIMEOUT); } }); $(window).on("focus", _.bind(this.window_focus, this)); @@ -120,13 +129,6 @@ var CrossTabBus = bus.Bus.extend({ } on("storage", this.on_storage.bind(this)); - if (this.is_master) { - setItem('bus.channels', this.channels); - setItem('bus.options', this.options); - } else { - this.channels = getItem('bus.channels', this.channels); - this.options = getItem('bus.options', this.options); - } }, start_polling: function(){ var self = this; @@ -139,6 +141,13 @@ var CrossTabBus = bus.Bus.extend({ self.is_master = false; self.stop_polling(); }); + if (this.is_master) { + setItem('bus.channels', this.channels); + setItem('bus.options', this.options); + } else { + this.channels = getItem('bus.channels', this.channels); + this.options = getItem('bus.options', this.options); + } return; // start_polling will be called again on tab registration } diff --git a/addons/calendar/calendar.py b/addons/calendar/calendar.py index 81f54314016..860c64fee7f 100644 --- a/addons/calendar/calendar.py +++ b/addons/calendar/calendar.py @@ -1080,17 +1080,6 @@ class calendar_event(osv.Model): if not context.get('no_email'): self.pool['calendar.attendee']._send_mail_to_attendees(cr, uid, att_id, email_from=mail_from, context=context) - if current_user.partner_id.id not in new_att_partner_ids: - access_token = self.new_invitation_token(cr, uid, event, current_user.partner_id.id) - values = { - 'partner_id': current_user.partner_id.id, - 'event_id': event.id, - 'access_token': access_token, - 'email': current_user.partner_id.email, - } - current_user_att_id = self.pool['calendar.attendee'].create(cr, uid, values, context=context) - new_attendees.append(current_user_att_id) - new_att_partner_ids.append(current_user.partner_id.id) if new_attendees: self.write(cr, uid, [event.id], {'attendee_ids': [(4, att) for att in new_attendees]}, context=context) if new_att_partner_ids: diff --git a/addons/calendar/i18n/es_BO.po b/addons/calendar/i18n/es_BO.po index 1d37459040c..e7cc634cde1 100644 --- a/addons/calendar/i18n/es_BO.po +++ b/addons/calendar/i18n/es_BO.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-26 09:05+0000\n" -"PO-Revision-Date: 2015-11-27 08:49+0000\n" +"PO-Revision-Date: 2015-12-11 15:37+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Spanish (Bolivia) (http://www.transifex.com/odoo/odoo-9/language/es_BO/)\n" "MIME-Version: 1.0\n" @@ -550,7 +550,7 @@ msgstr "Confirmado" #. module: calendar #: model:ir.model.fields,field_description:calendar.field_calendar_attendee_partner_id msgid "Contact" -msgstr "" +msgstr "Contacto" #. module: calendar #: model:ir.model.fields,field_description:calendar.field_calendar_alarm_create_uid diff --git a/addons/calendar/i18n/es_MX.po b/addons/calendar/i18n/es_MX.po index 67942746560..387151cb542 100644 --- a/addons/calendar/i18n/es_MX.po +++ b/addons/calendar/i18n/es_MX.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-26 09:05+0000\n" -"PO-Revision-Date: 2015-11-27 08:49+0000\n" +"PO-Revision-Date: 2015-12-09 02:05+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/odoo/odoo-9/language/es_MX/)\n" "MIME-Version: 1.0\n" @@ -584,7 +584,7 @@ msgstr "" #. module: calendar #: model:ir.model.fields,help:calendar.field_calendar_event_message_last_post msgid "Date of the last message posted on the record." -msgstr "" +msgstr "Fecha de último trabajo realizado en esta cuenta" #. module: calendar #: model:ir.ui.view,arch_db:calendar.view_calendar_event_form @@ -763,7 +763,7 @@ msgstr "Seguidores" #. module: calendar #: model:ir.model.fields,field_description:calendar.field_calendar_event_message_partner_ids msgid "Followers (Partners)" -msgstr "" +msgstr "Seguidores (Socios)" #. module: calendar #: selection:calendar.event,byday:0 @@ -882,7 +882,7 @@ msgstr "" #. module: calendar #: model:ir.model.fields,field_description:calendar.field_calendar_event_message_last_post msgid "Last Message Date" -msgstr "" +msgstr "Fecha de último mensaje" #. module: calendar #: model:ir.model.fields,field_description:calendar.field_calendar_alarm___last_update @@ -1049,12 +1049,12 @@ msgstr "" #. module: calendar #: model:ir.model.fields,field_description:calendar.field_calendar_event_message_needaction_counter msgid "Number of Actions" -msgstr "" +msgstr "Número de acciones" #. module: calendar #: model:ir.model.fields,help:calendar.field_calendar_event_message_needaction_counter msgid "Number of messages which requires an action" -msgstr "" +msgstr "Número de mensajes que requieren una acción" #. module: calendar #: selection:calendar.event,end_type:0 @@ -1064,7 +1064,7 @@ msgstr "" #. module: calendar #: model:ir.model.fields,help:calendar.field_calendar_event_message_unread_counter msgid "Number of unread messages" -msgstr "" +msgstr "Número de mensajes sin leer" #. module: calendar #. openerp-web @@ -1387,7 +1387,7 @@ msgstr "Mensajes sin leer" #. module: calendar #: model:ir.model.fields,field_description:calendar.field_calendar_event_message_unread_counter msgid "Unread Messages Counter" -msgstr "" +msgstr "Contador de mensajes sin leer" #. module: calendar #: model:ir.ui.view,arch_db:calendar.view_calendar_event_form diff --git a/addons/calendar/i18n/fi.po b/addons/calendar/i18n/fi.po index 52a91eb8208..a6f9bec9649 100644 --- a/addons/calendar/i18n/fi.po +++ b/addons/calendar/i18n/fi.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-26 09:05+0000\n" -"PO-Revision-Date: 2015-11-27 08:49+0000\n" +"PO-Revision-Date: 2015-12-07 17:39+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Finnish (http://www.transifex.com/odoo/odoo-9/language/fi/)\n" "MIME-Version: 1.0\n" @@ -426,7 +426,7 @@ msgstr "Hyväksytty" #. module: calendar #: model:ir.model.fields,field_description:calendar.field_calendar_event_message_needaction msgid "Action Needed" -msgstr "" +msgstr "Huomiota vaadittu" #. module: calendar #: model:ir.model.fields,field_description:calendar.field_calendar_event_active @@ -831,7 +831,7 @@ msgstr "Jos valittu, uudet viestit vaativat huomiosi." #. module: calendar #: model:ir.model.fields,help:calendar.field_calendar_event_message_needaction msgid "If checked, new messages require your attention." -msgstr "" +msgstr "Jos valittu, uudet viestit vaativat huomiosi." #. module: calendar #: model:ir.model.fields,help:calendar.field_calendar_event_active @@ -1065,7 +1065,7 @@ msgstr "Toistojen määrä" #. module: calendar #: model:ir.model.fields,help:calendar.field_calendar_event_message_unread_counter msgid "Number of unread messages" -msgstr "" +msgstr "Lukemattomien viestien määrä" #. module: calendar #. openerp-web diff --git a/addons/calendar/i18n/it.po b/addons/calendar/i18n/it.po index b052e944a20..eff07ce1224 100644 --- a/addons/calendar/i18n/it.po +++ b/addons/calendar/i18n/it.po @@ -3,13 +3,14 @@ # * calendar # # Translators: +# Christian , 2015 msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-26 09:05+0000\n" -"PO-Revision-Date: 2015-11-27 08:49+0000\n" -"Last-Translator: Martin Trigaux\n" +"PO-Revision-Date: 2015-12-08 14:25+0000\n" +"Last-Translator: Christian \n" "Language-Team: Italian (http://www.transifex.com/odoo/odoo-9/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -391,19 +392,19 @@ msgstr "${object.event_id.name} - Promemoria" msgid "" "%s at %s To\n" " %s at %s (%s)" -msgstr "" +msgstr "%s at %s To\n%s at %s (%s)" #. module: calendar #: code:addons/calendar/calendar.py:773 #, python-format msgid "%s at (%s To %s) (%s)" -msgstr "" +msgstr "%s at (%s To %s) (%s)" #. module: calendar #: model:ir.ui.view,arch_db:calendar.view_calendar_event_form #: model:ir.ui.view,arch_db:calendar.view_calendar_event_form_popup msgid " hours" -msgstr "" +msgstr "ore" #. module: calendar #: code:addons/calendar/calendar.py:1620 @@ -520,7 +521,7 @@ msgstr "Calendario" #: model:ir.ui.view,arch_db:calendar.calendar_alarm_view_form #: model:ir.ui.view,arch_db:calendar.view_calendar_alarm_tree msgid "Calendar Alarm" -msgstr "" +msgstr "Avviso del Calendario" #. module: calendar #: model:ir.ui.view,arch_db:calendar.view_calendar_event_form @@ -530,12 +531,12 @@ msgstr "Cliccare per aggiornare solamente questa istanza e non tutte le ricorren #. module: calendar #: model:ir.actions.act_window,help:calendar.action_calendar_event msgid "Click to schedule a new meeting." -msgstr "" +msgstr "Cliccare per pianificare una nuova riunione." #. module: calendar #: model:ir.model.fields,field_description:calendar.field_calendar_event_color_partner_id msgid "Color index of creator" -msgstr "" +msgstr "Indice colore del creatore" #. module: calendar #: model:ir.model.fields,field_description:calendar.field_calendar_attendee_cn @@ -632,7 +633,7 @@ msgstr "Dettagli" #: model:ir.model.fields,field_description:calendar.field_calendar_event_display_name #: model:ir.model.fields,field_description:calendar.field_calendar_event_type_display_name msgid "Display Name" -msgstr "Visualizza Nome" +msgstr "Nome visualizzato" #. module: calendar #. openerp-web @@ -651,7 +652,7 @@ msgstr "Durata" #: model:ir.model.fields,field_description:calendar.field_calendar_alarm_duration_minutes #: model:ir.model.fields,help:calendar.field_calendar_alarm_duration_minutes msgid "Duration in minutes" -msgstr "" +msgstr "Durata in minuti" #. module: calendar #: selection:calendar.alarm,type:0 @@ -720,7 +721,7 @@ msgstr "Allarme evento" #: code:addons/calendar/calendar.py:1252 #, python-format msgid "Event recurrence interval cannot be negative." -msgstr "" +msgstr "L'intervallo di ripetizione dell'evento non può essere negativo." #. module: calendar #. openerp-web @@ -837,12 +838,12 @@ msgstr "Se selezionato, i nuovi messaggi richiedono la tua attenzione" msgid "" "If the active field is set to false, it will allow you to hide the event " "alarm information without removing it." -msgstr "" +msgstr "Se il campo attivo è impostato a falso, sarà possible nascondere le informazioni sugli avvisi inerenti gli eventi senza cancellarli." #. module: calendar #: model:ir.ui.view,arch_db:calendar.view_calendar_event_search msgid "Important Messages" -msgstr "" +msgstr "Messaggi importanti" #. module: calendar #: model:mail.message.subtype,name:calendar.subtype_invitation @@ -997,7 +998,7 @@ msgstr "Storico messaggi e comunicazioni" #. module: calendar #: selection:calendar.alarm,interval:0 msgid "Minute(s)" -msgstr "" +msgstr "Minuto(i)" #. module: calendar #: model:ir.ui.view,arch_db:calendar.view_calendar_event_form @@ -1064,7 +1065,7 @@ msgstr "Numero di ripetizioni" #. module: calendar #: model:ir.model.fields,help:calendar.field_calendar_event_message_unread_counter msgid "Number of unread messages" -msgstr "" +msgstr "Numero di messaggi non letti" #. module: calendar #. openerp-web @@ -1076,12 +1077,12 @@ msgstr "OK" #. module: calendar #: selection:calendar.event,class:0 msgid "Only internal users" -msgstr "" +msgstr "Solo utenti interni" #. module: calendar #: selection:calendar.event,class:0 msgid "Only me" -msgstr "" +msgstr "Solo io" #. module: calendar #: model:ir.model.fields,field_description:calendar.field_calendar_event_month_by @@ -1107,7 +1108,7 @@ msgstr "Partner" #: code:addons/calendar/calendar.py:1265 #, python-format msgid "Please select a proper day of the month." -msgstr "" +msgstr "Selezionare un corretto giorno del mese" #. module: calendar #: model:ir.model.fields,field_description:calendar.field_calendar_event_class @@ -1216,7 +1217,7 @@ msgstr "Secondo" #. module: calendar #: model:ir.ui.view,arch_db:calendar.view_calendar_event_form msgid "Select attendees..." -msgstr "" +msgstr "Selezionare i partecipanti ..." #. module: calendar #: model:ir.ui.view,arch_db:calendar.view_calendar_event_form @@ -1254,7 +1255,7 @@ msgstr "Data e ora partenza" #. module: calendar #: model:ir.model.fields,help:calendar.field_calendar_event_start msgid "Start date of an event, without time for full days events" -msgstr "" +msgstr "Data di inizio dell'evento, senza l'ora per gli eventi a giornata completa." #. module: calendar #: model:ir.ui.view,arch_db:calendar.view_calendar_event_form @@ -1281,7 +1282,7 @@ msgstr "Ferma" #. module: calendar #: model:ir.model.fields,help:calendar.field_calendar_event_stop msgid "Stop date of an event, without time for full days events" -msgstr "" +msgstr "Data di termine dell'evento, senza l'ora per gli eventi a giornata completa." #. module: calendar #: model:ir.ui.view,arch_db:calendar.view_calendar_event_tree @@ -1301,7 +1302,7 @@ msgstr "Domenica" #. module: calendar #: sql_constraint:calendar.event.type:0 msgid "Tag name already exists !" -msgstr "" +msgstr "Il nome del tag esiste già !" #. module: calendar #: model:ir.model.fields,field_description:calendar.field_calendar_event_categ_ids @@ -1319,7 +1320,7 @@ msgid "" "The calendar is shared between employees and fully integrated with\n" " other applications such as the employee holidays or the business\n" " opportunities." -msgstr "" +msgstr "Il calendario è condiviso con i dipendenti ed è completamente integrato con\nle altre applicazione quali le vacanze dei dipendenti o le opportunità di business." #. module: calendar #: code:addons/calendar/calendar.py:1382 @@ -1335,7 +1336,7 @@ msgstr "terzo" #. module: calendar #: model:ir.ui.view,arch_db:calendar.view_calendar_event_form msgid "This event is linked to a recurrence...
" -msgstr "" +msgstr "Questo evento è collegato a un evento ricorrente...
" #. module: calendar #: model:ir.model.fields,field_description:calendar.field_calendar_event_th @@ -1387,7 +1388,7 @@ msgstr "Messaggi Non Letti" #. module: calendar #: model:ir.model.fields,field_description:calendar.field_calendar_event_message_unread_counter msgid "Unread Messages Counter" -msgstr "" +msgstr "Contatore di messsaggi non letti" #. module: calendar #: model:ir.ui.view,arch_db:calendar.view_calendar_event_form @@ -1455,17 +1456,17 @@ msgstr "attivo" #. module: calendar #: model:ir.model,name:calendar.model_calendar_alarm_manager msgid "calendar.alarm_manager" -msgstr "" +msgstr "calendar.alarm_manager" #. module: calendar #: model:ir.model,name:calendar.model_calendar_contacts msgid "calendar.contacts" -msgstr "" +msgstr "calendar.contacts" #. module: calendar #: model:ir.ui.view,arch_db:calendar.view_calendar_event_form msgid "e.g. Business Lunch" -msgstr "" +msgstr "es. Pranzo di lavoro" #. module: calendar #: code:addons/calendar/calendar.py:1250 diff --git a/addons/calendar/i18n/pt_BR.po b/addons/calendar/i18n/pt_BR.po index 6ecc82324e8..c0f64fc7c70 100644 --- a/addons/calendar/i18n/pt_BR.po +++ b/addons/calendar/i18n/pt_BR.po @@ -4,6 +4,7 @@ # # Translators: # Gideoni Willian da Silva , 2015 +# Grazziano Duarte , 2015 # Mateus Cerqueira Lopes , 2015 # Planeta Odoo , 2015 msgid "" @@ -11,8 +12,8 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-26 09:05+0000\n" -"PO-Revision-Date: 2015-11-27 08:49+0000\n" -"Last-Translator: Martin Trigaux\n" +"PO-Revision-Date: 2015-12-10 12:37+0000\n" +"Last-Translator: Grazziano Duarte \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/odoo/odoo-9/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -246,7 +247,7 @@ msgid "" "

\n" " \n" " " -msgstr "" +msgstr "\n\n
\n
\n${object.event_id.name}\n
\n
\nCaro(a) ${object.cn} ,

${object.event_id.user_id.partner_id.name} convidou você para o(a) ${object.event_id.name} reunião de ${object.event_id.user_id.company_id.name}.

\n
\n
\n\n\n\n\n\n
\n
${object.event_id.get_interval(object.event_id.start, 'dayname', tz=object.partner_id.tz)}
\n
\n${object.event_id.get_interval(object.event_id.start,'day', tz=object.partner_id.tz)}\n
\n
${object.event_id.get_interval(object.event_id.start, 'month', tz=object.partner_id.tz)}
\n
${not object.event_id.allday and object.event_id.get_interval(object.event_id.start, 'time', tz=object.partner_id.tz) or ''}
\n		\n\n\n\n \n \n\n\n\n\n\n\n\n\n\n \n\n\n\n\n
\n% if object.event_id.location:\n
\nOnde\n
\n% endif\n		\n% if object.event_id.location:\n
\n: ${object.event_id.location}\n(Ver Mapa)\n\n
\n% endif\n
\n% if object.event_id.description :\n
\nO Que\n
\n% endif\n		\n% if object.event_id.description :\n
\n: ${object.event_id.description}\n
\n% endif\n
\n% if not object.event_id.allday and object.event_id.duration:\n
\nDuração\n
\n% endif\n		\n% if not object.event_id.allday and object.event_id.duration:\n
\n: ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))}\n
\n% endif\n
\n
\nParticipantes\n
\n		\n: \n% for attendee in object.event_id.attendee_ids:\n
\n% if attendee.cn != object.cn:\n${attendee.cn}\n% else:\nVocê\n% endif\n% endfor\n
\n
\n
\n \n
" #. module: calendar #: model:mail.template,body_html:calendar.calendar_template_meeting_changedate @@ -364,7 +365,7 @@ msgid "" "
\n" " \n" " " -msgstr "" +msgstr " \n\n
\n
\n${object.event_id.name}\n
\n
\nDear ${object.cn} ,
\n

A data da reunião foi alterada...
\nThe meeting created by ${object.event_id.user_id.partner_id.name} agora está prevista para : ${object.event_id.get_display_time_tz(tz=object.partner_id.tz)}.

\n
\n
\n\n \n\n\n\n
\n
${object.event_id.get_interval(object.event_id.start, 'dayname', tz=object.partner_id.tz)}
\n
\n${object.event_id.get_interval(object.event_id.start,'day', tz=object.partner_id.tz)}\n
\n
${object.event_id.get_interval(object.event_id.start, 'month', tz=object.partner_id.tz)}
\n
${not object.event_id.allday and object.event_id.get_interval(object.event_id.start, 'time', tz=object.partner_id.tz) or ''}
\n		\n\n\n\n \n \n\n\n\n\n\n\n\n\n\n \n\n\n\n\n
\n% if object.event_id.location:\n
\nOnde\n
\n% endif\n		\n% if object.event_id.location:\n
\n: ${object.event_id.location}\n(Ver Mapa)\n\n
\n% endif\n
\n% if object.event_id.description :\n
\nO Que\n
\n% endif\n		\n% if object.event_id.description :\n
\n: ${object.event_id.description}\n
\n% endif\n
\n% if not object.event_id.allday and object.event_id.duration:\n
\nDuração\n
\n% endif\n		\n% if not object.event_id.allday and object.event_id.duration:\n
\n: ${('%dH%02d' % (object.event_id.duration,(object.event_id.duration*60)%60))}\n
\n% endif\n
\n
\nParticipantes\n
\n		\n: \n% for attendee in object.event_id.attendee_ids:\n
\n% if attendee.cn != object.cn:\n${attendee.cn}\n% else:\nVocê\n% endif\n% endfor\n
\n
\n
\n \n
" #. module: calendar #. openerp-web @@ -394,19 +395,19 @@ msgstr "${object.event_id.name} - Lembrete" msgid "" "%s at %s To\n" " %s at %s (%s)" -msgstr "" +msgstr "%s at %s Para\n%s at %s (%s)" #. module: calendar #: code:addons/calendar/calendar.py:773 #, python-format msgid "%s at (%s To %s) (%s)" -msgstr "" +msgstr "%s at (%s Para %s) (%s)" #. module: calendar #: model:ir.ui.view,arch_db:calendar.view_calendar_event_form #: model:ir.ui.view,arch_db:calendar.view_calendar_event_form_popup msgid " hours" -msgstr "" +msgstr " horas" #. module: calendar #: code:addons/calendar/calendar.py:1620 @@ -1079,7 +1080,7 @@ msgstr "OK" #. module: calendar #: selection:calendar.event,class:0 msgid "Only internal users" -msgstr "" +msgstr "Somente usuários internos" #. module: calendar #: selection:calendar.event,class:0 @@ -1219,7 +1220,7 @@ msgstr "Segundo" #. module: calendar #: model:ir.ui.view,arch_db:calendar.view_calendar_event_form msgid "Select attendees..." -msgstr "" +msgstr "Selecionar participantes..." #. module: calendar #: model:ir.ui.view,arch_db:calendar.view_calendar_event_form @@ -1257,7 +1258,7 @@ msgstr "Data de Início" #. module: calendar #: model:ir.model.fields,help:calendar.field_calendar_event_start msgid "Start date of an event, without time for full days events" -msgstr "" +msgstr "Data inicial de um evento, sem tempo para eventos de dias inteiros" #. module: calendar #: model:ir.ui.view,arch_db:calendar.view_calendar_event_form @@ -1284,7 +1285,7 @@ msgstr "Parar" #. module: calendar #: model:ir.model.fields,help:calendar.field_calendar_event_stop msgid "Stop date of an event, without time for full days events" -msgstr "" +msgstr "Data final de um evento, sem tempo para eventos de dias inteiros" #. module: calendar #: model:ir.ui.view,arch_db:calendar.view_calendar_event_tree @@ -1322,7 +1323,7 @@ msgid "" "The calendar is shared between employees and fully integrated with\n" " other applications such as the employee holidays or the business\n" " opportunities." -msgstr "" +msgstr "O calendário é compartilhado entre funcionários e totalmente integrado com\noutras aplicações, como as férias do empregado ou o oportunidades\nde negócio." #. module: calendar #: code:addons/calendar/calendar.py:1382 @@ -1338,7 +1339,7 @@ msgstr "Terceiro" #. module: calendar #: model:ir.ui.view,arch_db:calendar.view_calendar_event_form msgid "This event is linked to a recurrence...
" -msgstr "" +msgstr "Este evento está ligado a uma reincidência ...
" #. module: calendar #: model:ir.model.fields,field_description:calendar.field_calendar_event_th diff --git a/addons/calendar/i18n/sk.po b/addons/calendar/i18n/sk.po index 34e668879a7..f7db41d7300 100644 --- a/addons/calendar/i18n/sk.po +++ b/addons/calendar/i18n/sk.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-26 09:05+0000\n" -"PO-Revision-Date: 2015-12-01 10:12+0000\n" +"PO-Revision-Date: 2015-12-11 19:58+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Slovak (http://www.transifex.com/odoo/odoo-9/language/sk/)\n" "MIME-Version: 1.0\n" @@ -842,7 +842,7 @@ msgstr "" #. module: calendar #: model:ir.ui.view,arch_db:calendar.view_calendar_event_search msgid "Important Messages" -msgstr "" +msgstr "Dôležité správy" #. module: calendar #: model:mail.message.subtype,name:calendar.subtype_invitation diff --git a/addons/calendar/i18n/uk.po b/addons/calendar/i18n/uk.po index bad101d74e6..fde73b579e1 100644 --- a/addons/calendar/i18n/uk.po +++ b/addons/calendar/i18n/uk.po @@ -3,14 +3,15 @@ # * calendar # # Translators: +# Bogdan, 2015 # Zoriana Zaiats, 2015 msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-26 09:05+0000\n" -"PO-Revision-Date: 2015-11-27 12:25+0000\n" -"Last-Translator: Zoriana Zaiats\n" +"PO-Revision-Date: 2015-12-09 13:06+0000\n" +"Last-Translator: Bogdan\n" "Language-Team: Ukrainian (http://www.transifex.com/odoo/odoo-9/language/uk/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -664,12 +665,12 @@ msgstr "Email" #: code:addons/calendar/calendar.py:1386 #, python-format msgid "Email addresses not found" -msgstr "Ел.пошти не було знайдено" +msgstr "Ел. пошти не було знайдено" #. module: calendar #: model:ir.model.fields,help:calendar.field_calendar_attendee_email msgid "Email of Invited Person" -msgstr "Ел.пошта запрошеної людини" +msgstr "Ел. пошта запрошеної людини" #. module: calendar #: model:ir.model.fields,field_description:calendar.field_calendar_contacts_partner_id @@ -700,7 +701,7 @@ msgstr "Закінчується" #. module: calendar #: constraint:calendar.event:0 msgid "Error ! End date cannot be set before start date." -msgstr "Помилка ! Дата закінчення не може бути ранішою за дату початку." +msgstr "Помилка! Дата закінчення не може бути ранішою за дату початку." #. module: calendar #: model:ir.model,name:calendar.model_calendar_event diff --git a/addons/calendar/i18n/zh_CN.po b/addons/calendar/i18n/zh_CN.po index 5cf53a20a24..c2b13b0fba2 100644 --- a/addons/calendar/i18n/zh_CN.po +++ b/addons/calendar/i18n/zh_CN.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-26 09:05+0000\n" -"PO-Revision-Date: 2015-12-02 07:35+0000\n" -"Last-Translator: Martin Trigaux\n" +"PO-Revision-Date: 2015-12-10 01:22+0000\n" +"Last-Translator: jeffery chen fan \n" "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -522,7 +522,7 @@ msgstr "日历" #: model:ir.ui.view,arch_db:calendar.calendar_alarm_view_form #: model:ir.ui.view,arch_db:calendar.view_calendar_alarm_tree msgid "Calendar Alarm" -msgstr "日历报警" +msgstr "日历警报" #. module: calendar #: model:ir.ui.view,arch_db:calendar.view_calendar_event_form @@ -537,7 +537,7 @@ msgstr "点击去计划一个新的会议" #. module: calendar #: model:ir.model.fields,field_description:calendar.field_calendar_event_color_partner_id msgid "Color index of creator" -msgstr "造物的颜色指数" +msgstr "创建者的颜色指数" #. module: calendar #: model:ir.model.fields,field_description:calendar.field_calendar_attendee_cn @@ -1379,7 +1379,7 @@ msgstr "未确认" #. module: calendar #: model:ir.model.fields,field_description:calendar.field_calendar_alarm_interval msgid "Unit" -msgstr "单件" +msgstr "单位" #. module: calendar #: model:ir.model.fields,field_description:calendar.field_calendar_event_message_unread diff --git a/addons/claim_from_delivery/i18n/zh_CN.po b/addons/claim_from_delivery/i18n/zh_CN.po index e79cd75113f..3feaf225baf 100644 --- a/addons/claim_from_delivery/i18n/zh_CN.po +++ b/addons/claim_from_delivery/i18n/zh_CN.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-09-07 14:40+0000\n" -"PO-Revision-Date: 2015-09-07 16:47+0000\n" -"Last-Translator: Martin Trigaux\n" +"PO-Revision-Date: 2015-12-09 14:17+0000\n" +"Last-Translator: jeffery chen fan \n" "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -36,4 +36,4 @@ msgstr "送货单" #. module: claim_from_delivery #: model:ir.model,name:claim_from_delivery.model_stock_picking msgid "Transfer" -msgstr "转移" +msgstr "调拨" diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 21187fc70dc..84ca8d9a393 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -294,11 +294,7 @@ class crm_lead(format_address, osv.osv): team = self.pool['crm.team'].browse(cr, uid, context['team_id'], context=context) if user_id in team.member_ids.ids: return {} - team_ids = self.pool.get('crm.team').search( - cr, uid, ['|', ('user_id', '=', user_id), ('member_ids', '=', user_id)], limit=1, context=context) - team_id = team_ids and team_ids[0] or False - if not team_id: - team_id = self.pool['crm.team']._get_default_team_id(cr, uid, context=context, user_id=user_id) + team_id = self.pool['crm.team']._get_default_team_id(cr, uid, context=context, user_id=user_id) return {'value': {'team_id': team_id}} def stage_find(self, cr, uid, cases, team_id, domain=None, order='sequence', context=None): diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 00e5b266fee..7fef14bfcb1 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -461,7 +461,7 @@
\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" +"
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -53,7 +53,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -134,6 +134,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -141,7 +148,7 @@ msgid "%s (copy)" msgstr "%s (copy)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "%s erstellt" @@ -154,9 +161,9 @@ msgstr "%s ist dem %s Netzwerk beigetreten." #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:86 +#: code:addons/mail/static/src/xml/thread.xml:96 #, python-format -msgid "(in channel" +msgid "(from" msgstr "" #. module: mail @@ -436,7 +443,7 @@ msgstr "Alle Nachrichten" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "Anonym" @@ -560,16 +567,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "Für Massenversand von Mails verfügbar" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "Bewährte Verkaufspraxis" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "Vorstandssitzungen" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -790,6 +787,13 @@ msgstr "Eine neue Nachricht verfassen" msgid "Composition mode" msgstr "Schreibmodus" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -957,21 +961,14 @@ msgstr "Beschreibung, die zur versendeten Nachricht hinzugefügt wird. Falls es #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "Wussten Sie, dass Sie durch die Eingabe von '@someone' bei der Erfassung Ihrer Nachricht, Sie jemanden zitieren können und dies in seinem Posteingang erscheint?" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1458,14 +1455,6 @@ msgstr "Wichtige Nachrichten" msgid "Important messages" msgstr "Wichtige Nachrichten" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1500,7 +1489,7 @@ msgid "" msgstr "Ungültiger Ausdruck, es muss als literales Python Dictionary definiert werden, z.B. \"{'field': 'value'}\"" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1508,7 +1497,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "Folgen Sie %s: %s" @@ -1565,6 +1561,11 @@ msgstr "Ist Beobachter" msgid "Is Notification" msgstr "Ist Benachrichtigung" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1737,6 +1738,13 @@ msgstr "Es wurde ein E-Mail Hinweis für eine existierende E-Mail Benachrichtigu msgid "Mailing Opt-Out" msgstr "Mailing Opt-Out" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1762,13 +1770,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "Mitglieder dieser Gruppe werden automatisch als Follower hinzugefügt. Beachten Sie, dass diese Ihre Nachrichteneinstellungen auch selbständig bearbeiten können." -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "Erwähnung(en):" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1980,12 +1981,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "Neue Nachricht" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1995,11 +2010,32 @@ msgstr "Neue Personen" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "Keine Follower" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2325,8 +2361,8 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" -msgstr "Regel für den Versand von Mitteilungen über das E-Mail-Gateways.\n- Alle Benutzer: Jeder kann uneingeschränkt Mails senden\n- Authentifizierte Partner: Nur angemeldete Partner\n- Nur Verfolger: Nur Verfolger dieses Dokuments\n" +"- followers: only followers of the related document or members of following channels\n" +msgstr "" #. module: mail #: model:ir.model.fields,help:mail.field_res_partner_notify_email @@ -2366,23 +2402,11 @@ msgstr "Privatsphäre" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "R&D" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2868,11 +2892,6 @@ msgid "" " will be taken from the email template." msgstr "Die unten stehenden Werte werden zu Informationszwecken dargestellt. Beim Versand einer E-Mail, werden die\n Werte der E-Mailvorlage genommen." -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2919,6 +2938,13 @@ msgstr "An (Partner)" msgid "To: Followers of" msgstr "An: Follower von" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2978,8 +3004,15 @@ msgstr "Die E-Mail konnte nicht versendet werden, bitte legen Sie eine Absendera #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -3009,28 +3042,35 @@ msgstr "Zähler der ungelelesen Nachrichten" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "Abmelden" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "Lade hoch" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "Uploadfehler" @@ -3106,10 +3146,17 @@ msgstr "Wer kann Ihren Gruppen-Aktivitäten folgen?" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:6 +#: code:addons/mail/static/src/xml/composer.xml:7 #, python-format -msgid "Write something" -msgstr "Schreiben Sie etwas" +msgid "Write something..." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:122 +#, python-format +msgid "Yesterday" +msgstr "" #. module: mail #. openerp-web @@ -3118,6 +3165,14 @@ msgstr "Schreiben Sie etwas" msgid "You added %s to the conversation." msgstr "Sie haben %s zur Konversation hinzugefügt." +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3159,18 +3214,11 @@ msgstr "Sie können Anhänge zu dieser Vorlage hinzufügen, die mit allen E-Mail #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:346 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3189,6 +3237,11 @@ msgstr "Ihre Vorlage sollte email_from beinhalten" msgid "base.config.settings" msgstr "base.config.settings" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3196,13 +3249,13 @@ msgstr "durch" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:30 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:314 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "Dokument" @@ -3234,6 +3287,13 @@ msgstr "ir.autovacuum" msgid "members" msgstr "Mitglieder" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3241,7 +3301,7 @@ msgstr "mycompany.odoo.com" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3266,11 +3326,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "publisher_warranty.contract" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "Datensatz:" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/el.po b/addons/mail/i18n/el.po index b467f0341b7..7518abfe122 100644 --- a/addons/mail/i18n/el.po +++ b/addons/mail/i18n/el.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-12-05 23:38+0000\n" -"Last-Translator: Goutoudis Kostas \n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" +"Last-Translator: Martin Trigaux\n" "Language-Team: Greek (http://www.transifex.com/odoo/odoo-9/language/el/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,10 +29,10 @@ msgid "" " \n" " \n" "\n" -"

\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -"
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -54,7 +54,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -117,7 +117,7 @@ msgid "" "

\n" "
\n" "% endif" -msgstr "\n

\n

\n
\n
\n
\n

\n

\n

\n
\n
\n\n\n\n

\n% if ctx.get('button_access'):
\n${ctx['button_access']['title']}
\n% endif
\n
\n% if ctx.get('button_follow'):
\n${ctx['button_follow']['title']}\n\n% elif ctx.get('button_unfollow'):\n${ctx['button_unfollow']['title']}\n% endif\n\n% if not ctx.get('button_access') and not ctx.get('button_follow') and not ctx.get('button_unfollow') and ctx.get('model_name'):\n

\nΣχετικά ${ctx['model_name']}\n% if ctx.get('record_name'):\n: ${ctx['record_name']}\n% endif\n\n

\n% endif\n		\n

\n% if ctx.get('actions'):\n% for action in ctx['actions']:\n${action['title']}\n%if len(ctx['actions']) > 1 and loop.index < len(ctx['actions']):\n|\n% endif\n% endfor\n% else:\nΑποστολή από\n% if ctx.get('website_url'):\n\n% endif\n${ctx.get('company_name')}\n% if ctx.get('website_url'):\n\n% endif\nχρησιμοποιώντας\nOdoo\n% endif\n

\n
\n
\n\n\n
\n
\n

\n

\n

\n

\n

\n

\n

\n
\n
\n
\n
\n

\n${object.body | safe}
\n% if ctx.get('tracking'):
\n

    \n% for tracking in ctx['tracking']
    \n
  • ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}

    • \n% endfor
    \n

\n% endif
\n

\n

\n% if ctx.get('signature'):
\n

\n
\n
\n
\n
\n

\n${ctx['signature'] | safe}
\n

\n

\n% endif" +msgstr "" #. module: mail #. openerp-web @@ -135,6 +135,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "${object.subject or (object.record_name and 'Re: %s' % object.record_name) or (object.parent_id and object.parent_id.subject and 'Re: %s' % object.parent_id.subject) or (object.parent_id and object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -142,7 +149,7 @@ msgid "%s (copy)" msgstr "%s (αντίγραφο)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "%s δημιουργήθηκε" @@ -155,10 +162,10 @@ msgstr "%s έχει ενταχθεί το δίκτυο του %s." #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:86 +#: code:addons/mail/static/src/xml/thread.xml:96 #, python-format -msgid "(in channel" -msgstr "(στο κανάλι" +msgid "(from" +msgstr "" #. module: mail #. openerp-web @@ -389,7 +396,7 @@ msgstr "Ψευδώνυμο" #. module: mail #: model:ir.ui.view,arch_db:mail.view_users_form_mail msgid "Alias Accepts Emails From" -msgstr "Ψευδώνυμο για την αποδοχή emails Από" +msgstr "Ψευδώνυμο για την αποδοχή emails από" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_alias_alias_contact @@ -437,7 +444,7 @@ msgstr "Όλα τα μηνύματα" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "Ανώνυμος" @@ -561,16 +568,6 @@ msgstr "Αυτόματος ορισμός ως αναγνωσμένα τα 'Απ msgid "Available for mass mailing" msgstr "Διαθέσιμο για μαζική αποστολή mail" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "Βέλτιστες Πρακτικές Πωλήσεων" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "Πίνακας Συναντήσεων" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -791,6 +788,13 @@ msgstr "Σύνταξη νέου μηνύματος" msgid "Composition mode" msgstr "Λειτουργία σύνθεσης" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -958,21 +962,14 @@ msgstr "Περιγραφή που θα προστεθεί στο δημοσιε #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "Αποσύνδεση" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "Το γνωρίζατε; Πληκτρολογήστε '@someone' στην σύνταξη του μηνύματος για να αναφέρετε κάποιον στο μήνυμά σας και να το κάνετε να εμφανιστεί στο δικό του φάκελο Εισερχομένων." - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "Άμεσα μηνύματα" @@ -1459,14 +1456,6 @@ msgstr "Σημαντικά Μηνύματα " msgid "Important messages" msgstr "Σημαντικά μηνύματα" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "Στην ενότητα \"Κανάλια\", θα βρείτε τα δημόσια και τα περιορισμένα κανάλια.
\nΣτην ενότητα \"Άμεσα Μηνύματα\" μπορείτε να μιλήσετε απευθείας με ένα άτομο.
\nΗ ενότητα «Ιδιωτικά Κανάλια\" περιέχει τις ιδιωτικές συνομιλίες σας. Μπορείτε να συμμετέχετε σε ένα ιδιωτικό κανάλι, είτε δημιουργώντας το είτε εάν προσκληθείτε σε κάποιο άλλο.
" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1501,7 +1490,7 @@ msgid "" msgstr "Μη έγκυρη έκφραση, πρέπει να είναι μια σωστή έκφραση python όπως ορίζεται στο λεξικό ορισμών της python π.χ. \"{'field': 'value'}\"" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1509,7 +1498,14 @@ msgid "" msgstr "Μη έγκυρο σετ εγγραφών: θα πρέπει να κληθεί ως μοντέλο (χωρίς εγγραφές) ή ένα σετ εγγραφών με μία εγγραφή." #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "Πρόσκληση να ακολουθήσει %s: %s" @@ -1566,6 +1562,11 @@ msgstr "Είναι Ακόλουθος" msgid "Is Notification" msgstr "Είναι Ειδοποίηση" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1738,6 +1739,13 @@ msgstr "Έχει δημιουργηθεί email για να ενημερώσει msgid "Mailing Opt-Out" msgstr "Ταχυδρομική Αποχώρηση" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1763,13 +1771,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "Τα μέλη αυτών των ομάδων θα προστίθεται αυτόματα ως ακόλουθοι. Σημειώστε ότι θα είναι σε θέση να διαχειρίζονται τη συνδρομή τους χειροκίνητα εάν είναι απαραίτητο." -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "Αναφορά(ές):" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1981,12 +1982,26 @@ msgstr "Νέα Τιμή Κειμένου" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "Νέο μήνυμα" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1996,11 +2011,32 @@ msgstr "Νέος Συναλλασσόμενος " #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "Χωρίς ακόλουθο" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2326,8 +2362,8 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" -msgstr "Πολιτική για να δημοσιεύσετε ένα μήνυμα σχετικά με το έγγραφο χρησιμοποιώντας το mailgateway.\n- Ο καθένας: ο καθένας μπορεί να δημοσιεύσει\n- Συνεργάτες: Μόνο πιστοποιημένοι συνεργάτες\n- Ακόλουθοι: μόνο οι ακόλουθοι του σχετικού εγγράφου\n" +"- followers: only followers of the related document or members of following channels\n" +msgstr "" #. module: mail #: model:ir.model.fields,help:mail.field_res_partner_notify_email @@ -2367,23 +2403,11 @@ msgstr "Απόρρητο" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "Ιδιωτικό κανάλι" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "Ιδιωτικά κανάλια" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "Έρευνας και ανάπτυξης (R&D)" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2869,11 +2893,6 @@ msgid "" " will be taken from the email template." msgstr "Οι τιμές που εμφανίζονται παρακάτω είναι απλά κατατοπιστικές. \nΌταν γίνεται αποστολή του email, οι τιμές θα λαμβάνονται από το πρότυπο email." -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "Δεν υπάρχουν μηνύματα προς εμφάνιση.
" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2920,6 +2939,13 @@ msgstr "Προς (Συνεργάτες)" msgid "To: Followers of" msgstr "Προς: Ακόλουθοι του" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2979,8 +3005,15 @@ msgstr "Δεν μπορεί να αποσταλεί το e-mail, παρακαλ #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -3010,28 +3043,35 @@ msgstr "Μετρητής μη αναγνωσμένων μηνυμάτων" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "Διαγραφή" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "Διαγραμμένες" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "Αποστέλεται" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "Σφάλμα κατά την μεταφόρτωση" @@ -3107,10 +3147,17 @@ msgstr "Ποιος μπορεί να ακολουθήσει τις δραστη #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:6 +#: code:addons/mail/static/src/xml/composer.xml:7 #, python-format -msgid "Write something" -msgstr "Γράψε κάτι" +msgid "Write something..." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:122 +#, python-format +msgid "Yesterday" +msgstr "" #. module: mail #. openerp-web @@ -3119,6 +3166,14 @@ msgstr "Γράψε κάτι" msgid "You added %s to the conversation." msgstr "Έχετε προστεθεί %s στη συνομιλία." +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3160,18 +3215,11 @@ msgstr "Μπορείτε να επισυνάψετε αρχεία σε αυτό #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:346 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "Έχετε διαγραφεί από %s." -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "Ο φάκελος \"Εισερχόμενα\" περιέχει όλα τα μηνύματα στα οποία έχετε αναφερθεί, και τα μηνύματα που λαμβάνετε ως ακόλουθος ενός εγγράφου.
\nΤο τμήμα \"Με αστέρι\" περιέχει όλα τα αγαπημένα σας μηνύματα." - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3190,6 +3238,11 @@ msgstr "Το πρότυπό σας θα πρέπει να καθορίσει τ msgid "base.config.settings" msgstr "base.config.settings" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3197,13 +3250,13 @@ msgstr "από" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:30 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "dm" #. module: mail -#: code:addons/mail/models/mail_thread.py:314 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "έγγραφο" @@ -3235,6 +3288,13 @@ msgstr "ir.autovacuum" msgid "members" msgstr "μέλη" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3242,7 +3302,7 @@ msgstr "mycompany.odoo.com" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3267,11 +3327,21 @@ msgstr "δημόσιο" msgid "publisher_warranty.contract" msgstr "publisher_warranty.contract" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "εγγραφή:" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/en_GB.po b/addons/mail/i18n/en_GB.po index 90eb9e4a660..f602440f592 100644 --- a/addons/mail/i18n/en_GB.po +++ b/addons/mail/i18n/en_GB.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-11-22 02:05+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/odoo/odoo-9/language/en_GB/)\n" "MIME-Version: 1.0\n" @@ -29,10 +29,10 @@ msgid "" " \n" " \n" "\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" +"
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -54,7 +54,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -135,6 +135,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -142,7 +149,7 @@ msgid "%s (copy)" msgstr "%s (copy)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "" @@ -155,9 +162,9 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:86 +#: code:addons/mail/static/src/xml/thread.xml:96 #, python-format -msgid "(in channel" +msgid "(from" msgstr "" #. module: mail @@ -437,7 +444,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "" @@ -561,16 +568,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -791,6 +788,13 @@ msgstr "" msgid "Composition mode" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -958,21 +962,14 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1459,14 +1456,6 @@ msgstr "Important Messages" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1501,7 +1490,7 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1509,7 +1498,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "" @@ -1566,6 +1562,11 @@ msgstr "Is Follower" msgid "Is Notification" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1738,6 +1739,13 @@ msgstr "" msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1763,13 +1771,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1981,12 +1982,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1996,11 +2011,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2326,7 +2362,7 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" +"- followers: only followers of the related document or members of following channels\n" msgstr "" #. module: mail @@ -2367,23 +2403,11 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2869,11 +2893,6 @@ msgid "" " will be taken from the email template." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2920,6 +2939,13 @@ msgstr "" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2979,8 +3005,15 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -3010,28 +3043,35 @@ msgstr "Unread Messages Counter" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "" @@ -3107,9 +3147,16 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:6 +#: code:addons/mail/static/src/xml/composer.xml:7 #, python-format -msgid "Write something" +msgid "Write something..." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:122 +#, python-format +msgid "Yesterday" msgstr "" #. module: mail @@ -3119,6 +3166,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3160,18 +3215,11 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:346 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3190,6 +3238,11 @@ msgstr "" msgid "base.config.settings" msgstr "base.config.settings" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3197,13 +3250,13 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:30 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:314 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "" @@ -3235,6 +3288,13 @@ msgstr "" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3242,7 +3302,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3267,11 +3327,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/es.po b/addons/mail/i18n/es.po index 047cdfed5a1..c1313517324 100644 --- a/addons/mail/i18n/es.po +++ b/addons/mail/i18n/es.po @@ -3,13 +3,15 @@ # * mail # # Translators: +# Ana Juaristi , 2015 # Pedro M. Baeza , 2015 +# Rick Hunter , 2015 msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-10-13 18:40+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Spanish (http://www.transifex.com/odoo/odoo-9/language/es/)\n" "MIME-Version: 1.0\n" @@ -29,10 +31,10 @@ msgid "" " \n" " \n" "\n" -"

\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" "
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -54,7 +56,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -79,49 +81,44 @@ msgid "" "

\n" "
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" +"
\n" +"
\n" -"
\n" -"
\n" -"
\n" -"
\n" +" \n" +" \n" +" \n" "
\n" +"
\n" +"
\n" +"
\n" +"
\n" "
\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" -"
\n" +" \n" " ${object.body | safe}\n" " % if ctx.get('tracking'):\n" +"
    \n" " % for tracking in ctx['tracking']\n" -" ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}\n" +"
  • ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}
    • \n" " % endfor\n" +"
\n" " % endif\n" "
\n" +"
\n" "
\n" "% if ctx.get('signature'):\n" -"
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -"
\n" -"  \n" -" ${ctx['signature'] | safe}\n" -"  \n" -"
\n" -"
\n" +"
\n" +" \n" +" \n" +" \n" +" \n" +"
\n" +" ${ctx['signature'] | safe}\n" +"
\n" "
\n" -"% endif\n" +"% endif" msgstr "" #. module: mail @@ -129,7 +126,7 @@ msgstr "" #: code:addons/mail/static/src/js/chat_manager.js:50 #, python-format msgid " from " -msgstr "" +msgstr "de" #. module: mail #: model:mail.template,subject:mail.mail_template_data_notification_email_default @@ -138,6 +135,13 @@ msgid "" "or (object.parent_id and object.parent_id.subject and 'Re: %s' % " "object.parent_id.subject) or (object.parent_id and " "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" +msgstr "${object.subject or (object.record_name and 'Re: %s' % object.record_name) or (object.parent_id and object.parent_id.subject and 'Re: %s' % object.parent_id.subject) or (object.parent_id and object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" msgstr "" #. module: mail @@ -147,7 +151,7 @@ msgid "%s (copy)" msgstr "%s (copia)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "%s creado" @@ -158,6 +162,13 @@ msgstr "%s creado" msgid "%s has joined the %s network." msgstr "%s se ha unido a la red %s." +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:96 +#, python-format +msgid "(from" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:48 @@ -174,9 +185,33 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:122 +#: code:addons/mail/static/src/xml/thread.xml:147 #, python-format -msgid "-------- Show more messages --------" +msgid "-------- Show older messages --------" +msgstr "-------- Mostrar mensajes antiguos--------" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:513 +#, python-format +msgid "" +"
created #%s
" +msgstr "
creado #%s
" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:489 +#, python-format +msgid "" +"
joined #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:151 +#, python-format +msgid "" +"
left #%s
" msgstr "" #. module: mail @@ -267,13 +302,6 @@ msgstr "" msgid "Access Groups" msgstr "Grupos de acceso" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/js/client_action.js:154 -#, python-format -msgid "Action" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_message_needaction #: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction @@ -418,7 +446,7 @@ msgstr "Todos los mensajes" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "Anónimo" @@ -542,16 +570,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "Disponible para envío masivo de correo" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "Buenas prácticas de ventas" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "Tablero de citas" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -639,6 +657,7 @@ msgstr "" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/client_action.xml:23 +#: code:addons/mail/static/src/xml/client_action.xml:89 #: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids @@ -771,6 +790,13 @@ msgstr "Redactar un nuevo mensaje" msgid "Composition mode" msgstr "Modo de composición" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -938,21 +964,14 @@ msgstr "Descripción que se añadirá en el mensaje mandado para este subtipo. S #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1168,7 +1187,7 @@ msgstr "Filtros extendidos..." #. module: mail #: model:ir.model.fields,field_description:mail.field_base_config_settings_fail_counter msgid "Fail Mail" -msgstr "" +msgstr "Correos Fallidos" #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_search @@ -1439,14 +1458,6 @@ msgstr "Mensajes importantes" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1481,7 +1492,7 @@ msgid "" msgstr "Expresión invalida, debe ser un diccionario python, por ejemplo \"{'field': 'value'}\"" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1489,7 +1500,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "Invitación para seguir %s: %s" @@ -1546,6 +1564,11 @@ msgstr "Es un seguidor" msgid "Is Notification" msgstr "Es una notificación" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1718,6 +1741,13 @@ msgstr "Se ha creado un correo electrónico para notificar a la gente de un mens msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1743,13 +1773,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "Los miembros de estos grupos se añadirán automáticamente como seguidores. Tenga en cuenta que podrán gestionar su suscripción manualmente si es necesario." -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1915,11 +1938,8 @@ msgstr "Nombre a usar para el archivo del informe generado (se pueden utilizar a #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_needaction -#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids #: model:ir.model.fields,help:mail.field_mail_compose_message_needaction #: model:ir.model.fields,help:mail.field_mail_mail_needaction #: model:ir.model.fields,help:mail.field_mail_message_needaction @@ -1964,12 +1984,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1979,11 +2013,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2250,6 +2305,13 @@ msgstr "Perfil de la empresa" msgid "Partners that did not ask not to be included in mass mailing campaigns" msgstr "Empresas que pidieron no ser incluidos en campañas de envío masivo de correos" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids +#: 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 "" + #. module: mail #: model:ir.model.fields,help:mail.field_email_template_preview_auto_delete #: model:ir.model.fields,help:mail.field_mail_mail_auto_delete @@ -2302,8 +2364,8 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" -msgstr "Política para enviar un mensaje en el documento usando la pasarela de correo.\n- Todos: Todos pueden enviar.\n- Empresas: Sólo las empresas autenticadas.\n- Seguidores: Sólo los seguidores del documento relacionado.\n" +"- followers: only followers of the related document or members of following channels\n" +msgstr "" #. module: mail #: model:ir.model.fields,help:mail.field_res_partner_notify_email @@ -2343,23 +2405,11 @@ msgstr "Privacidad" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "I+D" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2845,11 +2895,6 @@ msgid "" " will be taken from the email template." msgstr "Los valores que se muestran a continuación son informativos. Cuando envíe el correo electrónico, los valores serán cogidos de la plantilla." -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2896,6 +2941,13 @@ msgstr "A (empresas)" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2955,8 +3007,15 @@ msgstr "No se ha podido enviar el mensaje, por favor configure el correo electr #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -2986,28 +3045,35 @@ msgstr "Contador de mensajes no leidos" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "Anular subscripción" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "Error de subida" @@ -3082,16 +3148,17 @@ msgid "Who can follow the group's activities?" msgstr "" #. module: mail -#: model:mail.channel,name:mail.channel_all_employees -msgid "Whole Company" -msgstr "Toda la compañia" +#. openerp-web +#: code:addons/mail/static/src/xml/composer.xml:7 +#, python-format +msgid "Write something..." +msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/chatter.xml:57 -#: code:addons/mail/static/src/xml/composer.xml:7 +#: code:addons/mail/static/src/js/thread.js:122 #, python-format -msgid "Write something" +msgid "Yesterday" msgstr "" #. module: mail @@ -3101,6 +3168,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3142,18 +3217,11 @@ msgstr "Puede adjuntar archivos a esta plantilla, para ser añadidos a todos los #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:469 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3172,6 +3240,11 @@ msgstr "" msgid "base.config.settings" msgstr "base.config.settings" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3179,24 +3252,29 @@ msgstr "por" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:29 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" -msgstr "" +msgstr "dm" #. module: mail -#: code:addons/mail/models/mail_thread.py:281 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "documento" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:232 +#: code:addons/mail/static/src/js/chatter.js:220 #, python-format msgid "followers" msgstr "seguidores" +#. module: mail +#: model:mail.channel,name:mail.channel_all_employees +msgid "general" +msgstr "general" + #. module: mail #: model:ir.model,name:mail.model_ir_actions_server msgid "ir.actions.server" @@ -3205,11 +3283,18 @@ msgstr "ir.acciones.server" #. module: mail #: model:ir.model,name:mail.model_ir_autovacuum msgid "ir.autovacuum" -msgstr "" +msgstr "ir.autovacuum" #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "members" +msgstr "miembros" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." msgstr "" #. module: mail @@ -3219,7 +3304,7 @@ msgstr "mycompany.odoo.com" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3230,25 +3315,35 @@ msgstr "en" #: code:addons/mail/static/src/xml/client_action.xml:39 #, python-format msgid "private" -msgstr "" +msgstr "privado" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/client_action.xml:21 #, python-format msgid "public" -msgstr "" +msgstr "público" #. module: mail #: model:ir.model,name:mail.model_publisher_warranty_contract msgid "publisher_warranty.contract" msgstr "Contrato de garantía del publicador" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "registro:" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/es_AR.po b/addons/mail/i18n/es_AR.po index f23fd06b06b..3f153ee8fce 100644 --- a/addons/mail/i18n/es_AR.po +++ b/addons/mail/i18n/es_AR.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-10-10 09:46+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/odoo/odoo-9/language/es_AR/)\n" "MIME-Version: 1.0\n" @@ -29,10 +29,10 @@ msgid "" " \n" "
\n" "\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" "
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -54,7 +54,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -79,49 +79,44 @@ msgid "" "

\n" "
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" +"
\n" +"
\n" -"
\n" -"
\n" -"
\n" -"
\n" +" \n" +" \n" +" \n" "
\n" +"
\n" +"
\n" +"
\n" +"
\n" "
\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" -"
\n" +" \n" " ${object.body | safe}\n" " % if ctx.get('tracking'):\n" +"
    \n" " % for tracking in ctx['tracking']\n" -" ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}\n" +"
  • ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}
    • \n" " % endfor\n" +"
\n" " % endif\n" "
\n" +"
\n" "
\n" "% if ctx.get('signature'):\n" -"
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -"
\n" -"  \n" -" ${ctx['signature'] | safe}\n" -"  \n" -"
\n" -"
\n" +"
\n" +" \n" +" \n" +" \n" +" \n" +"
\n" +" ${ctx['signature'] | safe}\n" +"
\n" "
\n" -"% endif\n" +"% endif" msgstr "" #. module: mail @@ -140,6 +135,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -147,7 +149,7 @@ msgid "%s (copy)" msgstr "%s (copia)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "" @@ -158,6 +160,13 @@ msgstr "" msgid "%s has joined the %s network." msgstr "%s se ha unido a la red %s." +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:96 +#, python-format +msgid "(from" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:48 @@ -174,9 +183,33 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:122 +#: code:addons/mail/static/src/xml/thread.xml:147 #, python-format -msgid "-------- Show more messages --------" +msgid "-------- Show older messages --------" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:513 +#, python-format +msgid "" +"
created #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:489 +#, python-format +msgid "" +"
joined #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:151 +#, python-format +msgid "" +"
left #%s
" msgstr "" #. module: mail @@ -267,20 +300,13 @@ msgstr "" msgid "Access Groups" msgstr "Grupos de Acceso" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/js/client_action.js:154 -#, python-format -msgid "Action" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_message_needaction #: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction #: model:ir.model.fields,field_description:mail.field_res_partner_message_needaction #: model:ir.model.fields,field_description:mail.field_res_users_message_needaction msgid "Action Needed" -msgstr "" +msgstr "Acción necesaria" #. module: mail #: model:ir.model.fields,help:mail.field_mail_message_subtype_default @@ -323,7 +349,7 @@ msgstr "Añadir Seguidores" #: model:ir.model.fields,field_description:mail.field_email_template_preview_user_signature #: model:ir.model.fields,field_description:mail.field_mail_template_user_signature msgid "Add Signature" -msgstr "" +msgstr "Añadir firma" #. module: mail #. openerp-web @@ -418,7 +444,7 @@ msgstr "Todos los mensajes" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "" @@ -436,7 +462,7 @@ msgstr "" #: model:ir.model.fields,field_description:mail.field_email_template_preview_model_id #: model:ir.model.fields,field_description:mail.field_mail_template_model_id msgid "Applies to" -msgstr "" +msgstr "Aplica a" #. module: mail #. openerp-web @@ -485,7 +511,7 @@ msgstr "Autor" #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_form msgid "Author Signature (mass mail only)" -msgstr "" +msgstr "Firma del autor (sólo para envíos masivos)" #. module: mail #: model:ir.model.fields,help:mail.field_mail_compose_message_author_id @@ -540,17 +566,7 @@ msgstr "" #. module: mail #: model:ir.ui.view,arch_db:mail.res_partner_opt_out_search msgid "Available for mass mailing" -msgstr "" - -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "Buenas Prácticas de Ventas" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "Tablero de reuniones" +msgstr "Disponible para envío masivo de correo" #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html @@ -600,7 +616,7 @@ msgstr "Destinatarios en copia carbón del mensaje" #: model:ir.model.fields,help:mail.field_email_template_preview_email_cc #: model:ir.model.fields,help:mail.field_mail_template_email_cc msgid "Carbon copy recipients (placeholders may be used here)" -msgstr "" +msgstr "Destinatarios para copia carbón (se pueden utilizar aquí expresiones de campos)" #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_email_cc @@ -639,6 +655,7 @@ msgstr "" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/client_action.xml:23 +#: code:addons/mail/static/src/xml/client_action.xml:89 #: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids @@ -682,12 +699,12 @@ msgstr "Mensajes Hijos" #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "Choose a template to display its values." -msgstr "" +msgstr "Escoja una plantilla para visualizar sus valores" #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "Choose an example" -msgstr "" +msgstr "Elija un ejemplo" #. module: mail #: code:addons/mail/models/mail_thread.py:308 @@ -719,12 +736,12 @@ msgstr "Cerrado" #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_form msgid "Comma-separated carbon copy recipients addresses" -msgstr "" +msgstr "Direcciones CC separadas por comas" #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_form msgid "Comma-separated ids of recipient partners" -msgstr "" +msgstr "IDs de destinatarios separados por comas" #. module: mail #: model:ir.model.fields,help:mail.field_email_template_preview_partner_to @@ -732,19 +749,19 @@ msgstr "" #: model:ir.model.fields,help:mail.field_mail_template_partner_to msgid "" "Comma-separated ids of recipient partners (placeholders may be used here)" -msgstr "" +msgstr "Ids de destinatarios separados por comas (puede usar \"marcadores\")" #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_form msgid "Comma-separated recipient addresses" -msgstr "" +msgstr "Direcciones de destinatarios separadas por comas" #. module: mail #: model:ir.model.fields,help:mail.field_email_template_preview_email_to #: model:ir.model.fields,help:mail.field_ir_act_server_email_to #: model:ir.model.fields,help:mail.field_mail_template_email_to msgid "Comma-separated recipient addresses (placeholders may be used here)" -msgstr "" +msgstr "Destinatarios separados por comas (se pueden utilizar aquí expresiones de campos)" #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_search @@ -771,6 +788,13 @@ msgstr "Redactar un nuevo Mensaje" msgid "Composition mode" msgstr "Modo de composición" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -898,7 +922,7 @@ msgstr "Valores por defecto" #: model:ir.model.fields,field_description:mail.field_email_template_preview_use_default_to #: model:ir.model.fields,field_description:mail.field_mail_template_use_default_to msgid "Default recipients" -msgstr "" +msgstr "Destinatarios por defecto" #. module: mail #: model:ir.model.fields,help:mail.field_email_template_preview_use_default_to @@ -907,7 +931,7 @@ msgid "" "Default recipients of the record:\n" "- partner (using id on a partner or the partner_id field) OR\n" "- email (using email_from or email field)" -msgstr "" +msgstr "Destinatarios por defecto del registro:\n- Empresa (usando el id de la empresa o del campo partner_id) O\n- Correo electrónico (usando los campos email_from o email)" #. module: mail #. openerp-web @@ -938,21 +962,14 @@ msgstr "Descripción que se añadirá en el mensaje mandado para este subtipo. S #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -989,14 +1006,14 @@ msgstr "Debates" #: model:ir.model.fields,field_description:mail.field_mail_wizard_invite_display_name #: model:ir.model.fields,field_description:mail.field_publisher_warranty_contract_display_name msgid "Display Name" -msgstr "" +msgstr "Mostrar Nombre" #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_form msgid "" "Display an option on related documents to open a composition wizard with " "this template" -msgstr "" +msgstr "Mostrar una opción en el documento relacionado para abrir un asistente de composición con esta plantilla" #. module: mail #: model:ir.model,name:mail.model_mail_followers @@ -1006,7 +1023,7 @@ msgstr "Seguidores del Documento" #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_form msgid "Dynamic Placeholder Generator" -msgstr "" +msgstr "Generador dinámico de expresiones con marcadores de posición" #. module: mail #. openerp-web @@ -1054,7 +1071,7 @@ msgstr "" #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "Email Preview" -msgstr "" +msgstr "Vista preliminar email" #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_search @@ -1074,7 +1091,7 @@ msgstr "Plantilla de Email" #. module: mail #: model:ir.model,name:mail.model_email_template_preview msgid "Email Template Preview" -msgstr "" +msgstr "Vista preliminar de la plantilla del email" #. module: mail #: model:ir.model,name:mail.model_mail_template @@ -1231,7 +1248,7 @@ msgstr "Campo usado para enlazar el modelo relacionado al modelo de subtipo cuan msgid "" "Final placeholder expression, to be copy-pasted in the desired template " "field." -msgstr "" +msgstr "Expresión de campos final, a ser copia-pegada en el campo de la plantilla deseado." #. module: mail #: selection:mail.channel.partner,fold_state:0 @@ -1263,7 +1280,7 @@ msgstr "Seguidores" #: model:ir.model.fields,field_description:mail.field_res_partner_message_channel_ids #: model:ir.model.fields,field_description:mail.field_res_users_message_channel_ids msgid "Followers (Channels)" -msgstr "" +msgstr "Seguidores (Canales)" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_message_partner_ids @@ -1271,7 +1288,7 @@ msgstr "" #: model:ir.model.fields,field_description:mail.field_res_partner_message_partner_ids #: model:ir.model.fields,field_description:mail.field_res_users_message_partner_ids msgid "Followers (Partners)" -msgstr "" +msgstr "Seguidores (Proveedores)" #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_subscription_form @@ -1320,7 +1337,7 @@ msgstr "Agrupar por" #. module: mail #: model:ir.ui.view,arch_db:mail.view_email_template_search msgid "Group by..." -msgstr "" +msgstr "Agrupado por..." #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_tree @@ -1420,7 +1437,7 @@ msgid "" "If opt-out is checked, this contact has refused to receive emails for mass " "mailing and marketing campaign. Filter 'Available for Mass Mailing' allows " "users to filter the partners when performing mass mailing." -msgstr "" +msgstr "Si 'No acepta mensajes' está marcado, este contacto ha rehusado recibir correos electrónicos de envíos masivos y campañas de marketing. El filtro 'Disponible para envíos masivos' permite a los usuarios filtrar a las empresas cuando se realicen envíos masivos." #. module: mail #: model:ir.model.fields,help:mail.field_base_config_settings_alias_domain @@ -1432,21 +1449,13 @@ msgstr "" #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban msgid "Important Messages" -msgstr "" +msgstr "Mensajes importantes" #. module: mail #: model:ir.ui.view,arch_db:mail.view_message_search msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1481,7 +1490,7 @@ msgid "" msgstr "Expresión invalida, debe ser un diccionario python, por ejemplo \"{'field': 'value'}\"" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1489,7 +1498,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "" @@ -1539,13 +1555,18 @@ msgstr "" #: model:ir.model.fields,field_description:mail.field_res_partner_message_is_follower #: model:ir.model.fields,field_description:mail.field_res_users_message_is_follower msgid "Is Follower" -msgstr "" +msgstr "Es un Seguidor" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_mail_notification msgid "Is Notification" msgstr "Es una Notificación" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1718,6 +1739,13 @@ msgstr "" msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1743,13 +1771,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "Los miembros de estos grupos se añadirán automáticamente como seguidores. Tenga en cuenta que podrán gestionar su suscripción manualmente si es necesario." -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1915,11 +1936,8 @@ msgstr "Nombre a usar para el archivo del informe generado (se pueden utilizar a #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_needaction -#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids #: model:ir.model.fields,help:mail.field_mail_compose_message_needaction #: model:ir.model.fields,help:mail.field_mail_mail_needaction #: model:ir.model.fields,help:mail.field_mail_message_needaction @@ -1964,12 +1982,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1979,11 +2011,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2024,7 +2077,7 @@ msgstr "" #: model:ir.model.fields,field_description:mail.field_res_partner_message_needaction_counter #: model:ir.model.fields,field_description:mail.field_res_users_message_needaction_counter msgid "Number of Actions" -msgstr "" +msgstr "Número de Acciones" #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_message_needaction_counter @@ -2040,7 +2093,7 @@ msgstr "" #: model:ir.model.fields,help:mail.field_res_partner_message_unread_counter #: model:ir.model.fields,help:mail.field_res_users_message_unread_counter msgid "Number of unread messages" -msgstr "" +msgstr "Número de mensajes no leídos" #. module: mail #: model:ir.actions.act_window,help:mail.action_contacts @@ -2137,7 +2190,7 @@ msgstr "Servidor de salida preferido opcional. Si no está establecido, se usar #: model:ir.model.fields,field_description:mail.field_email_template_preview_report_template #: model:ir.model.fields,field_description:mail.field_mail_template_report_template msgid "Optional report to print and attach" -msgstr "" +msgstr "Informe opcional a generar y adjuntar" #. module: mail #: model:ir.model.fields,help:mail.field_email_template_preview_lang @@ -2147,13 +2200,13 @@ msgid "" "email. If not set, the english version will be used. This should usually be " "a placeholder expression that provides the appropriate language, e.g. " "${object.partner_id.lang}." -msgstr "" +msgstr "Lenguaje de traducción opcional (código ISO) para seleccionar cuando se está enviando un correo electrónico. Si no esta activado la versión inglesa es la que se usará. Esto normalmente debería ser una expresión con marcadores de posición que provee el lenguaje apropiado. Por ejemplo: ${object.partner_id.lang}." #. module: mail #: model:ir.model.fields,help:mail.field_email_template_preview_null_value #: model:ir.model.fields,help:mail.field_mail_template_null_value msgid "Optional value to use if the target field is empty" -msgstr "" +msgstr "Valor opcional a usar si el campo objetivo está vacío" #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_search selection:mail.mail,state:0 @@ -2181,7 +2234,7 @@ msgstr "Servidor de correos saliente" #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_form msgid "Override author's email" -msgstr "" +msgstr "Sobreescribir correo electrónico del autor" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_alias_alias_user_id @@ -2248,6 +2301,13 @@ msgstr "" #. module: mail #: model:ir.ui.view,arch_db:mail.res_partner_opt_out_search msgid "Partners that did not ask not to be included in mass mailing campaigns" +msgstr "Empresas que pidieron no ser incluidos en campañas de envío masivo de correos" + +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids +#: 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 "" #. module: mail @@ -2302,7 +2362,7 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" +"- followers: only followers of the related document or members of following channels\n" msgstr "" #. module: mail @@ -2317,13 +2377,13 @@ msgstr "" #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_form msgid "Preferred reply address" -msgstr "" +msgstr "Dirección de respuesta favorita" #. module: mail #: model:ir.model.fields,help:mail.field_email_template_preview_reply_to #: model:ir.model.fields,help:mail.field_mail_template_reply_to msgid "Preferred response address (placeholders may be used here)" -msgstr "" +msgstr "Dirección de respuesta preferida (se pueden utilizar aquí expresiones de campo)" #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_form @@ -2343,23 +2403,11 @@ msgstr "Privacidad" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "R&D" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2436,7 +2484,7 @@ msgstr "Campo de relación" #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_form msgid "Remove the contextual action to use this template on related documents" -msgstr "" +msgstr "Borrar la acción conceptual para usar esta plantilla en documentos relacionados." #. module: mail #. openerp-web @@ -2495,7 +2543,7 @@ msgstr "Mensaje en texto enriquecido/HTML" #: model:ir.model.fields,help:mail.field_ir_act_server_body_html #: model:ir.model.fields,help:mail.field_mail_template_body_html msgid "Rich-text/HTML version of the message (placeholders may be used here)" -msgstr "" +msgstr "Versión de texto enriquecido/HTML del mensaje (se pueden utilizar aquí expresiones de campo)" #. module: mail #: model:ir.ui.view,arch_db:mail.view_email_template_search @@ -2564,7 +2612,7 @@ msgstr "Enviar correo electrónico" #: code:addons/mail/models/mail_template.py:237 #, python-format msgid "Send Mail (%s)" -msgstr "" +msgstr "Enviar correo (%s)" #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form @@ -2586,7 +2634,7 @@ msgstr "" msgid "" "Sender address (placeholders may be used here). If not set, the default " "value will be the author's email alias if configured, or email address." -msgstr "" +msgstr "Dirección del remitente (se pueden usar expresiones de campo aquí). Si no se establece, el valor por defecto será el alias de correo del autor si está configurado, o la dirección de correo." #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_search selection:mail.mail,state:0 @@ -2625,7 +2673,7 @@ msgstr "Abreviación" #: model:ir.model.fields,field_description:mail.field_email_template_preview_ref_ir_value #: model:ir.model.fields,field_description:mail.field_mail_template_ref_ir_value msgid "Sidebar Button" -msgstr "" +msgstr "Botón en la barra lateral" #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_ref_ir_act_window @@ -2721,7 +2769,7 @@ msgstr "Asunto" #: model:ir.model.fields,help:mail.field_mail_template_subject #: model:ir.ui.view,arch_db:mail.email_template_form msgid "Subject (placeholders may be used here)" -msgstr "" +msgstr "Asunto (se pueden utilizar aquí expresiones de campos)" #. module: mail #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form @@ -2791,7 +2839,7 @@ msgstr "" #: model:ir.model.fields,help:mail.field_email_template_preview_model_id #: model:ir.model.fields,help:mail.field_mail_template_model_id msgid "The kind of document with with this template can be used" -msgstr "" +msgstr "La clase de documento con el que esta plantilla puede ser usada" #. module: mail #: model:ir.model.fields,help:mail.field_mail_alias_alias_model_id @@ -2843,12 +2891,7 @@ msgstr "" msgid "" "The values displayed hereunder are informative. When sending the email, the values\n" " will be taken from the email template." -msgstr "" - -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" +msgstr "Los valores que se muestran a continuación son informativos. Cuando envíe el correo electrónico, los valores serán cogidos de la plantilla." #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image @@ -2887,7 +2930,7 @@ msgstr "Para (correos electrónicos)" #: model:ir.model.fields,field_description:mail.field_mail_mail_recipient_ids #: model:ir.model.fields,field_description:mail.field_mail_template_partner_to msgid "To (Partners)" -msgstr "" +msgstr "A (empresas)" #. module: mail #. openerp-web @@ -2896,6 +2939,13 @@ msgstr "" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2955,8 +3005,15 @@ msgstr "No se ha podido enviar el email, por favor configure el correo electrón #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -2982,32 +3039,39 @@ msgstr "Mensajes no leídos" #: model:ir.model.fields,field_description:mail.field_res_partner_message_unread_counter #: model:ir.model.fields,field_description:mail.field_res_users_message_unread_counter msgid "Unread Messages Counter" +msgstr "Contador de Mensajes No Leídos" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "Desuscribirse" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "Error de subida" @@ -3082,16 +3146,17 @@ msgid "Who can follow the group's activities?" msgstr "" #. module: mail -#: model:mail.channel,name:mail.channel_all_employees -msgid "Whole Company" -msgstr "Toda la Compañía" +#. openerp-web +#: code:addons/mail/static/src/xml/composer.xml:7 +#, python-format +msgid "Write something..." +msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/chatter.xml:57 -#: code:addons/mail/static/src/xml/composer.xml:7 +#: code:addons/mail/static/src/js/thread.js:122 #, python-format -msgid "Write something" +msgid "Yesterday" msgstr "" #. module: mail @@ -3101,6 +3166,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3138,22 +3211,15 @@ msgstr "" msgid "" "You may attach files to this template, to be added to all emails created " "from this template" -msgstr "" +msgstr "Puede adjuntar archivos a esta plantilla, para ser añadidos a todos los e-mails creados desde ella." #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:469 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3172,6 +3238,11 @@ msgstr "" msgid "base.config.settings" msgstr "base.config.settings" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3179,24 +3250,29 @@ msgstr "por" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:29 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:281 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:232 +#: code:addons/mail/static/src/js/chatter.js:220 #, python-format msgid "followers" msgstr "seguidores" +#. module: mail +#: model:mail.channel,name:mail.channel_all_employees +msgid "general" +msgstr "" + #. module: mail #: model:ir.model,name:mail.model_ir_actions_server msgid "ir.actions.server" @@ -3212,6 +3288,13 @@ msgstr "" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3219,7 +3302,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3244,9 +3327,19 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "publisher_warranty.contract" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" +msgstr "registro:" + +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" msgstr "" #. module: mail diff --git a/addons/mail/i18n/es_BO.po b/addons/mail/i18n/es_BO.po index ca5d6b126ca..e96de7813d9 100644 --- a/addons/mail/i18n/es_BO.po +++ b/addons/mail/i18n/es_BO.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-10-10 09:46+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 15:32+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Spanish (Bolivia) (http://www.transifex.com/odoo/odoo-9/language/es_BO/)\n" "MIME-Version: 1.0\n" @@ -28,10 +28,10 @@ msgid "" " \n" "
\n" "\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" "
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -53,7 +53,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -78,49 +78,44 @@ msgid "" "

\n" "
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" +"
\n" +"
\n" -"
\n" -"
\n" -"
\n" -"
\n" +" \n" +" \n" +" \n" "
\n" +"
\n" +"
\n" +"
\n" +"
\n" "
\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" -"
\n" +" \n" " ${object.body | safe}\n" " % if ctx.get('tracking'):\n" +"
    \n" " % for tracking in ctx['tracking']\n" -" ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}\n" +"
  • ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}
    • \n" " % endfor\n" +"
\n" " % endif\n" "
\n" +" \n" +" \n" "
\n" "% if ctx.get('signature'):\n" -"
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -"
\n" -"  \n" -" ${ctx['signature'] | safe}\n" -"  \n" -"
\n" -"
\n" +"
\n" +" \n" +" \n" +" \n" +" \n" +"
\n" +" ${ctx['signature'] | safe}\n" +"
\n" "
\n" -"% endif\n" +"% endif" msgstr "" #. module: mail @@ -139,6 +134,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -146,7 +148,7 @@ msgid "%s (copy)" msgstr "%s (copiar)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "" @@ -157,6 +159,13 @@ msgstr "" msgid "%s has joined the %s network." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:96 +#, python-format +msgid "(from" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:48 @@ -173,9 +182,33 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:122 +#: code:addons/mail/static/src/xml/thread.xml:147 #, python-format -msgid "-------- Show more messages --------" +msgid "-------- Show older messages --------" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:513 +#, python-format +msgid "" +"
created #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:489 +#, python-format +msgid "" +"
joined #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:151 +#, python-format +msgid "" +"
left #%s
" msgstr "" #. module: mail @@ -266,13 +299,6 @@ msgstr "" msgid "Access Groups" msgstr "" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/js/client_action.js:154 -#, python-format -msgid "Action" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_message_needaction #: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction @@ -417,7 +443,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "" @@ -541,16 +567,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -638,6 +654,7 @@ msgstr "" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/client_action.xml:23 +#: code:addons/mail/static/src/xml/client_action.xml:89 #: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids @@ -770,11 +787,18 @@ msgstr "" msgid "Composition mode" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts msgid "Contacts" -msgstr "" +msgstr "Contactos" #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_form @@ -937,21 +961,14 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1438,14 +1455,6 @@ msgstr "" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1480,7 +1489,7 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1488,7 +1497,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "" @@ -1545,6 +1561,11 @@ msgstr "" msgid "Is Notification" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1717,6 +1738,13 @@ msgstr "" msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1742,13 +1770,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1914,11 +1935,8 @@ msgstr "" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_needaction -#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids #: model:ir.model.fields,help:mail.field_mail_compose_message_needaction #: model:ir.model.fields,help:mail.field_mail_mail_needaction #: model:ir.model.fields,help:mail.field_mail_message_needaction @@ -1963,12 +1981,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1978,11 +2010,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2249,6 +2302,13 @@ msgstr "" msgid "Partners that did not ask not to be included in mass mailing campaigns" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids +#: 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 "" + #. module: mail #: model:ir.model.fields,help:mail.field_email_template_preview_auto_delete #: model:ir.model.fields,help:mail.field_mail_mail_auto_delete @@ -2301,7 +2361,7 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" +"- followers: only followers of the related document or members of following channels\n" msgstr "" #. module: mail @@ -2342,23 +2402,11 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2844,11 +2892,6 @@ msgid "" " will be taken from the email template." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2895,6 +2938,13 @@ msgstr "" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2954,8 +3004,15 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -2985,28 +3042,35 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "" @@ -3081,16 +3145,17 @@ msgid "Who can follow the group's activities?" msgstr "" #. module: mail -#: model:mail.channel,name:mail.channel_all_employees -msgid "Whole Company" +#. openerp-web +#: code:addons/mail/static/src/xml/composer.xml:7 +#, python-format +msgid "Write something..." msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/chatter.xml:57 -#: code:addons/mail/static/src/xml/composer.xml:7 +#: code:addons/mail/static/src/js/thread.js:122 #, python-format -msgid "Write something" +msgid "Yesterday" msgstr "" #. module: mail @@ -3100,6 +3165,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3141,18 +3214,11 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:469 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3171,6 +3237,11 @@ msgstr "" msgid "base.config.settings" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3178,24 +3249,29 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:29 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:281 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:232 +#: code:addons/mail/static/src/js/chatter.js:220 #, python-format msgid "followers" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_all_employees +msgid "general" +msgstr "" + #. module: mail #: model:ir.model,name:mail.model_ir_actions_server msgid "ir.actions.server" @@ -3211,6 +3287,13 @@ msgstr "" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3218,7 +3301,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3243,11 +3326,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/es_CL.po b/addons/mail/i18n/es_CL.po index 18d4bc70fef..8b3cc9621e6 100644 --- a/addons/mail/i18n/es_CL.po +++ b/addons/mail/i18n/es_CL.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-11-13 00:35+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Spanish (Chile) (http://www.transifex.com/odoo/odoo-9/language/es_CL/)\n" "MIME-Version: 1.0\n" @@ -28,10 +28,10 @@ msgid "" " \n" "
\n" "\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" +"
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -53,7 +53,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -134,6 +134,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -141,7 +148,7 @@ msgid "%s (copy)" msgstr "%s (copiar)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "" @@ -154,9 +161,9 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:86 +#: code:addons/mail/static/src/xml/thread.xml:96 #, python-format -msgid "(in channel" +msgid "(from" msgstr "" #. module: mail @@ -436,7 +443,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "" @@ -560,16 +567,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -790,6 +787,13 @@ msgstr "" msgid "Composition mode" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -957,21 +961,14 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1458,14 +1455,6 @@ msgstr "" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1500,7 +1489,7 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1508,7 +1497,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "" @@ -1565,6 +1561,11 @@ msgstr "Es un seguidor" msgid "Is Notification" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1737,6 +1738,13 @@ msgstr "" msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1762,13 +1770,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1980,12 +1981,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1995,11 +2010,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2325,7 +2361,7 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" +"- followers: only followers of the related document or members of following channels\n" msgstr "" #. module: mail @@ -2366,23 +2402,11 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2868,11 +2892,6 @@ msgid "" " will be taken from the email template." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2919,6 +2938,13 @@ msgstr "" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2978,8 +3004,15 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -3009,28 +3042,35 @@ msgstr "Contador de mensajes no leídos" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "" @@ -3106,9 +3146,16 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:6 +#: code:addons/mail/static/src/xml/composer.xml:7 #, python-format -msgid "Write something" +msgid "Write something..." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:122 +#, python-format +msgid "Yesterday" msgstr "" #. module: mail @@ -3118,6 +3165,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3159,18 +3214,11 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:346 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3189,6 +3237,11 @@ msgstr "" msgid "base.config.settings" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3196,13 +3249,13 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:30 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:314 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "" @@ -3234,6 +3287,13 @@ msgstr "" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3241,7 +3301,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3266,11 +3326,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/es_CO.po b/addons/mail/i18n/es_CO.po index c53673da25c..5108b440d96 100644 --- a/addons/mail/i18n/es_CO.po +++ b/addons/mail/i18n/es_CO.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-12-04 20:08+0000\n" -"Last-Translator: Mateo Tibaquirá \n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" +"Last-Translator: Martin Trigaux\n" "Language-Team: Spanish (Colombia) (http://www.transifex.com/odoo/odoo-9/language/es_CO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,10 +29,10 @@ msgid "" " \n" " \n" "\n" -"

\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" +"
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -54,7 +54,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -135,6 +135,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "${object.subject or (object.record_name and 'Re: %s' % object.record_name) or (object.parent_id and object.parent_id.subject and 'Re: %s' % object.parent_id.subject) or (object.parent_id and object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -142,7 +149,7 @@ msgid "%s (copy)" msgstr "%s (copia)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "%s creado/a" @@ -155,10 +162,10 @@ msgstr "%s se ha unido a la red %s." #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:86 +#: code:addons/mail/static/src/xml/thread.xml:96 #, python-format -msgid "(in channel" -msgstr "(en el canal" +msgid "(from" +msgstr "" #. module: mail #. openerp-web @@ -437,7 +444,7 @@ msgstr "Todos los Mensajes" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "Anónimo" @@ -561,16 +568,6 @@ msgstr "Automáticamente fijar acción necesaria como Leer" msgid "Available for mass mailing" msgstr "Disponible para envíos masivos" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "Mejores Prácticas de Ventas" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "Tablero de citas" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -791,6 +788,13 @@ msgstr "Redactar Nuevo Mensaje" msgid "Composition mode" msgstr "Modo de redacción" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -958,21 +962,14 @@ msgstr "Descripción que será añadida en el mensaje enviado para este subtipo. #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "Sabía que? Puede escribir '@alguien' para mencionar a alguien en su mensaje, y que se le notifique automáticamente en su inbox." - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "Mensajes Directos" @@ -1459,14 +1456,6 @@ msgstr "Mensajes Importantes" msgid "Important messages" msgstr "Mensajes importantes" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1501,7 +1490,7 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1509,7 +1498,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "Invitación a seguir %s: %s" @@ -1566,6 +1562,11 @@ msgstr "Es Seguidor" msgid "Is Notification" msgstr "Es Notificación" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1738,6 +1739,13 @@ msgstr "" msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1763,13 +1771,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "Mención(es):" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1981,12 +1982,26 @@ msgstr "Nuevo Texto" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "Nuevo mensaje" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1996,11 +2011,32 @@ msgstr "Nuevas personas" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "Sin seguidores" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2326,8 +2362,8 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" -msgstr "Política para enviar un mensaje en el documento usando la pasarela de correo.\n- todos: todos pueden enviar\n- asociados: sólo asociados autenticados\n- seguidores: sólo los seguidores del documento relacionado\n" +"- followers: only followers of the related document or members of following channels\n" +msgstr "" #. module: mail #: model:ir.model.fields,help:mail.field_res_partner_notify_email @@ -2367,23 +2403,11 @@ msgstr "Privacidad" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "Canal Privado" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "Canales Privados" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "I+D" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2869,11 +2893,6 @@ msgid "" " will be taken from the email template." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "No hay mensajes para mostrar.
" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2920,6 +2939,13 @@ msgstr "A (Asociados)" msgid "To: Followers of" msgstr "A: Seguidores de" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2979,8 +3005,15 @@ msgstr "No se ha podido enviar el correo, por favor configure el correo o el ali #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -3010,28 +3043,35 @@ msgstr "Contador de Mensajes no Leídos" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "Anular Suscripción" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "Dado de baja" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "Subiendo" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "Error de carga" @@ -3107,10 +3147,17 @@ msgstr "Quien puede seguir las actividades del grupo?" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:6 +#: code:addons/mail/static/src/xml/composer.xml:7 #, python-format -msgid "Write something" -msgstr "Escribe algo" +msgid "Write something..." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:122 +#, python-format +msgid "Yesterday" +msgstr "" #. module: mail #. openerp-web @@ -3119,6 +3166,14 @@ msgstr "Escribe algo" msgid "You added %s to the conversation." msgstr "Usted añadió a %s a la conversación." +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3160,18 +3215,11 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:346 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "Usted se dió de baja de %s." -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "Su \"Inbox\" contiene todos los mensajes en los que usted ha sido mencionado/a, y los mensajes que ha recibido como seguidor/a de un documento.
\nLa sección \"Destacados\" contiene todos sus mensajes favoritos." - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3190,6 +3238,11 @@ msgstr "" msgid "base.config.settings" msgstr "base.config.settings" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3197,13 +3250,13 @@ msgstr "por" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:30 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "md" #. module: mail -#: code:addons/mail/models/mail_thread.py:314 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "documento" @@ -3235,6 +3288,13 @@ msgstr "ir.autovacuum" msgid "members" msgstr "miembros" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3242,7 +3302,7 @@ msgstr "miempresa.odoo.com" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3267,11 +3327,21 @@ msgstr "público" msgid "publisher_warranty.contract" msgstr "publisher_warranty.contract" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "registro:" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/es_CR.po b/addons/mail/i18n/es_CR.po index dea138b7340..8b8a5c87a02 100644 --- a/addons/mail/i18n/es_CR.po +++ b/addons/mail/i18n/es_CR.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-10-10 09:46+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Spanish (Costa Rica) (http://www.transifex.com/odoo/odoo-9/language/es_CR/)\n" "MIME-Version: 1.0\n" @@ -28,10 +28,10 @@ msgid "" " \n" " \n" "\n" -"

\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" "
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -53,7 +53,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -78,49 +78,44 @@ msgid "" "

\n" "
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" +"
\n" +"
\n" -"
\n" -"
\n" -"
\n" -"
\n" +" \n" +" \n" +" \n" "
\n" +"
\n" +"
\n" +"
\n" +"
\n" "
\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" -"
\n" +" \n" " ${object.body | safe}\n" " % if ctx.get('tracking'):\n" +"
    \n" " % for tracking in ctx['tracking']\n" -" ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}\n" +"
  • ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}
    • \n" " % endfor\n" +"
\n" " % endif\n" "
\n" +"
\n" "
\n" "% if ctx.get('signature'):\n" -"
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -"
\n" -"  \n" -" ${ctx['signature'] | safe}\n" -"  \n" -"
\n" -"
\n" +"
\n" +" \n" +" \n" +" \n" +" \n" +"
\n" +" ${ctx['signature'] | safe}\n" +"
\n" "
\n" -"% endif\n" +"% endif" msgstr "" #. module: mail @@ -139,6 +134,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -146,7 +148,7 @@ msgid "%s (copy)" msgstr "%s (copia)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "" @@ -157,6 +159,13 @@ msgstr "" msgid "%s has joined the %s network." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:96 +#, python-format +msgid "(from" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:48 @@ -173,9 +182,33 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:122 +#: code:addons/mail/static/src/xml/thread.xml:147 #, python-format -msgid "-------- Show more messages --------" +msgid "-------- Show older messages --------" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:513 +#, python-format +msgid "" +"
created #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:489 +#, python-format +msgid "" +"
joined #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:151 +#, python-format +msgid "" +"
left #%s
" msgstr "" #. module: mail @@ -266,13 +299,6 @@ msgstr "" msgid "Access Groups" msgstr "Grupos de acceso" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/js/client_action.js:154 -#, python-format -msgid "Action" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_message_needaction #: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction @@ -417,7 +443,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "" @@ -541,16 +567,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -638,6 +654,7 @@ msgstr "" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/client_action.xml:23 +#: code:addons/mail/static/src/xml/client_action.xml:89 #: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids @@ -770,6 +787,13 @@ msgstr "" msgid "Composition mode" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -937,21 +961,14 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1438,14 +1455,6 @@ msgstr "" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1480,7 +1489,7 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1488,7 +1497,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "" @@ -1545,6 +1561,11 @@ msgstr "" msgid "Is Notification" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1717,6 +1738,13 @@ msgstr "" msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1742,13 +1770,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1914,11 +1935,8 @@ msgstr "Nombre que se utilizará para el archivo de informe generado (puede cont #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_needaction -#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids #: model:ir.model.fields,help:mail.field_mail_compose_message_needaction #: model:ir.model.fields,help:mail.field_mail_mail_needaction #: model:ir.model.fields,help:mail.field_mail_message_needaction @@ -1963,12 +1981,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1978,11 +2010,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2249,6 +2302,13 @@ msgstr "" msgid "Partners that did not ask not to be included in mass mailing campaigns" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids +#: 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 "" + #. module: mail #: model:ir.model.fields,help:mail.field_email_template_preview_auto_delete #: model:ir.model.fields,help:mail.field_mail_mail_auto_delete @@ -2301,7 +2361,7 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" +"- followers: only followers of the related document or members of following channels\n" msgstr "" #. module: mail @@ -2342,23 +2402,11 @@ msgstr "Privacidad" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2844,11 +2892,6 @@ msgid "" " will be taken from the email template." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2895,6 +2938,13 @@ msgstr "" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2954,8 +3004,15 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -2985,28 +3042,35 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "" @@ -3081,16 +3145,17 @@ msgid "Who can follow the group's activities?" msgstr "" #. module: mail -#: model:mail.channel,name:mail.channel_all_employees -msgid "Whole Company" +#. openerp-web +#: code:addons/mail/static/src/xml/composer.xml:7 +#, python-format +msgid "Write something..." msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/chatter.xml:57 -#: code:addons/mail/static/src/xml/composer.xml:7 +#: code:addons/mail/static/src/js/thread.js:122 #, python-format -msgid "Write something" +msgid "Yesterday" msgstr "" #. module: mail @@ -3100,6 +3165,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3141,18 +3214,11 @@ msgstr "Puede adjuntar archivos a esta plantilla, que se añade a todos los corr #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:469 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3171,6 +3237,11 @@ msgstr "" msgid "base.config.settings" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3178,24 +3249,29 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:29 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:281 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:232 +#: code:addons/mail/static/src/js/chatter.js:220 #, python-format msgid "followers" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_all_employees +msgid "general" +msgstr "" + #. module: mail #: model:ir.model,name:mail.model_ir_actions_server msgid "ir.actions.server" @@ -3211,6 +3287,13 @@ msgstr "" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3218,7 +3301,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3243,11 +3326,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/es_DO.po b/addons/mail/i18n/es_DO.po index 8b1e431d9f6..6b54e387e39 100644 --- a/addons/mail/i18n/es_DO.po +++ b/addons/mail/i18n/es_DO.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-11-08 17:06+0000\n" -"Last-Translator: Eneldo Serrata \n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" +"Last-Translator: Martin Trigaux\n" "Language-Team: Spanish (Dominican Republic) (http://www.transifex.com/odoo/odoo-9/language/es_DO/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,10 +29,10 @@ msgid "" " \n" "
\n" "\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" +"
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -54,7 +54,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -135,6 +135,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -142,7 +149,7 @@ msgid "%s (copy)" msgstr "%s (copia)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "%s creado" @@ -155,9 +162,9 @@ msgstr "%s se ha unido a la red %s." #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:86 +#: code:addons/mail/static/src/xml/thread.xml:96 #, python-format -msgid "(in channel" +msgid "(from" msgstr "" #. module: mail @@ -437,7 +444,7 @@ msgstr "Todos los mensajes" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "Anónimo" @@ -561,16 +568,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "Disponible para envío masivo de correo" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "Buenas prácticas de ventas" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "Tablero de citas" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -791,6 +788,13 @@ msgstr "Redactar un nuevo mensaje" msgid "Composition mode" msgstr "Modo de composición" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -958,21 +962,14 @@ msgstr "Descripción que se añadirá en el mensaje mandado para este subtipo. S #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1459,14 +1456,6 @@ msgstr "Mensajes importantes" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1501,7 +1490,7 @@ msgid "" msgstr "Expresión invalida, debe ser un diccionario python, por ejemplo \"{'field': 'value'}\"" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1509,7 +1498,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "Invitación para seguir %s: %s" @@ -1566,6 +1562,11 @@ msgstr "Es un seguidor" msgid "Is Notification" msgstr "Es una notificación" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1738,6 +1739,13 @@ msgstr "Se ha creado un correo electrónico para notificar a la gente de un mens msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1763,13 +1771,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "Los miembros de estos grupos se añadirán automáticamente como seguidores. Tenga en cuenta que podrán gestionar su suscripción manualmente si es necesario." -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1981,12 +1982,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1996,11 +2011,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2326,8 +2362,8 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" -msgstr "Política para enviar un mensaje en el documento usando la pasarela de correo.\n- Todos: Todos pueden enviar.\n- Empresas: Sólo las empresas autenticadas.\n- Seguidores: Sólo los seguidores del documento relacionado.\n" +"- followers: only followers of the related document or members of following channels\n" +msgstr "" #. module: mail #: model:ir.model.fields,help:mail.field_res_partner_notify_email @@ -2367,23 +2403,11 @@ msgstr "Privacidad" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "I+D" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2869,11 +2893,6 @@ msgid "" " will be taken from the email template." msgstr "Los valores que se muestran a continuación son informativos. Cuando envíe el correo electrónico, los valores serán cogidos de la plantilla." -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2920,6 +2939,13 @@ msgstr "A (empresas)" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2979,8 +3005,15 @@ msgstr "No se ha podido enviar el mensaje, por favor configure el correo electr #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -3010,28 +3043,35 @@ msgstr "Contador de mensajes no leidos" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "Anular subscripción" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "Error de subida" @@ -3107,9 +3147,16 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:6 +#: code:addons/mail/static/src/xml/composer.xml:7 #, python-format -msgid "Write something" +msgid "Write something..." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:122 +#, python-format +msgid "Yesterday" msgstr "" #. module: mail @@ -3119,6 +3166,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3160,18 +3215,11 @@ msgstr "Puede adjuntar archivos a esta plantilla, para ser añadidos a todos los #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:346 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3190,6 +3238,11 @@ msgstr "" msgid "base.config.settings" msgstr "base.config.settings" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3197,13 +3250,13 @@ msgstr "por" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:30 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:314 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "documento" @@ -3235,6 +3288,13 @@ msgstr "" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3242,7 +3302,7 @@ msgstr "mycompany.odoo.com" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3267,11 +3327,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "Contrato de garantía del publicador" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "registro:" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/es_EC.po b/addons/mail/i18n/es_EC.po index 71cd53fc3ec..cd0e0a46bab 100644 --- a/addons/mail/i18n/es_EC.po +++ b/addons/mail/i18n/es_EC.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-12-01 20:29+0000\n" -"Last-Translator: Rick Hunter \n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" +"Last-Translator: Martin Trigaux\n" "Language-Team: Spanish (Ecuador) (http://www.transifex.com/odoo/odoo-9/language/es_EC/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,10 +29,10 @@ msgid "" " \n" " \n" "\n" -"

\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -"
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -54,7 +54,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -117,7 +117,7 @@ msgid "" "

\n" "
\n" "% endif" -msgstr "\n
\n
\n \n \n \n
\n
\n
\n \n \n \n \n \n
\n % if ctx.get('button_access'):\n ${ctx['button_access']['title']}\n % endif\n\n % if ctx.get('button_follow'):\n ${ctx['button_follow']['title']}\n \n % elif ctx.get('button_unfollow'):\n ${ctx['button_unfollow']['title']}\n % endif\n\n % if not ctx.get('button_access') and not ctx.get('button_follow') and not ctx.get('button_unfollow') and ctx.get('model_name'):\n

\n About ${ctx['model_name']}\n % if ctx.get('record_name'):\n : ${ctx['record_name']}\n % endif\n \n

\n % endif\n 		\n

\n % if ctx.get('actions'):\n % for action in ctx['actions']:\n ${action['title']}\n %if len(ctx['actions']) > 1 and loop.index < len(ctx['actions']):\n |\n % endif\n % endfor\n % else:\n Sent by\n % if ctx.get('website_url'):\n \n % endif\n ${ctx.get('company_name')}\n % if ctx.get('website_url'):\n \n % endif\n using\n Odoo\n % endif\n

\n
\n
\n \n \n \n \n
\n
\n
\n
\n
\n
\n
\n \n \n \n \n
\n ${object.body | safe}\n % if ctx.get('tracking'):\n
    \n % for tracking in ctx['tracking']\n
  • ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}
    • \n % endfor\n
\n % endif\n
\n
\n% if ctx.get('signature'):\n
\n \n \n \n \n
\n ${ctx['signature'] | safe}\n
\n
\n% endif" +msgstr "" #. module: mail #. openerp-web @@ -135,6 +135,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "${object.subject or (object.record_name and 'Re: %s' % object.record_name) or (object.parent_id and object.parent_id.subject and 'Re: %s' % object.parent_id.subject) or (object.parent_id and object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -142,7 +149,7 @@ msgid "%s (copy)" msgstr "%s (copia)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "%s creado" @@ -155,10 +162,10 @@ msgstr "%s ha ingresado a la red %s " #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:86 +#: code:addons/mail/static/src/xml/thread.xml:96 #, python-format -msgid "(in channel" -msgstr "(en canal" +msgid "(from" +msgstr "" #. module: mail #. openerp-web @@ -172,7 +179,7 @@ msgstr "(sin dirección de correo electrónico)" msgid "" "* Smiley are only used for HTML code to display an image * Text (default " "value) is use to substitute text with another text" -msgstr "" +msgstr "* Emoticons son usados por el código HTML para mostrar una imagen. * Texto (valor predeterminado) es usado para sustituir texto con otro texto" #. module: mail #. openerp-web @@ -187,7 +194,7 @@ msgstr "-------- Mostrar mensajes antiguos --------" msgid "" "
created #%s
" -msgstr "" +msgstr "
creado #%s
" #. module: mail #: code:addons/mail/models/mail_channel.py:489 @@ -195,7 +202,7 @@ msgstr "" msgid "" "
joined #%s
" -msgstr "" +msgstr "
ingresó #%s
" #. module: mail #: code:addons/mail/models/mail_channel.py:151 @@ -203,21 +210,21 @@ msgstr "" msgid "" "
left #%s
" -msgstr "" +msgstr "
izquierda #%s
" #. module: mail #: code:addons/mail/wizard/invite.py:22 #, python-format msgid "" "

Hello,

%s invited you to follow %s document: %s.

" -msgstr "" +msgstr "

Saludos,

%s lo ha invitado a seguir el siguiente documento %s: %s.

" #. module: mail #: code:addons/mail/wizard/invite.py:25 #, python-format msgid "" "

Hello,

%s invited you to follow a new document.

" -msgstr "" +msgstr "

Saludos,

%s invitado a seguir un nuevo documento.

" #. module: mail #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form @@ -228,14 +235,14 @@ msgid "" " Followers of the document and" -msgstr "" +msgstr "\n Correo electrónico masivo on\n " #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_form msgid "" "Add\n" " Context Action" -msgstr "" +msgstr "Añadir\nAcción de Contexto" #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_form @@ -247,7 +254,7 @@ msgstr "" #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "failed emails" -msgstr "" +msgstr "email fallados" #. module: mail #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form @@ -256,21 +263,21 @@ msgid "" " not only the ids selected in the list view.
\n" " If you want to work only with selected ids, please uncheck the\n" " list header checkbox." -msgstr "" +msgstr " Todos los registros que coincidan con su filtro de búsqueda actual se enviarán \npor correo, no sólo los registros seleccionados en el listado.
\nSi quieres trabajar sólo con los registros seleccionados, por favor desmarque la\nselección correspondiente." #. module: mail #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form msgid "" "Moreover, if you want to send a lot of emails, we recommend you to use the mass mailing module.
\n" " Confirming this wizard will probably take a few minutes blocking your browser." -msgstr "" +msgstr " Por otra parte, si usted desea enviar una gran cantidad de mensajes de correo electrónico, le recomendamos que utilice el módulo de envío masivo de correo .
\nConfirmar este asistente probablemente tomará unos minutos bloqueando su navegador." #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/client_action.xml:13 #, python-format msgid "@ Inbox" -msgstr "" +msgstr "@ Bandeja de entrada" #. module: mail #: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults @@ -304,7 +311,7 @@ msgstr "Acción Requerida" #. module: mail #: model:ir.model.fields,help:mail.field_mail_message_subtype_default msgid "Activated by default when subscribing." -msgstr "" +msgstr "Activado de manera predeterminada cuando se suscriben." #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_alias_search @@ -328,7 +335,7 @@ msgstr "Actividad" #: code:addons/mail/static/src/xml/chatter.xml:144 #, python-format msgid "Add Channels" -msgstr "" +msgstr "Añadir Canales" #. module: mail #. openerp-web @@ -336,13 +343,13 @@ msgstr "" #: model:ir.ui.view,arch_db:mail.mail_wizard_invite_form #, python-format msgid "Add Followers" -msgstr "" +msgstr "Añadir Seguidores" #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_user_signature #: model:ir.model.fields,field_description:mail.field_mail_template_user_signature msgid "Add Signature" -msgstr "" +msgstr "Añadir Firma" #. module: mail #. openerp-web @@ -350,23 +357,23 @@ msgstr "" #: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Add a channel" -msgstr "" +msgstr "Añade un canal" #. module: mail #: model:ir.ui.view,arch_db:mail.mail_wizard_invite_form msgid "Add channels to notify..." -msgstr "" +msgstr "Añadir canales para notificación..." #. module: mail #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form #: model:ir.ui.view,arch_db:mail.mail_wizard_invite_form msgid "Add contacts to notify..." -msgstr "" +msgstr "Añadir contactos para notificar..." #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_partner_ids msgid "Additional Contacts" -msgstr "" +msgstr "Contactos adicionales" #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form @@ -384,63 +391,63 @@ msgstr "Configuraciones Avanzadas" #: model:ir.ui.view,arch_db:mail.view_mail_alias_form #: model:ir.ui.view,arch_db:mail.view_mail_alias_tree msgid "Alias" -msgstr "" +msgstr "Alías" #. module: mail #: model:ir.ui.view,arch_db:mail.view_users_form_mail msgid "Alias Accepts Emails From" -msgstr "" +msgstr "Aceptar correos electrónicos desde el Alías" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_alias_alias_contact #: model:ir.model.fields,field_description:mail.field_mail_channel_alias_contact #: model:ir.model.fields,field_description:mail.field_res_users_alias_contact msgid "Alias Contact Security" -msgstr "" +msgstr "Alías del Contacto de Seguridad" #. module: mail #: model:ir.model.fields,field_description:mail.field_base_config_settings_alias_domain msgid "Alias Domain" -msgstr "" +msgstr "Alías del Dominio" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_alias_alias_name #: model:ir.model.fields,field_description:mail.field_mail_channel_alias_name #: model:ir.model.fields,field_description:mail.field_res_users_alias_name msgid "Alias Name" -msgstr "" +msgstr "Nombre del Alías" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_alias_alias_domain #: model:ir.model.fields,field_description:mail.field_mail_channel_alias_domain #: model:ir.model.fields,field_description:mail.field_res_users_alias_domain msgid "Alias domain" -msgstr "" +msgstr "Alías del Dominio" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_alias_alias_model_id #: model:ir.model.fields,field_description:mail.field_mail_channel_alias_model_id #: model:ir.model.fields,field_description:mail.field_res_users_alias_model_id msgid "Aliased Model" -msgstr "" +msgstr "Alías del Modelo" #. module: mail #: model:ir.actions.act_window,name:mail.action_view_mail_alias #: model:ir.ui.menu,name:mail.mail_alias_menu msgid "Aliases" -msgstr "" +msgstr "Alías" #. module: mail #: selection:res.partner,notify_email:0 msgid "All Messages" -msgstr "" +msgstr "Todos los mensajes" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" -msgstr "" +msgstr "Anónimo" #. module: mail #: model:ir.model.fields,help:mail.field_mail_compose_message_no_auto_thread @@ -561,16 +568,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -648,12 +645,12 @@ msgstr "Canal" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_channel_type msgid "Channel Type" -msgstr "" +msgstr "Tipo de Canal" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_channel_message_ids msgid "Channel message ids" -msgstr "" +msgstr "IDS de mensajes del canal" #. module: mail #. openerp-web @@ -669,45 +666,45 @@ msgstr "" #: model:ir.ui.view,arch_db:mail.mail_channel_partner_view_tree #, python-format msgid "Channels" -msgstr "" +msgstr "Canales" #. module: mail #: model:ir.actions.act_window,name:mail.mail_channel_partner_action #: model:ir.ui.menu,name:mail.mail_channel_partner_menu msgid "Channels/Partner" -msgstr "" +msgstr "Canales/Empresas" #. module: mail #: model:ir.actions.client,name:mail.mail_channel_action_client_chat msgid "Chat" -msgstr "" +msgstr "Chat" #. module: mail #: selection:mail.channel,channel_type:0 msgid "Chat Discussion" -msgstr "" +msgstr "Chat de Discusión" #. module: mail #: model:ir.actions.act_window,name:mail.mail_shortcode_action msgid "Chat Shortcode" -msgstr "" +msgstr "Código del Chat" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_child_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_child_ids #: model:ir.model.fields,field_description:mail.field_mail_message_child_ids msgid "Child Messages" -msgstr "" +msgstr "Mensajes relacionados" #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "Choose a template to display its values." -msgstr "" +msgstr "Elija una plantilla para mostrar sus valores" #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "Choose an example" -msgstr "" +msgstr "Elija un ejemplo" #. module: mail #: code:addons/mail/models/mail_thread.py:308 @@ -791,6 +788,13 @@ msgstr "" msgid "Composition mode" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -866,7 +870,7 @@ msgstr "Creado" #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_search msgid "Creation Month" -msgstr "" +msgstr "Mes de Creación" #. module: mail #: model:ir.model.fields,help:mail.field_mail_compose_message_starred @@ -958,21 +962,14 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -980,17 +977,17 @@ msgstr "" #. module: mail #: model:ir.ui.menu,name:mail.mail_channel_menu_root_chat msgid "Discuss" -msgstr "" +msgstr "Mensajes" #. module: mail #: model:ir.model,name:mail.model_mail_channel msgid "Discussion channel" -msgstr "" +msgstr "Canal de Mensajes" #. module: mail #: model:mail.message.subtype,name:mail.mt_comment msgid "Discussions" -msgstr "" +msgstr "Mensajes" #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_display_name @@ -1021,7 +1018,7 @@ msgstr "" #. module: mail #: model:ir.model,name:mail.model_mail_followers msgid "Document Followers" -msgstr "" +msgstr "Seguidores de Documento" #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_form @@ -1053,12 +1050,12 @@ msgstr "Email" #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Email Alias" -msgstr "" +msgstr "Alías del Correo electrónico" #. module: mail #: model:ir.model,name:mail.model_mail_alias msgid "Email Aliases" -msgstr "" +msgstr "Alías del Correo Electrónico" #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_form @@ -1069,32 +1066,32 @@ msgstr "ConfigurarEmail" #: model:ir.model.fields,field_description:mail.field_res_partner_notify_email #: model:ir.model.fields,field_description:mail.field_res_users_notify_email msgid "Email Messages and Notifications" -msgstr "" +msgstr "Mensajes de Correo Electrónico y Notificaciones" #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "Email Preview" -msgstr "" +msgstr "Previsualizar Correo Electrónico" #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_search msgid "Email Search" -msgstr "" +msgstr "Búsqueda de Correo Electrónico" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_email_send msgid "Email Sent" -msgstr "" +msgstr "Correo electrónico enviado" #. module: mail #: model:ir.model.fields,field_description:mail.field_ir_act_server_template_id msgid "Email Template" -msgstr "" +msgstr "Plantilla de Correo Electrónico" #. module: mail #: model:ir.model,name:mail.model_email_template_preview msgid "Email Template Preview" -msgstr "" +msgstr "Previsualizar Plantilla de Correo Electrónico" #. module: mail #: model:ir.model,name:mail.model_mail_template @@ -1459,14 +1456,6 @@ msgstr "Mensajes Importantes" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1501,7 +1490,7 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1509,7 +1498,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "" @@ -1566,6 +1562,11 @@ msgstr "Es seguidor" msgid "Is Notification" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1721,7 +1722,7 @@ msgstr "" #: code:addons/mail/models/mail_mail.py:306 #, python-format msgid "Mail Delivery Failed" -msgstr "" +msgstr "Falló el envío de Correo" #. module: mail #: model:ir.model,name:mail.model_mail_tracking_value @@ -1738,6 +1739,13 @@ msgstr "" msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1763,13 +1771,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1981,12 +1982,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1996,11 +2011,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2326,7 +2362,7 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" +"- followers: only followers of the related document or members of following channels\n" msgstr "" #. module: mail @@ -2367,23 +2403,11 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2869,11 +2893,6 @@ msgid "" " will be taken from the email template." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2920,6 +2939,13 @@ msgstr "" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2979,8 +3005,15 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -3010,28 +3043,35 @@ msgstr "Contador de Mensajes no Leídos" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "" @@ -3107,9 +3147,16 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:6 +#: code:addons/mail/static/src/xml/composer.xml:7 #, python-format -msgid "Write something" +msgid "Write something..." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:122 +#, python-format +msgid "Yesterday" msgstr "" #. module: mail @@ -3119,6 +3166,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3160,18 +3215,11 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:346 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3190,6 +3238,11 @@ msgstr "Su plantilla debe tener definido email_from" msgid "base.config.settings" msgstr "Configuración Básica" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3197,13 +3250,13 @@ msgstr "por" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:30 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "dm" #. module: mail -#: code:addons/mail/models/mail_thread.py:314 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "documento" @@ -3235,6 +3288,13 @@ msgstr "ir.autovacuum" msgid "members" msgstr "miembros" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3242,7 +3302,7 @@ msgstr "mycompany.odoo.com" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3267,11 +3327,21 @@ msgstr "público" msgid "publisher_warranty.contract" msgstr "publisher_warranty.contract" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "registro:" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/es_MX.po b/addons/mail/i18n/es_MX.po index c53071b09c8..836b58baa59 100644 --- a/addons/mail/i18n/es_MX.po +++ b/addons/mail/i18n/es_MX.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-11-14 19:47+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/odoo/odoo-9/language/es_MX/)\n" "MIME-Version: 1.0\n" @@ -28,10 +28,10 @@ msgid "" " \n" " \n" "\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" +"
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -53,7 +53,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -134,6 +134,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -141,7 +148,7 @@ msgid "%s (copy)" msgstr "%s (copia)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "%s creado" @@ -154,9 +161,9 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:86 +#: code:addons/mail/static/src/xml/thread.xml:96 #, python-format -msgid "(in channel" +msgid "(from" msgstr "" #. module: mail @@ -436,7 +443,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "" @@ -560,16 +567,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -790,6 +787,13 @@ msgstr "" msgid "Composition mode" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -893,7 +897,7 @@ msgstr "Fecha" #: model:ir.model.fields,help:mail.field_res_partner_message_last_post #: model:ir.model.fields,help:mail.field_res_users_message_last_post msgid "Date of the last message posted on the record." -msgstr "" +msgstr "Fecha de último trabajo realizado en esta cuenta" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_message_subtype_default @@ -957,21 +961,14 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1290,7 +1287,7 @@ msgstr "Seguidores" #: model:ir.model.fields,field_description:mail.field_res_partner_message_partner_ids #: model:ir.model.fields,field_description:mail.field_res_users_message_partner_ids msgid "Followers (Partners)" -msgstr "" +msgstr "Seguidores (Socios)" #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_subscription_form @@ -1458,14 +1455,6 @@ msgstr "" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1500,7 +1489,7 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1508,7 +1497,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "" @@ -1565,6 +1561,11 @@ msgstr "Es un Seguidor" msgid "Is Notification" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1592,7 +1593,7 @@ msgstr "Idioma" #: model:ir.model.fields,field_description:mail.field_res_partner_message_last_post #: model:ir.model.fields,field_description:mail.field_res_users_message_last_post msgid "Last Message Date" -msgstr "" +msgstr "Fecha de último mensaje" #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview___last_update @@ -1737,6 +1738,13 @@ msgstr "" msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1762,13 +1770,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1980,12 +1981,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1995,11 +2010,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2040,7 +2076,7 @@ msgstr "" #: model:ir.model.fields,field_description:mail.field_res_partner_message_needaction_counter #: model:ir.model.fields,field_description:mail.field_res_users_message_needaction_counter msgid "Number of Actions" -msgstr "" +msgstr "Número de acciones" #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_message_needaction_counter @@ -2048,7 +2084,7 @@ msgstr "" #: model:ir.model.fields,help:mail.field_res_partner_message_needaction_counter #: model:ir.model.fields,help:mail.field_res_users_message_needaction_counter msgid "Number of messages which requires an action" -msgstr "" +msgstr "Número de mensajes que requieren una acción" #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_message_unread_counter @@ -2056,7 +2092,7 @@ msgstr "" #: model:ir.model.fields,help:mail.field_res_partner_message_unread_counter #: model:ir.model.fields,help:mail.field_res_users_message_unread_counter msgid "Number of unread messages" -msgstr "" +msgstr "Número de mensajes sin leer" #. module: mail #: model:ir.actions.act_window,help:mail.action_contacts @@ -2325,7 +2361,7 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" +"- followers: only followers of the related document or members of following channels\n" msgstr "" #. module: mail @@ -2366,23 +2402,11 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2868,11 +2892,6 @@ msgid "" " will be taken from the email template." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2919,6 +2938,13 @@ msgstr "" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2978,8 +3004,15 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -3005,32 +3038,39 @@ msgstr "Mensajes sin leer" #: model:ir.model.fields,field_description:mail.field_res_partner_message_unread_counter #: model:ir.model.fields,field_description:mail.field_res_users_message_unread_counter msgid "Unread Messages Counter" +msgstr "Contador de mensajes sin leer" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "" @@ -3106,9 +3146,16 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:6 +#: code:addons/mail/static/src/xml/composer.xml:7 #, python-format -msgid "Write something" +msgid "Write something..." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:122 +#, python-format +msgid "Yesterday" msgstr "" #. module: mail @@ -3118,6 +3165,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3159,18 +3214,11 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:346 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3189,6 +3237,11 @@ msgstr "" msgid "base.config.settings" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3196,13 +3249,13 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:30 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:314 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "" @@ -3234,6 +3287,13 @@ msgstr "" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3241,7 +3301,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3266,11 +3326,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/es_PY.po b/addons/mail/i18n/es_PY.po index 6b2bb7bb2a1..23f5cf15a8d 100644 --- a/addons/mail/i18n/es_PY.po +++ b/addons/mail/i18n/es_PY.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-10-10 09:46+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Spanish (Paraguay) (http://www.transifex.com/odoo/odoo-9/language/es_PY/)\n" "MIME-Version: 1.0\n" @@ -28,10 +28,10 @@ msgid "" " \n" " \n" "\n" -"

\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" "
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -53,7 +53,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -78,49 +78,44 @@ msgid "" "

\n" "
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" +"
\n" +"
\n" -"
\n" -"
\n" -"
\n" -"
\n" +" \n" +" \n" +" \n" "
\n" +"
\n" +"
\n" +"
\n" +"
\n" "
\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" -"
\n" +" \n" " ${object.body | safe}\n" " % if ctx.get('tracking'):\n" +"
    \n" " % for tracking in ctx['tracking']\n" -" ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}\n" +"
  • ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}
    • \n" " % endfor\n" +"
\n" " % endif\n" "
\n" +"
\n" "
\n" "% if ctx.get('signature'):\n" -"
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -"
\n" -"  \n" -" ${ctx['signature'] | safe}\n" -"  \n" -"
\n" -"
\n" +"
\n" +" \n" +" \n" +" \n" +" \n" +"
\n" +" ${ctx['signature'] | safe}\n" +"
\n" "
\n" -"% endif\n" +"% endif" msgstr "" #. module: mail @@ -139,6 +134,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -146,7 +148,7 @@ msgid "%s (copy)" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "" @@ -157,6 +159,13 @@ msgstr "" msgid "%s has joined the %s network." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:96 +#, python-format +msgid "(from" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:48 @@ -173,9 +182,33 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:122 +#: code:addons/mail/static/src/xml/thread.xml:147 #, python-format -msgid "-------- Show more messages --------" +msgid "-------- Show older messages --------" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:513 +#, python-format +msgid "" +"
created #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:489 +#, python-format +msgid "" +"
joined #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:151 +#, python-format +msgid "" +"
left #%s
" msgstr "" #. module: mail @@ -266,13 +299,6 @@ msgstr "" msgid "Access Groups" msgstr "" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/js/client_action.js:154 -#, python-format -msgid "Action" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_message_needaction #: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction @@ -417,7 +443,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "" @@ -541,16 +567,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -638,6 +654,7 @@ msgstr "" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/client_action.xml:23 +#: code:addons/mail/static/src/xml/client_action.xml:89 #: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids @@ -770,6 +787,13 @@ msgstr "" msgid "Composition mode" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -937,21 +961,14 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1438,14 +1455,6 @@ msgstr "" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1480,7 +1489,7 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1488,7 +1497,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "" @@ -1545,6 +1561,11 @@ msgstr "" msgid "Is Notification" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1717,6 +1738,13 @@ msgstr "" msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1742,13 +1770,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1914,11 +1935,8 @@ msgstr "" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_needaction -#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids #: model:ir.model.fields,help:mail.field_mail_compose_message_needaction #: model:ir.model.fields,help:mail.field_mail_mail_needaction #: model:ir.model.fields,help:mail.field_mail_message_needaction @@ -1963,12 +1981,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1978,11 +2010,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2249,6 +2302,13 @@ msgstr "" msgid "Partners that did not ask not to be included in mass mailing campaigns" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids +#: 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 "" + #. module: mail #: model:ir.model.fields,help:mail.field_email_template_preview_auto_delete #: model:ir.model.fields,help:mail.field_mail_mail_auto_delete @@ -2301,7 +2361,7 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" +"- followers: only followers of the related document or members of following channels\n" msgstr "" #. module: mail @@ -2342,23 +2402,11 @@ msgstr "Privacidad" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2844,11 +2892,6 @@ msgid "" " will be taken from the email template." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2895,6 +2938,13 @@ msgstr "" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2954,8 +3004,15 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -2985,28 +3042,35 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "" @@ -3081,16 +3145,17 @@ msgid "Who can follow the group's activities?" msgstr "" #. module: mail -#: model:mail.channel,name:mail.channel_all_employees -msgid "Whole Company" +#. openerp-web +#: code:addons/mail/static/src/xml/composer.xml:7 +#, python-format +msgid "Write something..." msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/chatter.xml:57 -#: code:addons/mail/static/src/xml/composer.xml:7 +#: code:addons/mail/static/src/js/thread.js:122 #, python-format -msgid "Write something" +msgid "Yesterday" msgstr "" #. module: mail @@ -3100,6 +3165,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3141,18 +3214,11 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:469 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3171,6 +3237,11 @@ msgstr "" msgid "base.config.settings" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3178,24 +3249,29 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:29 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:281 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:232 +#: code:addons/mail/static/src/js/chatter.js:220 #, python-format msgid "followers" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_all_employees +msgid "general" +msgstr "" + #. module: mail #: model:ir.model,name:mail.model_ir_actions_server msgid "ir.actions.server" @@ -3211,6 +3287,13 @@ msgstr "" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3218,7 +3301,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3243,11 +3326,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/es_VE.po b/addons/mail/i18n/es_VE.po index d8359525047..d98ad60f3ea 100644 --- a/addons/mail/i18n/es_VE.po +++ b/addons/mail/i18n/es_VE.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-10-10 09:46+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Spanish (Venezuela) (http://www.transifex.com/odoo/odoo-9/language/es_VE/)\n" "MIME-Version: 1.0\n" @@ -28,10 +28,10 @@ msgid "" " \n" "
\n" "\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" "
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -53,7 +53,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -78,49 +78,44 @@ msgid "" "

\n" "
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" +"
\n" +"
\n" -"
\n" -"
\n" -"
\n" -"
\n" +" \n" +" \n" +" \n" "
\n" +"
\n" +"
\n" +"
\n" +"
\n" "
\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" -"
\n" +" \n" " ${object.body | safe}\n" " % if ctx.get('tracking'):\n" +"
    \n" " % for tracking in ctx['tracking']\n" -" ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}\n" +"
  • ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}
    • \n" " % endfor\n" +"
\n" " % endif\n" "
\n" +"
\n" "
\n" "% if ctx.get('signature'):\n" -"
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -"
\n" -"  \n" -" ${ctx['signature'] | safe}\n" -"  \n" -"
\n" -"
\n" +"
\n" +" \n" +" \n" +" \n" +" \n" +"
\n" +" ${ctx['signature'] | safe}\n" +"
\n" "
\n" -"% endif\n" +"% endif" msgstr "" #. module: mail @@ -139,6 +134,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -146,7 +148,7 @@ msgid "%s (copy)" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "" @@ -157,6 +159,13 @@ msgstr "" msgid "%s has joined the %s network." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:96 +#, python-format +msgid "(from" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:48 @@ -173,9 +182,33 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:122 +#: code:addons/mail/static/src/xml/thread.xml:147 #, python-format -msgid "-------- Show more messages --------" +msgid "-------- Show older messages --------" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:513 +#, python-format +msgid "" +"
created #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:489 +#, python-format +msgid "" +"
joined #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:151 +#, python-format +msgid "" +"
left #%s
" msgstr "" #. module: mail @@ -266,13 +299,6 @@ msgstr "" msgid "Access Groups" msgstr "" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/js/client_action.js:154 -#, python-format -msgid "Action" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_message_needaction #: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction @@ -417,7 +443,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "" @@ -541,16 +567,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -638,6 +654,7 @@ msgstr "" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/client_action.xml:23 +#: code:addons/mail/static/src/xml/client_action.xml:89 #: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids @@ -770,6 +787,13 @@ msgstr "" msgid "Composition mode" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -937,21 +961,14 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1438,14 +1455,6 @@ msgstr "" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1480,7 +1489,7 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1488,7 +1497,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "" @@ -1545,6 +1561,11 @@ msgstr "" msgid "Is Notification" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1717,6 +1738,13 @@ msgstr "" msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1742,13 +1770,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1914,11 +1935,8 @@ msgstr "" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_needaction -#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids #: model:ir.model.fields,help:mail.field_mail_compose_message_needaction #: model:ir.model.fields,help:mail.field_mail_mail_needaction #: model:ir.model.fields,help:mail.field_mail_message_needaction @@ -1963,12 +1981,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1978,11 +2010,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2249,6 +2302,13 @@ msgstr "" msgid "Partners that did not ask not to be included in mass mailing campaigns" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids +#: 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 "" + #. module: mail #: model:ir.model.fields,help:mail.field_email_template_preview_auto_delete #: model:ir.model.fields,help:mail.field_mail_mail_auto_delete @@ -2301,7 +2361,7 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" +"- followers: only followers of the related document or members of following channels\n" msgstr "" #. module: mail @@ -2342,23 +2402,11 @@ msgstr "Privacidad" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2844,11 +2892,6 @@ msgid "" " will be taken from the email template." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2895,6 +2938,13 @@ msgstr "" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2954,8 +3004,15 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -2985,28 +3042,35 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "" @@ -3081,16 +3145,17 @@ msgid "Who can follow the group's activities?" msgstr "" #. module: mail -#: model:mail.channel,name:mail.channel_all_employees -msgid "Whole Company" +#. openerp-web +#: code:addons/mail/static/src/xml/composer.xml:7 +#, python-format +msgid "Write something..." msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/chatter.xml:57 -#: code:addons/mail/static/src/xml/composer.xml:7 +#: code:addons/mail/static/src/js/thread.js:122 #, python-format -msgid "Write something" +msgid "Yesterday" msgstr "" #. module: mail @@ -3100,6 +3165,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3141,18 +3214,11 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:469 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3171,6 +3237,11 @@ msgstr "" msgid "base.config.settings" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3178,24 +3249,29 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:29 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:281 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:232 +#: code:addons/mail/static/src/js/chatter.js:220 #, python-format msgid "followers" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_all_employees +msgid "general" +msgstr "" + #. module: mail #: model:ir.model,name:mail.model_ir_actions_server msgid "ir.actions.server" @@ -3211,6 +3287,13 @@ msgstr "" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3218,7 +3301,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3243,11 +3326,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/et.po b/addons/mail/i18n/et.po index 409da7d34cb..3b17a2b5761 100644 --- a/addons/mail/i18n/et.po +++ b/addons/mail/i18n/et.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-10-10 09:46+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Estonian (http://www.transifex.com/odoo/odoo-9/language/et/)\n" "MIME-Version: 1.0\n" @@ -28,10 +28,10 @@ msgid "" " \n" "
\n" "\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" "
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -53,7 +53,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -78,49 +78,44 @@ msgid "" "

\n" "
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" +"
\n" +"
\n" -"
\n" -"
\n" -"
\n" -"
\n" +" \n" +" \n" +" \n" "
\n" +"
\n" +"
\n" +"
\n" +"
\n" "
\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" -"
\n" +" \n" " ${object.body | safe}\n" " % if ctx.get('tracking'):\n" +"
    \n" " % for tracking in ctx['tracking']\n" -" ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}\n" +"
  • ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}
    • \n" " % endfor\n" +"
\n" " % endif\n" "
\n" +"
\n" "
\n" "% if ctx.get('signature'):\n" -"
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -"
\n" -"  \n" -" ${ctx['signature'] | safe}\n" -"  \n" -"
\n" -"
\n" +"
\n" +" \n" +" \n" +" \n" +" \n" +"
\n" +" ${ctx['signature'] | safe}\n" +"
\n" "
\n" -"% endif\n" +"% endif" msgstr "" #. module: mail @@ -139,6 +134,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -146,7 +148,7 @@ msgid "%s (copy)" msgstr "%s (koopia)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "" @@ -157,6 +159,13 @@ msgstr "" msgid "%s has joined the %s network." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:96 +#, python-format +msgid "(from" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:48 @@ -173,9 +182,33 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:122 +#: code:addons/mail/static/src/xml/thread.xml:147 #, python-format -msgid "-------- Show more messages --------" +msgid "-------- Show older messages --------" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:513 +#, python-format +msgid "" +"
created #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:489 +#, python-format +msgid "" +"
joined #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:151 +#, python-format +msgid "" +"
left #%s
" msgstr "" #. module: mail @@ -266,13 +299,6 @@ msgstr "" msgid "Access Groups" msgstr "Ligipääsu gruppid" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/js/client_action.js:154 -#, python-format -msgid "Action" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_message_needaction #: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction @@ -417,7 +443,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "" @@ -541,16 +567,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -638,6 +654,7 @@ msgstr "" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/client_action.xml:23 +#: code:addons/mail/static/src/xml/client_action.xml:89 #: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids @@ -770,6 +787,13 @@ msgstr "Koosta uus sõnum" msgid "Composition mode" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -937,21 +961,14 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1438,14 +1455,6 @@ msgstr "" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1480,7 +1489,7 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1488,7 +1497,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "" @@ -1545,6 +1561,11 @@ msgstr "" msgid "Is Notification" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1717,6 +1738,13 @@ msgstr "" msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1742,13 +1770,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1914,11 +1935,8 @@ msgstr "" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_needaction -#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids #: model:ir.model.fields,help:mail.field_mail_compose_message_needaction #: model:ir.model.fields,help:mail.field_mail_mail_needaction #: model:ir.model.fields,help:mail.field_mail_message_needaction @@ -1963,12 +1981,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1978,11 +2010,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2249,6 +2302,13 @@ msgstr "" msgid "Partners that did not ask not to be included in mass mailing campaigns" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids +#: 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 "" + #. module: mail #: model:ir.model.fields,help:mail.field_email_template_preview_auto_delete #: model:ir.model.fields,help:mail.field_mail_mail_auto_delete @@ -2301,7 +2361,7 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" +"- followers: only followers of the related document or members of following channels\n" msgstr "" #. module: mail @@ -2342,23 +2402,11 @@ msgstr "Privaatsus" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2844,11 +2892,6 @@ msgid "" " will be taken from the email template." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2895,6 +2938,13 @@ msgstr "" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2954,8 +3004,15 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -2985,28 +3042,35 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "" @@ -3081,16 +3145,17 @@ msgid "Who can follow the group's activities?" msgstr "" #. module: mail -#: model:mail.channel,name:mail.channel_all_employees -msgid "Whole Company" -msgstr "Terve Ettevõte" +#. openerp-web +#: code:addons/mail/static/src/xml/composer.xml:7 +#, python-format +msgid "Write something..." +msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/chatter.xml:57 -#: code:addons/mail/static/src/xml/composer.xml:7 +#: code:addons/mail/static/src/js/thread.js:122 #, python-format -msgid "Write something" +msgid "Yesterday" msgstr "" #. module: mail @@ -3100,6 +3165,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3141,18 +3214,11 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:469 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3171,6 +3237,11 @@ msgstr "" msgid "base.config.settings" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3178,24 +3249,29 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:29 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:281 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:232 +#: code:addons/mail/static/src/js/chatter.js:220 #, python-format msgid "followers" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_all_employees +msgid "general" +msgstr "" + #. module: mail #: model:ir.model,name:mail.model_ir_actions_server msgid "ir.actions.server" @@ -3211,6 +3287,13 @@ msgstr "" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3218,7 +3301,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3243,11 +3326,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/fa.po b/addons/mail/i18n/fa.po index 54a933629a5..3774b4bc3ce 100644 --- a/addons/mail/i18n/fa.po +++ b/addons/mail/i18n/fa.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-10-22 14:19+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Persian (http://www.transifex.com/odoo/odoo-9/language/fa/)\n" "MIME-Version: 1.0\n" @@ -28,10 +28,10 @@ msgid "" " \n" "
\n" "\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" "
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -53,7 +53,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -78,49 +78,44 @@ msgid "" "

\n" "
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" +"
\n" +"
\n" -"
\n" -"
\n" -"
\n" -"
\n" +" \n" +" \n" +" \n" "
\n" +"
\n" +"
\n" +"
\n" +"
\n" "
\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" -"
\n" +" \n" " ${object.body | safe}\n" " % if ctx.get('tracking'):\n" +"
    \n" " % for tracking in ctx['tracking']\n" -" ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}\n" +"
  • ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}
    • \n" " % endfor\n" +"
\n" " % endif\n" "
\n" +" \n" +" \n" "
\n" "% if ctx.get('signature'):\n" -"
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -"
\n" -"  \n" -" ${ctx['signature'] | safe}\n" -"  \n" -"
\n" -"
\n" +"
\n" +" \n" +" \n" +" \n" +" \n" +"
\n" +" ${ctx['signature'] | safe}\n" +"
\n" "
\n" -"% endif\n" +"% endif" msgstr "" #. module: mail @@ -139,6 +134,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -146,7 +148,7 @@ msgid "%s (copy)" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "%s ایجاد شد" @@ -157,6 +159,13 @@ msgstr "%s ایجاد شد" msgid "%s has joined the %s network." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:96 +#, python-format +msgid "(from" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:48 @@ -173,9 +182,33 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:122 +#: code:addons/mail/static/src/xml/thread.xml:147 #, python-format -msgid "-------- Show more messages --------" +msgid "-------- Show older messages --------" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:513 +#, python-format +msgid "" +"
created #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:489 +#, python-format +msgid "" +"
joined #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:151 +#, python-format +msgid "" +"
left #%s
" msgstr "" #. module: mail @@ -266,13 +299,6 @@ msgstr "" msgid "Access Groups" msgstr "" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/js/client_action.js:154 -#, python-format -msgid "Action" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_message_needaction #: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction @@ -417,7 +443,7 @@ msgstr "همه پیام ها" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "" @@ -541,16 +567,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "موجود برای ایمیل همگانی" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -638,6 +654,7 @@ msgstr "" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/client_action.xml:23 +#: code:addons/mail/static/src/xml/client_action.xml:89 #: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids @@ -770,6 +787,13 @@ msgstr "" msgid "Composition mode" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -937,21 +961,14 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1438,14 +1455,6 @@ msgstr "پیام‌های مهم" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1480,7 +1489,7 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1488,7 +1497,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "" @@ -1545,6 +1561,11 @@ msgstr "دنبال می کند" msgid "Is Notification" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1717,6 +1738,13 @@ msgstr "" msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1742,13 +1770,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1914,11 +1935,8 @@ msgstr "" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_needaction -#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids #: model:ir.model.fields,help:mail.field_mail_compose_message_needaction #: model:ir.model.fields,help:mail.field_mail_mail_needaction #: model:ir.model.fields,help:mail.field_mail_message_needaction @@ -1963,12 +1981,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1978,11 +2010,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2249,6 +2302,13 @@ msgstr "" msgid "Partners that did not ask not to be included in mass mailing campaigns" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids +#: 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 "" + #. module: mail #: model:ir.model.fields,help:mail.field_email_template_preview_auto_delete #: model:ir.model.fields,help:mail.field_mail_mail_auto_delete @@ -2301,7 +2361,7 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" +"- followers: only followers of the related document or members of following channels\n" msgstr "" #. module: mail @@ -2342,23 +2402,11 @@ msgstr "حریم‌خصوصی" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2844,11 +2892,6 @@ msgid "" " will be taken from the email template." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2895,6 +2938,13 @@ msgstr "به(شرکای تجاری)" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2954,8 +3004,15 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -2985,28 +3042,35 @@ msgstr "شمارنده پیام‌های خوانده‌نشده" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "خطا در آپلود" @@ -3081,16 +3145,17 @@ msgid "Who can follow the group's activities?" msgstr "" #. module: mail -#: model:mail.channel,name:mail.channel_all_employees -msgid "Whole Company" -msgstr "تمام شرکت" +#. openerp-web +#: code:addons/mail/static/src/xml/composer.xml:7 +#, python-format +msgid "Write something..." +msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/chatter.xml:57 -#: code:addons/mail/static/src/xml/composer.xml:7 +#: code:addons/mail/static/src/js/thread.js:122 #, python-format -msgid "Write something" +msgid "Yesterday" msgstr "" #. module: mail @@ -3100,6 +3165,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3141,18 +3214,11 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:469 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3171,6 +3237,11 @@ msgstr "" msgid "base.config.settings" msgstr "base.config.settings" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3178,24 +3249,29 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:29 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:281 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "سند" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:232 +#: code:addons/mail/static/src/js/chatter.js:220 #, python-format msgid "followers" msgstr "دنبال کنندگان" +#. module: mail +#: model:mail.channel,name:mail.channel_all_employees +msgid "general" +msgstr "" + #. module: mail #: model:ir.model,name:mail.model_ir_actions_server msgid "ir.actions.server" @@ -3211,6 +3287,13 @@ msgstr "" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3218,7 +3301,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3243,11 +3326,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/fi.po b/addons/mail/i18n/fi.po index e124e10663f..047dffbdb1d 100644 --- a/addons/mail/i18n/fi.po +++ b/addons/mail/i18n/fi.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-10-24 06:42+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Finnish (http://www.transifex.com/odoo/odoo-9/language/fi/)\n" "MIME-Version: 1.0\n" @@ -29,10 +29,10 @@ msgid "" " \n" "
\n" "\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" "
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -54,7 +54,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -79,49 +79,44 @@ msgid "" "

\n" "
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" +"
\n" +"
\n" -"
\n" -"
\n" -"
\n" -"
\n" +" \n" +" \n" +" \n" "
\n" +"
\n" +"
\n" +"
\n" +"
\n" "
\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" -"
\n" +" \n" " ${object.body | safe}\n" " % if ctx.get('tracking'):\n" +"
    \n" " % for tracking in ctx['tracking']\n" -" ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}\n" +"
  • ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}
    • \n" " % endfor\n" +"
\n" " % endif\n" "
\n" +" \n" +" \n" "
\n" "% if ctx.get('signature'):\n" -"
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -"
\n" -"  \n" -" ${ctx['signature'] | safe}\n" -"  \n" -"
\n" -"
\n" +"
\n" +" \n" +" \n" +" \n" +" \n" +"
\n" +" ${ctx['signature'] | safe}\n" +"
\n" "
\n" -"% endif\n" +"% endif" msgstr "" #. module: mail @@ -140,6 +135,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -147,7 +149,7 @@ msgid "%s (copy)" msgstr "%s (kopio)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "%s luotu" @@ -158,6 +160,13 @@ msgstr "%s luotu" msgid "%s has joined the %s network." msgstr "%s on liittynyt %s verkkoon." +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:96 +#, python-format +msgid "(from" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:48 @@ -174,9 +183,33 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:122 +#: code:addons/mail/static/src/xml/thread.xml:147 #, python-format -msgid "-------- Show more messages --------" +msgid "-------- Show older messages --------" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:513 +#, python-format +msgid "" +"
created #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:489 +#, python-format +msgid "" +"
joined #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:151 +#, python-format +msgid "" +"
left #%s
" msgstr "" #. module: mail @@ -253,7 +286,7 @@ msgstr "" msgid "" "A Python dictionary that will be evaluated to provide default values when " "creating new records for this alias." -msgstr "" +msgstr "Python-kirjasto, joka evaluoidaan oletusarvoja varten, kun tätä aliasta varten luodaan uusi tietuetta." #. module: mail #: model:ir.actions.act_window,help:mail.mail_shortcode_action @@ -267,20 +300,13 @@ msgstr "" msgid "Access Groups" msgstr "Käyttöoikeusryhmät" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/js/client_action.js:154 -#, python-format -msgid "Action" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_message_needaction #: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction #: model:ir.model.fields,field_description:mail.field_res_partner_message_needaction #: model:ir.model.fields,field_description:mail.field_res_users_message_needaction msgid "Action Needed" -msgstr "" +msgstr "Huomiota vaadittu" #. module: mail #: model:ir.model.fields,help:mail.field_mail_message_subtype_default @@ -377,7 +403,7 @@ msgstr "Aliaksen sallitut lähettäjät" #: model:ir.model.fields,field_description:mail.field_mail_channel_alias_contact #: model:ir.model.fields,field_description:mail.field_res_users_alias_contact msgid "Alias Contact Security" -msgstr "" +msgstr "Aliaksen kontaktien turvallisuus" #. module: mail #: model:ir.model.fields,field_description:mail.field_base_config_settings_alias_domain @@ -418,7 +444,7 @@ msgstr "Kaikki viestit" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "Anonyymi" @@ -494,7 +520,7 @@ msgstr "" msgid "" "Author of the message. If not set, email_from may hold an email address that" " did not match any partner." -msgstr "" +msgstr "Viestin louja. Jos tätä ei ole asetettu, viestin lähettäjä (email_from) voi olla osoite, joka ei täsmännyt mihinkään kumppaniin." #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_author_avatar @@ -523,7 +549,7 @@ msgstr "Automaattinen tilaus" #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_message_subtype_form msgid "Auto subscription" -msgstr "" +msgstr "Automaattinen seuraaminen" #. module: mail #: model:ir.model.fields,help:mail.field_mail_compose_message_body @@ -542,16 +568,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "Käytettävissä joukkopostitukseen" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "Parhaat myyntikäytännöt" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "Johtoryhmän tapaamiset" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -639,6 +655,7 @@ msgstr "" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/client_action.xml:23 +#: code:addons/mail/static/src/xml/client_action.xml:89 #: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids @@ -769,6 +786,13 @@ msgstr "" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_composition_mode msgid "Composition mode" +msgstr "Kirjoitustila" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" msgstr "" #. module: mail @@ -853,7 +877,7 @@ msgstr "Luontikuukausi" #: model:ir.model.fields,help:mail.field_mail_mail_starred #: model:ir.model.fields,help:mail.field_mail_message_starred msgid "Current user has a starred notification linked to this message" -msgstr "" +msgstr "Nykyinen käyttäjä on merkannut tähän viestiin linkitetyn huomautuksen tärkeäksi" #. module: mail #: code:addons/mail/models/res_partner.py:16 @@ -934,25 +958,18 @@ msgstr "Kuvaus" msgid "" "Description that will be added in the message posted for this subtype. If " "void, the name will be added instead." -msgstr "" +msgstr "Kuvaus, joka lisätään tähän alatyyppiin lähetettyihin viesteihin. Jos tyhjä, viesteihin lisätään nimi." #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1013,14 +1030,14 @@ msgstr "" #: code:addons/mail/static/src/js/chatter.js:117 #, python-format msgid "Edit Subscription of " -msgstr "" +msgstr "Muokkaa tilausta" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:129 #, python-format msgid "Edit subscription" -msgstr "" +msgstr "Muokkaa tilausta" #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_search @@ -1091,7 +1108,7 @@ msgstr "Sähköpostiviestiketju" msgid "" "Email address internally associated with this user. Incoming emails will " "appear in the user's notifications." -msgstr "" +msgstr "Tähän käyttäjään sisäisesti liitetty sähköpostiosoite. Saapuvat sähköpostit näkyy käyttäjän ilmoituksissa." #. module: mail #: model:ir.model.fields,help:mail.field_mail_compose_message_email_from @@ -1105,7 +1122,7 @@ msgstr "" #. module: mail #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form msgid "Email address to redirect replies..." -msgstr "" +msgstr "Sähköpostiosoite vastausviesteille" #. module: mail #: model:ir.model,name:mail.model_mail_compose_message @@ -1147,7 +1164,7 @@ msgstr "" #. module: mail #: sql_constraint:mail.followers:0 msgid "Error, a partner cannot follow twice the same object." -msgstr "" +msgstr "Virhe: kumppani ei voi olla saman tietueen seuraajan kahdesti" #. module: mail #: sql_constraint:mail.followers:0 @@ -1309,7 +1326,7 @@ msgstr "" #: code:addons/mail/models/res_users.py:48 #, python-format msgid "Go to the configuration panel" -msgstr "" +msgstr "Mene asetusvalikkoon" #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_alias_search @@ -1346,7 +1363,7 @@ msgstr "Piilotettu" #. module: mail #: model:ir.model.fields,help:mail.field_mail_message_subtype_hidden msgid "Hide the subtype in the follower options" -msgstr "" +msgstr "Piilota alatyyppi seuraajavalinnoista" #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_id @@ -1374,13 +1391,13 @@ msgstr "ID" msgid "" "ID of the parent record holding the alias (example: project holding the task" " creation alias)" -msgstr "" +msgstr "Ylätason aliastietueen id (esim. tehtävien luontiin käytettävän aliaksen sisältävä projekti)" #. module: mail #: model:ir.model.fields,help:mail.field_mail_followers_res_id #: model:ir.model.fields,help:mail.field_mail_wizard_invite_res_id msgid "Id of the followed resource" -msgstr "" +msgstr "Seuratun resurssin id" #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_message_unread @@ -1396,14 +1413,14 @@ msgstr "Jos valittu, uudet viestit vaativat huomiosi." #: model:ir.model.fields,help:mail.field_res_partner_message_needaction #: model:ir.model.fields,help:mail.field_res_users_message_needaction msgid "If checked, new messages require your attention." -msgstr "" +msgstr "Jos valittu, uudet viestit vaativat huomiosi." #. module: mail #: model:ir.model.fields,help:mail.field_mail_wizard_invite_send_mail msgid "" "If checked, the partners will receive an email warning they have been added " "in the document's followers." -msgstr "" +msgstr "Jos valittu, kumppanit saavat sähköpostivaroituksen kun heidät lisätään dokumentin seuraajiksi." #. module: mail #: model:ir.model.fields,help:mail.field_email_template_preview_user_signature @@ -1427,7 +1444,7 @@ msgstr "Jos 'Jätä pois' on valittu, niin tämä kontakti on kieltäytynyt otta msgid "" "If you have setup a catch-all email domain redirected to the Odoo server, " "enter the domain name here." -msgstr "" +msgstr "Jos haluat asettaa catchall-sähköpostidomainin (osoite joka vastaanottaa kaikki domainiin saapuvat postit, joilla ei ole vastaanottajaa), joka ohjataan Odoo-palvelimelle, aseta domainin nimi tässä" #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban @@ -1439,19 +1456,11 @@ msgstr "" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format msgid "Inactive Alias" -msgstr "" +msgstr "Passiivinen alias" #. module: mail #. openerp-web @@ -1465,7 +1474,7 @@ msgstr "Saapuneet" #: model:ir.model.fields,help:mail.field_mail_mail_parent_id #: model:ir.model.fields,help:mail.field_mail_message_parent_id msgid "Initial thread message." -msgstr "" +msgstr "Viestiketjun alkuperäinen viesti" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_message_subtype_internal @@ -1478,10 +1487,10 @@ msgstr "" msgid "" "Invalid expression, it must be a literal python dictionary definition e.g. " "\"{'field': 'value'}\"" -msgstr "" +msgstr "Virheellinen lauseke. Lausekkeen täytyy olla oikeanmuotoinen python-dictionary, esim. \"{'kentta': 'arvo'}\"" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1489,10 +1498,17 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" -msgstr "" +msgstr "Kutsu seurata %s:n dokumenttia %s" #. module: mail #. openerp-web @@ -1546,6 +1562,11 @@ msgstr "" msgid "Is Notification" msgstr "On ilmoitus" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1647,7 +1668,7 @@ msgstr "" #: model:ir.model.fields,help:mail.field_mail_wizard_invite_partner_ids msgid "" "List of partners that will be added as follower of the current document." -msgstr "" +msgstr "Lista tämänhetkiselle dokumentille lisättävistä kumppaneista." #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_followers_channel_id @@ -1711,13 +1732,20 @@ msgstr "" #. module: mail #: model:ir.model.fields,help:mail.field_mail_mail_notification msgid "Mail has been created to notify people of an existing mail.message" -msgstr "" +msgstr "Olemassaolevasta sähköpostiviestistä (mail.message) on lähetetty ilmoitus" #. module: mail #: model:ir.ui.view,arch_db:mail.view_emails_partner_info_form msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1743,13 +1771,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1778,7 +1799,7 @@ msgstr "Viestityyppi" #. module: mail #: model:ir.model.fields,help:mail.field_mail_mail_email_to msgid "Message recipients (emails)" -msgstr "" +msgstr "Viestin vastaanottajat (sähköpostit)" #. module: mail #: model:ir.model.fields,help:mail.field_mail_mail_references @@ -1915,11 +1936,8 @@ msgstr "" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_needaction -#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids #: model:ir.model.fields,help:mail.field_mail_compose_message_needaction #: model:ir.model.fields,help:mail.field_mail_mail_needaction #: model:ir.model.fields,help:mail.field_mail_message_needaction @@ -1964,12 +1982,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1979,11 +2011,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2011,12 +2064,12 @@ msgstr "Ilmoitus" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_notify msgid "Notify followers" -msgstr "" +msgstr "Huomauta seuraajia" #. module: mail #: model:ir.model.fields,help:mail.field_mail_compose_message_notify msgid "Notify followers of the document (mass post only)" -msgstr "" +msgstr "Ilmoita tämän dokumentin seuraajille (vain massapostitus)" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_message_needaction_counter @@ -2040,7 +2093,7 @@ msgstr "" #: model:ir.model.fields,help:mail.field_res_partner_message_unread_counter #: model:ir.model.fields,help:mail.field_res_users_message_unread_counter msgid "Number of unread messages" -msgstr "" +msgstr "Lukemattomien viestien määrä" #. module: mail #: model:ir.actions.act_window,help:mail.action_contacts @@ -2248,6 +2301,13 @@ msgstr "Kumppaniprofiili" #. module: mail #: model:ir.ui.view,arch_db:mail.res_partner_opt_out_search msgid "Partners that did not ask not to be included in mass mailing campaigns" +msgstr "Kumppanit jotka saa ottaa mukaan joukkokirjekampanjoihin." + +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids +#: 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 "" #. module: mail @@ -2302,7 +2362,7 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" +"- followers: only followers of the related document or members of following channels\n" msgstr "" #. module: mail @@ -2343,23 +2403,11 @@ msgstr "Yksityisyys" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2845,11 +2893,6 @@ msgid "" " will be taken from the email template." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2896,6 +2939,13 @@ msgstr "Vastaanottaja (Kumppanit)" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2955,8 +3005,15 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -2986,28 +3043,35 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "Tuontilatauksessa virhe" @@ -3015,7 +3079,7 @@ msgstr "Tuontilatauksessa virhe" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_use_active_domain msgid "Use active domain" -msgstr "" +msgstr "Käytä aktiivista domainia" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_template_id @@ -3082,16 +3146,17 @@ msgid "Who can follow the group's activities?" msgstr "" #. module: mail -#: model:mail.channel,name:mail.channel_all_employees -msgid "Whole Company" -msgstr "Koko yhtiö" +#. openerp-web +#: code:addons/mail/static/src/xml/composer.xml:7 +#, python-format +msgid "Write something..." +msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/chatter.xml:57 -#: code:addons/mail/static/src/xml/composer.xml:7 +#: code:addons/mail/static/src/js/thread.js:122 #, python-format -msgid "Write something" +msgid "Yesterday" msgstr "" #. module: mail @@ -3101,6 +3166,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3142,18 +3215,11 @@ msgstr "Voit liittää tähän mallipohjaan liitetiedostoja, jotka lähetetään #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:469 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3172,6 +3238,11 @@ msgstr "" msgid "base.config.settings" msgstr "base.config.settings" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3179,24 +3250,29 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:29 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:281 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:232 +#: code:addons/mail/static/src/js/chatter.js:220 #, python-format msgid "followers" msgstr "seuraajat" +#. module: mail +#: model:mail.channel,name:mail.channel_all_employees +msgid "general" +msgstr "" + #. module: mail #: model:ir.model,name:mail.model_ir_actions_server msgid "ir.actions.server" @@ -3213,13 +3289,20 @@ msgid "members" msgstr "" #. module: mail -#: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain -msgid "mycompany.odoo.com" +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." msgstr "" +#. module: mail +#: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain +msgid "mycompany.odoo.com" +msgstr "omayritys.odoo.com" + #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3244,11 +3327,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "publisher_warranty.contract" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/fr.po b/addons/mail/i18n/fr.po index 04e712db78c..2e844bd90ec 100644 --- a/addons/mail/i18n/fr.po +++ b/addons/mail/i18n/fr.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-11-24 23:03+0000\n" -"Last-Translator: Maxime Chambreuil \n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" +"Last-Translator: Martin Trigaux\n" "Language-Team: French (http://www.transifex.com/odoo/odoo-9/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -35,10 +35,10 @@ msgid "" " \n" "
\n" "\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -"
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -60,7 +60,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -123,7 +123,7 @@ msgid "" "

\n" "
\n" "% endif" -msgstr "\n
\n
\n \n \n \n
\n
\n
\n \n \n \n \n \n
\n % if ctx.get('button_access'):\n ${ctx['button_access']['title']}\n % endif\n\n % if ctx.get('button_follow'):\n ${ctx['button_follow']['title']}\n \n % elif ctx.get('button_unfollow'):\n ${ctx['button_unfollow']['title']}\n % endif\n\n % if not ctx.get('button_access') and not ctx.get('button_follow') and not ctx.get('button_unfollow') and ctx.get('model_name'):\n

\n About ${ctx['model_name']}\n % if ctx.get('record_name'):\n : ${ctx['record_name']}\n % endif\n \n

\n % endif\n 		\n

\n % if ctx.get('actions'):\n % for action in ctx['actions']:\n ${action['title']}\n %if len(ctx['actions']) > 1 and loop.index < len(ctx['actions']):\n |\n % endif\n % endfor\n % else:\n Envoyé par\n % if ctx.get('website_url'):\n \n % endif\n ${ctx.get('company_name')}\n % if ctx.get('website_url'):\n \n % endif\n avec\n Odoo\n % endif\n

\n
\n
\n \n \n \n \n
\n
\n
\n
\n
\n
\n
\n \n \n \n \n
\n ${object.body | safe}\n % if ctx.get('tracking'):\n
    \n % for tracking in ctx['tracking']\n
  • ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}
    • \n % endfor\n
\n % endif\n
\n
\n% if ctx.get('signature'):\n
\n \n \n \n \n
\n ${ctx['signature'] | safe}\n
\n
\n% endif" +msgstr "" #. module: mail #. openerp-web @@ -141,6 +141,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "${object.subject or (object.record_name and 'Re: %s' % object.record_name) or (object.parent_id and object.parent_id.subject and 'Re: %s' % object.parent_id.subject) or (object.parent_id and object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -148,7 +155,7 @@ msgid "%s (copy)" msgstr "%s (copie)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "%s créé(e)" @@ -161,10 +168,10 @@ msgstr "%s a rejoint le réseau %s." #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:86 +#: code:addons/mail/static/src/xml/thread.xml:96 #, python-format -msgid "(in channel" -msgstr "(dans le canal" +msgid "(from" +msgstr "" #. module: mail #. openerp-web @@ -395,7 +402,7 @@ msgstr "Alias" #. module: mail #: model:ir.ui.view,arch_db:mail.view_users_form_mail msgid "Alias Accepts Emails From" -msgstr "Accepter les courriel de" +msgstr "Accepter les courriels de" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_alias_alias_contact @@ -443,7 +450,7 @@ msgstr "Tous les messages" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "Anonyme" @@ -567,16 +574,6 @@ msgstr "Marquer comme lu automatiquement" msgid "Available for mass mailing" msgstr "Disponible pour diffusion de masse" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "Bonnes pratiques de vente" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "Réunions" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -797,6 +794,13 @@ msgstr "Rédiger un nouveau message" msgid "Composition mode" msgstr "Mode de composition" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -964,21 +968,14 @@ msgstr "Description qui sera ajoutée dans le message envoyé pour ce sous-type. #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "Détacher" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "Le saviez-vous? Taper \"@quelqu'un\" dans le compositeur pour citer quelqu'un dans votre message, et faites le apparaître dans votre propre boîte de réception. " - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "Messages direct" @@ -1465,14 +1462,6 @@ msgstr "Messages Importants" msgid "Important messages" msgstr "Messages importants" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "Dans la section \"Chaine\" vous trouverez les chaines publiques et privées.
\nLa section \"Message Direct\" vous permet de parler directement à une personne.
\nLa section \"Groupe privé\" contient vos conversations privées. Vous pouvez rejoindre une chaine pricée soit en la créant vous-même, ou en étant invité par quelqu'un d'autre.
" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1507,7 +1496,7 @@ msgid "" msgstr "Expression invalide : une définition litérale d'un dictionnaire Python est attendue, par exemple \"{'field': 'value'}\"" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1515,7 +1504,14 @@ msgid "" msgstr "Ensemble d'enregistrements invalide: doit être appellé en tant que modèle (sans enregistrements) ou sur une seule fiche d'enregistrement" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "Invitation à suivre %s : %s" @@ -1572,6 +1568,11 @@ msgstr "Est un abonné" msgid "Is Notification" msgstr "Est une notification" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1744,6 +1745,13 @@ msgstr "Un courrier a été créé pour prévenir les personnes d'un mail.messag msgid "Mailing Opt-Out" msgstr "Mailing Opt-Out" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1769,13 +1777,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "Les membres de ces groupes seront automatiquement abonnés. Ils pourront cependant gérer leur abonnement manuellement si nécessaire." -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "Mention(s):" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1987,12 +1988,26 @@ msgstr "Nouvelle valeur de texte" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "Nouveau Message" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -2002,11 +2017,32 @@ msgstr "Nouvelles personnes" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "Pas de suiveur" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2332,8 +2368,8 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" -msgstr "Politique pour poster un message sur le document via la passerelle email.\n- tout le monde: tout le monde peut poster\n- partenaires: seulement les partenaires authentifiés\n- suiveurs: seulement les personnes qui suivent le document lié\n" +"- followers: only followers of the related document or members of following channels\n" +msgstr "" #. module: mail #: model:ir.model.fields,help:mail.field_res_partner_notify_email @@ -2373,23 +2409,11 @@ msgstr "Confidentialité" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "Chaine privée" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "Chaines privées" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "R&D" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2875,11 +2899,6 @@ msgid "" " will be taken from the email template." msgstr "Les valeurs affichées ci-dessous sont informatives. Lors de l'envoi du mail, les valeurs seront puisées dans le modèle d'email." -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "Il n'y a pas de messages à afficher.
" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2926,6 +2945,13 @@ msgstr "Pour (partenaires)" msgid "To: Followers of" msgstr "A: Followers de" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2985,8 +3011,15 @@ msgstr "Impossible d'envoyer le courriel, veuillez configurer l'adresse de l'exp #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -3016,28 +3049,35 @@ msgstr "Compteur de messages non lus" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "Se désabonner" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "Désinscrit " #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "Téléchargement en cours..." #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "Erreur de transmission" @@ -3113,10 +3153,17 @@ msgstr "Qui peut suivre les activités du groupe? " #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:6 +#: code:addons/mail/static/src/xml/composer.xml:7 #, python-format -msgid "Write something" -msgstr "Écrivez quelque chose ..." +msgid "Write something..." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:122 +#, python-format +msgid "Yesterday" +msgstr "" #. module: mail #. openerp-web @@ -3125,6 +3172,14 @@ msgstr "Écrivez quelque chose ..." msgid "You added %s to the conversation." msgstr "Vous avez rajouté %s à la conversation " +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3166,18 +3221,11 @@ msgstr "Vous pouvez joindre des fichiers à ce modèle, à ajouter à tous les c #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:346 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "Vous vous êtes désinscrits de %s." -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "Votre \"Boite de réception\" contient tous les messages dans lesquels vous avez été mentionné, et les messages reçus en tant que follower d'un document.
\nLa section \"étoilée\" contient tous vos messages favoris." - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3196,6 +3244,11 @@ msgstr "Votre modèle doit définir un email_from" msgid "base.config.settings" msgstr "base.config.settings" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3203,13 +3256,13 @@ msgstr "par" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:30 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "dm" #. module: mail -#: code:addons/mail/models/mail_thread.py:314 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "document" @@ -3241,6 +3294,13 @@ msgstr "ir.autovacuum" msgid "members" msgstr "membres" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3248,7 +3308,7 @@ msgstr "masociete.odoo.com" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3273,11 +3333,21 @@ msgstr "Public" msgid "publisher_warranty.contract" msgstr "publisher_warranty.contract" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "enregistrement:" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/gl.po b/addons/mail/i18n/gl.po index 4f07e364522..31382daa35a 100644 --- a/addons/mail/i18n/gl.po +++ b/addons/mail/i18n/gl.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-10-10 09:46+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Galician (http://www.transifex.com/odoo/odoo-9/language/gl/)\n" "MIME-Version: 1.0\n" @@ -28,10 +28,10 @@ msgid "" " \n" " \n" "\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" "
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -53,7 +53,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -78,49 +78,44 @@ msgid "" "

\n" "
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" +"
\n" +"
\n" -"
\n" -"
\n" -"
\n" -"
\n" +" \n" +" \n" +" \n" "
\n" +"
\n" +"
\n" +"
\n" +"
\n" "
\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" -"
\n" +" \n" " ${object.body | safe}\n" " % if ctx.get('tracking'):\n" +"
    \n" " % for tracking in ctx['tracking']\n" -" ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}\n" +"
  • ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}
    • \n" " % endfor\n" +"
\n" " % endif\n" "
\n" +" \n" +" \n" "
\n" "% if ctx.get('signature'):\n" -"
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -"
\n" -"  \n" -" ${ctx['signature'] | safe}\n" -"  \n" -"
\n" -"
\n" +"
\n" +" \n" +" \n" +" \n" +" \n" +"
\n" +" ${ctx['signature'] | safe}\n" +"
\n" "
\n" -"% endif\n" +"% endif" msgstr "" #. module: mail @@ -139,6 +134,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -146,7 +148,7 @@ msgid "%s (copy)" msgstr "%s (copia)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "" @@ -157,6 +159,13 @@ msgstr "" msgid "%s has joined the %s network." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:96 +#, python-format +msgid "(from" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:48 @@ -173,9 +182,33 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:122 +#: code:addons/mail/static/src/xml/thread.xml:147 #, python-format -msgid "-------- Show more messages --------" +msgid "-------- Show older messages --------" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:513 +#, python-format +msgid "" +"
created #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:489 +#, python-format +msgid "" +"
joined #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:151 +#, python-format +msgid "" +"
left #%s
" msgstr "" #. module: mail @@ -266,13 +299,6 @@ msgstr "" msgid "Access Groups" msgstr "Grupos de acceso" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/js/client_action.js:154 -#, python-format -msgid "Action" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_message_needaction #: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction @@ -417,7 +443,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "" @@ -541,16 +567,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -638,6 +654,7 @@ msgstr "" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/client_action.xml:23 +#: code:addons/mail/static/src/xml/client_action.xml:89 #: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids @@ -770,6 +787,13 @@ msgstr "" msgid "Composition mode" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -937,21 +961,14 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1438,14 +1455,6 @@ msgstr "" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1480,7 +1489,7 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1488,7 +1497,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "" @@ -1545,6 +1561,11 @@ msgstr "" msgid "Is Notification" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1717,6 +1738,13 @@ msgstr "" msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1742,13 +1770,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1914,11 +1935,8 @@ msgstr "" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_needaction -#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids #: model:ir.model.fields,help:mail.field_mail_compose_message_needaction #: model:ir.model.fields,help:mail.field_mail_mail_needaction #: model:ir.model.fields,help:mail.field_mail_message_needaction @@ -1963,12 +1981,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1978,11 +2010,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2249,6 +2302,13 @@ msgstr "" msgid "Partners that did not ask not to be included in mass mailing campaigns" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids +#: 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 "" + #. module: mail #: model:ir.model.fields,help:mail.field_email_template_preview_auto_delete #: model:ir.model.fields,help:mail.field_mail_mail_auto_delete @@ -2301,7 +2361,7 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" +"- followers: only followers of the related document or members of following channels\n" msgstr "" #. module: mail @@ -2342,23 +2402,11 @@ msgstr "Intimidade" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2844,11 +2892,6 @@ msgid "" " will be taken from the email template." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2895,6 +2938,13 @@ msgstr "" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2954,8 +3004,15 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -2985,28 +3042,35 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "" @@ -3081,16 +3145,17 @@ msgid "Who can follow the group's activities?" msgstr "" #. module: mail -#: model:mail.channel,name:mail.channel_all_employees -msgid "Whole Company" +#. openerp-web +#: code:addons/mail/static/src/xml/composer.xml:7 +#, python-format +msgid "Write something..." msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/chatter.xml:57 -#: code:addons/mail/static/src/xml/composer.xml:7 +#: code:addons/mail/static/src/js/thread.js:122 #, python-format -msgid "Write something" +msgid "Yesterday" msgstr "" #. module: mail @@ -3100,6 +3165,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3141,18 +3214,11 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:469 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3171,6 +3237,11 @@ msgstr "" msgid "base.config.settings" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3178,24 +3249,29 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:29 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:281 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:232 +#: code:addons/mail/static/src/js/chatter.js:220 #, python-format msgid "followers" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_all_employees +msgid "general" +msgstr "" + #. module: mail #: model:ir.model,name:mail.model_ir_actions_server msgid "ir.actions.server" @@ -3211,6 +3287,13 @@ msgstr "" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3218,7 +3301,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3243,11 +3326,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/he.po b/addons/mail/i18n/he.po index 94db77859c0..dcaf90a9d85 100644 --- a/addons/mail/i18n/he.po +++ b/addons/mail/i18n/he.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-10-10 09:46+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Hebrew (http://www.transifex.com/odoo/odoo-9/language/he/)\n" "MIME-Version: 1.0\n" @@ -28,10 +28,10 @@ msgid "" " \n" "
\n" "\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" "
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -53,7 +53,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -78,49 +78,44 @@ msgid "" "

\n" "
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" +"
\n" +"
\n" -"
\n" -"
\n" -"
\n" -"
\n" +" \n" +" \n" +" \n" "
\n" +"
\n" +"
\n" +"
\n" +"
\n" "
\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" -"
\n" +" \n" " ${object.body | safe}\n" " % if ctx.get('tracking'):\n" +"
    \n" " % for tracking in ctx['tracking']\n" -" ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}\n" +"
  • ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}
    • \n" " % endfor\n" +"
\n" " % endif\n" "
\n" +" \n" +" \n" "
\n" "% if ctx.get('signature'):\n" -"
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -"
\n" -"  \n" -" ${ctx['signature'] | safe}\n" -"  \n" -"
\n" -"
\n" +"
\n" +" \n" +" \n" +" \n" +" \n" +"
\n" +" ${ctx['signature'] | safe}\n" +"
\n" "
\n" -"% endif\n" +"% endif" msgstr "" #. module: mail @@ -139,6 +134,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -146,7 +148,7 @@ msgid "%s (copy)" msgstr "%s (העתק)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "%s נוצר" @@ -157,6 +159,13 @@ msgstr "%s נוצר" msgid "%s has joined the %s network." msgstr "%s הצטרף לרשת %s." +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:96 +#, python-format +msgid "(from" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:48 @@ -173,9 +182,33 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:122 +#: code:addons/mail/static/src/xml/thread.xml:147 #, python-format -msgid "-------- Show more messages --------" +msgid "-------- Show older messages --------" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:513 +#, python-format +msgid "" +"
created #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:489 +#, python-format +msgid "" +"
joined #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:151 +#, python-format +msgid "" +"
left #%s
" msgstr "" #. module: mail @@ -266,13 +299,6 @@ msgstr "" msgid "Access Groups" msgstr "קבוצות גישה" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/js/client_action.js:154 -#, python-format -msgid "Action" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_message_needaction #: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction @@ -417,7 +443,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "אנונימי" @@ -541,16 +567,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "פגישות הנהלה" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -638,6 +654,7 @@ msgstr "" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/client_action.xml:23 +#: code:addons/mail/static/src/xml/client_action.xml:89 #: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids @@ -770,6 +787,13 @@ msgstr "כתוב הודעה חדשה" msgid "Composition mode" msgstr "מצב הכתיבה" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -937,21 +961,14 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1438,14 +1455,6 @@ msgstr "" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1480,7 +1489,7 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1488,7 +1497,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "" @@ -1545,6 +1561,11 @@ msgstr "" msgid "Is Notification" msgstr "היא התראה" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1717,6 +1738,13 @@ msgstr "" msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1742,13 +1770,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1914,11 +1935,8 @@ msgstr "" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_needaction -#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids #: model:ir.model.fields,help:mail.field_mail_compose_message_needaction #: model:ir.model.fields,help:mail.field_mail_mail_needaction #: model:ir.model.fields,help:mail.field_mail_message_needaction @@ -1963,12 +1981,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1978,11 +2010,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2249,6 +2302,13 @@ msgstr "פרופיל שותף" msgid "Partners that did not ask not to be included in mass mailing campaigns" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids +#: 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 "" + #. module: mail #: model:ir.model.fields,help:mail.field_email_template_preview_auto_delete #: model:ir.model.fields,help:mail.field_mail_mail_auto_delete @@ -2301,7 +2361,7 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" +"- followers: only followers of the related document or members of following channels\n" msgstr "" #. module: mail @@ -2342,23 +2402,11 @@ msgstr "פרטיות" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "מו\"פ" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2844,11 +2892,6 @@ msgid "" " will be taken from the email template." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2895,6 +2938,13 @@ msgstr "" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2954,8 +3004,15 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -2985,28 +3042,35 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "שגיאת העלאה" @@ -3081,16 +3145,17 @@ msgid "Who can follow the group's activities?" msgstr "" #. module: mail -#: model:mail.channel,name:mail.channel_all_employees -msgid "Whole Company" -msgstr "כלל החברה" +#. openerp-web +#: code:addons/mail/static/src/xml/composer.xml:7 +#, python-format +msgid "Write something..." +msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/chatter.xml:57 -#: code:addons/mail/static/src/xml/composer.xml:7 +#: code:addons/mail/static/src/js/thread.js:122 #, python-format -msgid "Write something" +msgid "Yesterday" msgstr "" #. module: mail @@ -3100,6 +3165,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3141,18 +3214,11 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:469 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3171,6 +3237,11 @@ msgstr "" msgid "base.config.settings" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3178,24 +3249,29 @@ msgstr "על ידי" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:29 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:281 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:232 +#: code:addons/mail/static/src/js/chatter.js:220 #, python-format msgid "followers" msgstr "עוקבים" +#. module: mail +#: model:mail.channel,name:mail.channel_all_employees +msgid "general" +msgstr "" + #. module: mail #: model:ir.model,name:mail.model_ir_actions_server msgid "ir.actions.server" @@ -3211,6 +3287,13 @@ msgstr "" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3218,7 +3301,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3243,11 +3326,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/hr.po b/addons/mail/i18n/hr.po index 618e99a3c1c..17596558c01 100644 --- a/addons/mail/i18n/hr.po +++ b/addons/mail/i18n/hr.po @@ -10,9 +10,9 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-11-21 15:09+0000\n" -"Last-Translator: Davor Bojkić \n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" +"Last-Translator: Martin Trigaux\n" "Language-Team: Croatian (http://www.transifex.com/odoo/odoo-9/language/hr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,10 +31,10 @@ msgid "" " \n" "
\n" "\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" +"
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -56,7 +56,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -137,6 +137,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "${object.subject or (object.record_name and 'Re: %s' % object.record_name) or (object.parent_id and object.parent_id.subject and 'Re: %s' % object.parent_id.subject) or (object.parent_id and object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -144,7 +151,7 @@ msgid "%s (copy)" msgstr "%s (kopija)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "%s kreiran" @@ -157,9 +164,9 @@ msgstr "%s se priključio %s mreži." #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:86 +#: code:addons/mail/static/src/xml/thread.xml:96 #, python-format -msgid "(in channel" +msgid "(from" msgstr "" #. module: mail @@ -439,7 +446,7 @@ msgstr "Sve poruke" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "Anoniman" @@ -563,16 +570,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "Dostupan za masovno slanje e-pošte" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "Najbolja praksa u prodaji" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "Sastanci članova uprave" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -793,6 +790,13 @@ msgstr "Sastavi novu poruku" msgid "Composition mode" msgstr "Mod sastavljanja" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -960,21 +964,14 @@ msgstr "Opis koji će biti dodan u objavljenoj poruci za ovaj podtip. Ako nedost #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "Odvojiti" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "Izravne poruke" @@ -1461,14 +1458,6 @@ msgstr "Važne poruke" msgid "Important messages" msgstr "Važne poruke" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1503,7 +1492,7 @@ msgid "" msgstr "Nevažeći izraz, to mora biti doslovna python definicija npr. \"{'field': 'Vrijednost'}\"" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1511,7 +1500,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "Poziv za praćenje %s: %s" @@ -1568,6 +1564,11 @@ msgstr "Je pratitelj" msgid "Is Notification" msgstr "Je obavijest" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1740,6 +1741,13 @@ msgstr "" msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1765,13 +1773,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "Članovi tih grupa će biti automatski dodani kao sljedbenici. Imajte na umu da će oni prema potrebi moći ručno upravljati svojom pretplatom." -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "Spomenut(i):" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1983,12 +1984,26 @@ msgstr "Tekst nove vrijednosti: " #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "Nova poruka" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1998,11 +2013,32 @@ msgstr "Nove osobe" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "Nije sljedbenik" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2328,8 +2364,8 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" -msgstr "Politika ostavljanja poruka na dokumentu koristeći mailgateway.\n-svatko:svatko može objaviti poruku\n-partneri: samo autentificirani partner\n-pratitelji: samo pratitelji srodne dokumentacije\n" +"- followers: only followers of the related document or members of following channels\n" +msgstr "" #. module: mail #: model:ir.model.fields,help:mail.field_res_partner_notify_email @@ -2369,23 +2405,11 @@ msgstr "Privatnost" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "Privatni kanal" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "Privatni kanali" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "Istraživanje i razvoj" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2871,11 +2895,6 @@ msgid "" " will be taken from the email template." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2922,6 +2941,13 @@ msgstr "Za (Partneri)" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2981,8 +3007,15 @@ msgstr "Nije moguće postali e-mail, molimo podesite pošiljateljevu e-mail adre #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -3012,28 +3045,35 @@ msgstr "Brojač nepročitanih poruka" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "Odjava" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "Odjavljen" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "Greška pri preuzimanju" @@ -3109,10 +3149,17 @@ msgstr "Tko može pratiti aktivnost grupe?" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:6 +#: code:addons/mail/static/src/xml/composer.xml:7 #, python-format -msgid "Write something" -msgstr "Napiši nešto" +msgid "Write something..." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:122 +#, python-format +msgid "Yesterday" +msgstr "" #. module: mail #. openerp-web @@ -3121,6 +3168,14 @@ msgstr "Napiši nešto" msgid "You added %s to the conversation." msgstr "Dodali ste %s u razgovor." +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3162,18 +3217,11 @@ msgstr "Možete priložiti datoteke ovom predlošku, one će biti dodate svim e- #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:346 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3192,6 +3240,11 @@ msgstr "Predložak treba definirati email_from" msgid "base.config.settings" msgstr "base.config.settings" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3199,13 +3252,13 @@ msgstr "od" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:30 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "dm" #. module: mail -#: code:addons/mail/models/mail_thread.py:314 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "dokument" @@ -3237,6 +3290,13 @@ msgstr "ir.autovacuum" msgid "members" msgstr "članovi" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3244,7 +3304,7 @@ msgstr "mycompany.odoo.com" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3269,11 +3329,21 @@ msgstr "javno" msgid "publisher_warranty.contract" msgstr "publisher_warranty.contract" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "zapis:" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/hu.po b/addons/mail/i18n/hu.po index b8f63d30b46..e6a0ebbfc27 100644 --- a/addons/mail/i18n/hu.po +++ b/addons/mail/i18n/hu.po @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-10-23 17:03+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-12 22:37+0000\n" "Last-Translator: Kris Krnacs\n" "Language-Team: Hungarian (http://www.transifex.com/odoo/odoo-9/language/hu/)\n" "MIME-Version: 1.0\n" @@ -30,10 +30,10 @@ msgid "" " \n" " \n" "\n" -"

\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" "
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -55,7 +55,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -80,50 +80,45 @@ msgid "" "

\n" "
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" +"
\n" +"
\n" -"
\n" -"
\n" -"
\n" -"
\n" +" \n" +" \n" +" \n" "
\n" +"
\n" +"
\n" +"
\n" +"
\n" "
\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" -"
\n" +" \n" " ${object.body | safe}\n" " % if ctx.get('tracking'):\n" +"
    \n" " % for tracking in ctx['tracking']\n" -" ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}\n" +"
  • ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}
    • \n" " % endfor\n" +"
\n" " % endif\n" "
\n" +"
\n" "
\n" "% if ctx.get('signature'):\n" -"
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -"
\n" -"  \n" -" ${ctx['signature'] | safe}\n" -"  \n" -"
\n" -"
\n" +"
\n" +" \n" +" \n" +" \n" +" \n" +"
\n" +" ${ctx['signature'] | safe}\n" +"
\n" "
\n" -"% endif\n" -msgstr "\n
\n
\n \n \n \n
\n
\n
\n \n \n \n \n \n
\n % if ctx.get('button_access'):\n ${ctx['button_access']['title']}\n % endif\n\n % if ctx.get('button_follow'):\n ${ctx['button_follow']['title']}\n \n % elif ctx.get('button_unfollow'):\n ${ctx['button_unfollow']['title']}\n % endif\n\n % if not ctx.get('button_access') and not ctx.get('button_follow') and not ctx.get('button_unfollow') and ctx.get('model_name'):\n

\n About ${ctx['model_name']}\n % if ctx.get('record_name'):\n : ${ctx['record_name']}\n % endif\n \n

\n % endif\n 		\n

\n % if ctx.get('actions'):\n % for action in ctx['actions']:\n ${action['title']}\n %if len(ctx['actions']) > 1 and loop.index < len(ctx['actions']):\n |\n % endif\n % endfor\n % else:\n Innen küldve\n % if ctx.get('website_url'):\n \n % endif\n ${ctx.get('company_name')}\n % if ctx.get('website_url'):\n \n % endif\n using\n Odoo\n % endif\n

\n
\n
\n \n \n \n \n \n \n
\n
\n
\n
\n
\n
\n
\n \n \n \n \n
\n ${object.body | safe}\n % if ctx.get('tracking'):\n % for tracking in ctx['tracking']\n ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}\n % endfor\n % endif\n
\n
\n% if ctx.get('signature'):\n
\n
\n \n \n \n \n \n
\n  \n ${ctx['signature'] | safe}\n  \n
\n
\n
\n% endif\n" +"% endif" +msgstr "\n
\n
\n \n \n \n
\n
\n
\n \n \n \n \n \n
\n % if ctx.get('button_access'):\n ${ctx['button_access']['title']}\n % endif\n\n % if ctx.get('button_follow'):\n ${ctx['button_follow']['title']}\n \n % elif ctx.get('button_unfollow'):\n ${ctx['button_unfollow']['title']}\n % endif\n\n % if not ctx.get('button_access') and not ctx.get('button_follow') and not ctx.get('button_unfollow') and ctx.get('model_name'):\n

\n About ${ctx['model_name']}\n % if ctx.get('record_name'):\n : ${ctx['record_name']}\n % endif\n \n

\n % endif\n 		\n

\n % if ctx.get('actions'):\n % for action in ctx['actions']:\n ${action['title']}\n %if len(ctx['actions']) > 1 and loop.index < len(ctx['actions']):\n |\n % endif\n % endfor\n % else:\n Feladó\n % if ctx.get('website_url'):\n \n % endif\n ${ctx.get('company_name')}\n % if ctx.get('website_url'):\n \n % endif\n felhasználva az\n Odoo rendszert\n % endif\n

\n
\n
\n \n \n \n \n
\n
\n
\n
\n
\n
\n
\n \n \n \n \n
\n ${object.body | safe}\n % if ctx.get('tracking'):\n
    \n % for tracking in ctx['tracking']\n
  • ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}
    • \n % endfor\n
\n % endif\n
\n
\n% if ctx.get('signature'):\n
\n \n \n \n \n
\n ${ctx['signature'] | safe}\n
\n
\n% endif" #. module: mail #. openerp-web @@ -141,6 +136,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "${object.subject or (object.record_name and 'Re: %s' % object.record_name) or (object.parent_id and object.parent_id.subject and 'Re: %s' % object.parent_id.subject) or (object.parent_id and object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "%d Üzenetek" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -148,7 +150,7 @@ msgid "%s (copy)" msgstr "%s (másolat)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "%s létrehozva" @@ -159,6 +161,13 @@ msgstr "%s létrehozva" msgid "%s has joined the %s network." msgstr "%s csatlakozott a %s hálózathoz." +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:96 +#, python-format +msgid "(from" +msgstr "(feladó" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:48 @@ -175,10 +184,34 @@ msgstr "* Smiley-iket csak a HTML kódhoz használható a kép megjelenítéséh #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:122 +#: code:addons/mail/static/src/xml/thread.xml:147 #, python-format -msgid "-------- Show more messages --------" -msgstr "-------- Mutassa a többi üzenetet --------" +msgid "-------- Show older messages --------" +msgstr "-------- Régebbi üzenetek mutatása --------" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:513 +#, python-format +msgid "" +"
created #%s
" +msgstr "
létrehozta #%s
" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:489 +#, python-format +msgid "" +"
joined #%s
" +msgstr "
csatlakozott #%s
" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:151 +#, python-format +msgid "" +"
left #%s
" +msgstr "
lecsatlakozott #%s
" #. module: mail #: code:addons/mail/wizard/invite.py:22 @@ -268,13 +301,6 @@ msgstr "Egy gyorsbillentyű kombináció egy billentyűzeti kiosztás. Például msgid "Access Groups" msgstr "Csoportok hozzáférése" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/js/client_action.js:154 -#, python-format -msgid "Action" -msgstr "Művelet" - #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_message_needaction #: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction @@ -419,7 +445,7 @@ msgstr "Összes üzenet" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "Névtelenül" @@ -543,16 +569,6 @@ msgstr "Olvasandó, mint szükséges művelet, automatikusan beállítva" msgid "Available for mass mailing" msgstr "Elérhető tömeges levelezéshez" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "Legjobb Értékesítési Praktikák" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "Tanácskozás" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -640,6 +656,7 @@ msgstr "Csatorna üzenet azonosítók, id-k" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/client_action.xml:23 +#: code:addons/mail/static/src/xml/client_action.xml:89 #: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids @@ -772,6 +789,13 @@ msgstr "Új üzenet létrehozása" msgid "Composition mode" msgstr "Összeállítási mód" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "Gratulálok, a postaládája üres" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -939,21 +963,14 @@ msgstr "Leírás ami hozzá lesz adva az altípusnak elküldendő üzenethez. Ha #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "Leválaszt" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "Tudtad? Valakinek az oldalán írja be ezt: '@valaki' az összeállítóba az üzenetébe, és hagyja, hogy megjelenjen a saját bejövő levelei között." - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "Közvetlen üzenet" @@ -1440,14 +1457,6 @@ msgstr "Fontos üzenet" msgid "Important messages" msgstr "Fontos üzenet" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "A \"Csatornák\" szakaszon, megtalálhatja a nyilvános és a tiltott csatornákat.
\n A \"Közvetlen üzenet\" szakaszon lehetősége van közvetlenül egy emberrel beszélnie.
\n A \"Privát csoport\" szakaszon a privát beszélgetései vannak. Csatlakozhat privát csatornához is, úgy hogy létrehoz egy újat, vagy meghívást kap egy másikhoz.
" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1482,7 +1491,7 @@ msgid "" msgstr "Nem érvényes kifejezés, ennek python szótár kifejezésnek kell lennie pl.: \"{'field': 'value'}\"" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1490,7 +1499,14 @@ msgid "" msgstr "Nem érvényes feljegyzés beállítás: modellnek kell hívni (feljegyzések nélkül) vagy egyedi-feljegyzés feljegyzésbeállító" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "Meghívó" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "Meghívás a követésre %s: %s" @@ -1547,6 +1563,11 @@ msgstr "Ez egy követő" msgid "Is Notification" msgstr "Ez egy üzenet" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "Ő tagja" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1604,7 +1625,7 @@ msgstr "Utolsó jelenlét" #. module: mail #: model:ir.model,name:mail.model_mail_channel_partner msgid "Last Seen Many2many" -msgstr "Utolsó jelenlét Many2many" +msgstr "Utoljára látott Many2many" #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_write_uid @@ -1719,6 +1740,13 @@ msgstr "Levelet hozott létre az ügyfelek értesítésére ehhez a meglévő ü msgid "Mailing Opt-Out" msgstr "Levelezésből kilépés" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "Összeset elolvasottnak jelöl" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1744,13 +1772,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "Ezeknek a csoportoknak a tagjai automatikusan hozzá lesznek adva a követőkhöz. Megjegyezve, hogy ha szükséges szerkeszteni tudják a feliratkozásukat." -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "Megemlítés(ek):" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1916,11 +1937,8 @@ msgstr "Név, amit a létrehozott jelentés fájlhoz használ (üres mezőket is #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_needaction -#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids #: model:ir.model.fields,help:mail.field_mail_compose_message_needaction #: model:ir.model.fields,help:mail.field_mail_mail_needaction #: model:ir.model.fields,help:mail.field_mail_message_needaction @@ -1965,12 +1983,26 @@ msgstr "Szöveg új értéke" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "Új üzenet" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "Új üzenetek" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "Új üzenetek itt láthatóak." + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1980,11 +2012,32 @@ msgstr "Új személy" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "Nincs követő" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "Nem talált egyezőt" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "Kereséséhez nem talált megegyezőt. Próbálja megváltoztatni a keresési szűrőket." + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "Nincs kedvenc üzenete" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2251,6 +2304,13 @@ msgstr "Partner profil" msgid "Partners that did not ask not to be included in mass mailing campaigns" msgstr "Partnerek akik nem lettek megkérdezve, hogy ne legyenek bevéve a tömeges levelezés kampányba" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids +#: 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 "Műveletet igénylő partnerek" + #. module: mail #: model:ir.model.fields,help:mail.field_email_template_preview_auto_delete #: model:ir.model.fields,help:mail.field_mail_mail_auto_delete @@ -2303,8 +2363,8 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" -msgstr "Az üzenetátjáró használatának alapvető irányvonalai a dokumentumra vonatkozó üzenetek kiküldéséhez.\n- mindenki: mindenki tud üzenni\n- ügyfelek: csak a hitelesített partnerek\n- követők: csak az idevonatkozó dokumentum követői\n" +"- followers: only followers of the related document or members of following channels\n" +msgstr "Az üzenetátjáró használatának alapvető irányvonalai a dokumentumra vonatkozó üzenetek kiküldéséhez.\n- mindenki: mindenki tud üzenni\n- ügyfelek: csak a hitelesített partnerek\n- követők: csak az idevonatkozó dokumentum követői vagy a következő csatornák tagjai\n" #. module: mail #: model:ir.model.fields,help:mail.field_res_partner_notify_email @@ -2344,23 +2404,11 @@ msgstr "Adatvédelem" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "Privát csatorna" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "Privát csatornák" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "R&D" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2846,11 +2894,6 @@ msgid "" " will be taken from the email template." msgstr "Az it feltüntetett értékek csak információként szolgálnak. Ha emailt küld, az értékek\n az email sablonból lesznek kiküldve." -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "Nincsenek megjelenítendő üzenetek.
" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2897,6 +2940,13 @@ msgstr "Részére (Partnereknek)" msgid "To: Followers of" msgstr "Címzett: Követők ehhez" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "Ma" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2956,8 +3006,15 @@ msgstr "Nem tud e-mailt küldeni, kérem állítsa be a küldő e-mail címét v #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "Visszavon" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -2987,28 +3044,35 @@ msgstr "Olvasatlan üzenetek számlálója" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "Összes eltávolítása a kedvencekből" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "Leiratkozás" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "Leiratkozva" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "Feltöltés" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "Feltöltési hiba" @@ -3083,17 +3147,18 @@ msgid "Who can follow the group's activities?" msgstr "Ki követheti a csoport tevékenységét?" #. module: mail -#: model:mail.channel,name:mail.channel_all_employees -msgid "Whole Company" -msgstr "Teljes vállalat" +#. openerp-web +#: code:addons/mail/static/src/xml/composer.xml:7 +#, python-format +msgid "Write something..." +msgstr "Írj valamit..." #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/chatter.xml:57 -#: code:addons/mail/static/src/xml/composer.xml:7 +#: code:addons/mail/static/src/js/thread.js:122 #, python-format -msgid "Write something" -msgstr "Írj valamit" +msgid "Yesterday" +msgstr "Tegnap" #. module: mail #. openerp-web @@ -3102,6 +3167,14 @@ msgstr "Írj valamit" msgid "You added %s to the conversation." msgstr "Hozzáadta a %s ehhez a beszélgetéshez." +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "Bármely üzenetet 'csillaggal' kedvencnek jelölheti, és ez feltűnik ebben a csatornában." + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3143,18 +3216,11 @@ msgstr "Hozzáadhat fájl mellékletet ehez a sablonhoz, ami minden ezzel a sabl #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:469 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "Leiratkozott erről %s." -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "A \"Beérkezett üzenetek\" tartalmazzák az összes üzenetet, melyben szerepel, és azokat, melyeket mint egy dokumentum követő kap.
\n A \"Csillagozott\" szakasz tartalmazza az összes kedvenc üzenetét." - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3173,6 +3239,11 @@ msgstr "Sablonjának meg kell határoznia az email_from formát" msgid "base.config.settings" msgstr "base.config.settings" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "igazgatósági-ülés" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3180,24 +3251,29 @@ msgstr "által" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:29 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "dm" #. module: mail -#: code:addons/mail/models/mail_thread.py:281 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "dokumentum" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:232 +#: code:addons/mail/static/src/js/chatter.js:220 #, python-format msgid "followers" msgstr "követők" +#. module: mail +#: model:mail.channel,name:mail.channel_all_employees +msgid "general" +msgstr "általános" + #. module: mail #: model:ir.model,name:mail.model_ir_actions_server msgid "ir.actions.server" @@ -3213,6 +3289,13 @@ msgstr "ir.autovacuum" msgid "members" msgstr "tagok" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "megemlítés(ek) elolvasottként jelölve." + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3220,7 +3303,7 @@ msgstr "envallalatom.odoo.com" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3245,11 +3328,21 @@ msgstr "nyilvános" msgid "publisher_warranty.contract" msgstr "publisher_warranty.contract" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "olvasott" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "feljegyzés:" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "értékesítés" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/id.po b/addons/mail/i18n/id.po index 9adbb0dd8be..d6640af05c4 100644 --- a/addons/mail/i18n/id.po +++ b/addons/mail/i18n/id.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-12-03 00:43+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Indonesian (http://www.transifex.com/odoo/odoo-9/language/id/)\n" "MIME-Version: 1.0\n" @@ -28,10 +28,10 @@ msgid "" " \n" "
\n" "\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" +"
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -53,7 +53,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -134,6 +134,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -141,7 +148,7 @@ msgid "%s (copy)" msgstr "%s (copy)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "%s dibuat" @@ -154,9 +161,9 @@ msgstr "%s telah bergabung jaringan %s." #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:86 +#: code:addons/mail/static/src/xml/thread.xml:96 #, python-format -msgid "(in channel" +msgid "(from" msgstr "" #. module: mail @@ -436,7 +443,7 @@ msgstr "Semua Pesan" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "" @@ -560,16 +567,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "Tersedia untuk surat massal" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "Praktek penjualan" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "Rapat Dewan" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -790,6 +787,13 @@ msgstr "" msgid "Composition mode" msgstr "Mode Kompisisi" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -957,21 +961,14 @@ msgstr "Deskripsi yang akan ditambahkan dalam pesan yang dikirim untuk subtipe i #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1458,14 +1455,6 @@ msgstr "Pesan penting" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1500,7 +1489,7 @@ msgid "" msgstr "Perintahnya salah, harus sesuai dengan definisi pada kamus python misalnya. \"{'kolom':'nilai'}\"" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1508,7 +1497,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "Undangan untuk mengikuti %s: %s" @@ -1565,6 +1561,11 @@ msgstr "Adalah pengikut" msgid "Is Notification" msgstr "Notifikasi" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1737,6 +1738,13 @@ msgstr "Mail telah dibuat untuk memberitahu orang-orang mail.message yang ada" msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1762,13 +1770,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "Anggota yang kelompok akan secara otomatis ditambahkan sebagai pengikut. Perhatikan bahwa mereka akan mampu mengelola langganan mereka secara manual jika diperlukan." -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1980,12 +1981,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1995,11 +2010,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2325,8 +2361,8 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" -msgstr "Kebijakan untuk mengirimkan sebuah pesan di dokumen menggunakan mailgateway.\n-Semua orang: setiap orang dapat memposting\n - mitra: hanya dikonfirmasi mitra \n - pengikut: hanya pengikut dokumen terkait\n" +"- followers: only followers of the related document or members of following channels\n" +msgstr "" #. module: mail #: model:ir.model.fields,help:mail.field_res_partner_notify_email @@ -2366,23 +2402,11 @@ msgstr "Privasi" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "R&D" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2868,11 +2892,6 @@ msgid "" " will be taken from the email template." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2919,6 +2938,13 @@ msgstr "Untuk (mitra)" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2978,8 +3004,15 @@ msgstr "Tidak dapat mengirim email, harap mengkonfigurasi alamat email pengirim #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -3009,28 +3042,35 @@ msgstr "Pesan yang belum dibaca Counter" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "Berhenti Berlangganan" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "Meng-upload kesalahan" @@ -3106,9 +3146,16 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:6 +#: code:addons/mail/static/src/xml/composer.xml:7 #, python-format -msgid "Write something" +msgid "Write something..." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:122 +#, python-format +msgid "Yesterday" msgstr "" #. module: mail @@ -3118,6 +3165,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3159,18 +3214,11 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:346 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3189,6 +3237,11 @@ msgstr "" msgid "base.config.settings" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3196,13 +3249,13 @@ msgstr "oleh" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:30 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:314 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "dokumen" @@ -3234,6 +3287,13 @@ msgstr "" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3241,7 +3301,7 @@ msgstr "mycompany.odoo.com" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3266,11 +3326,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/it.po b/addons/mail/i18n/it.po index ef89362781d..cc33ebcedc4 100644 --- a/addons/mail/i18n/it.po +++ b/addons/mail/i18n/it.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-11-12 16:52+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Italian (http://www.transifex.com/odoo/odoo-9/language/it/)\n" "MIME-Version: 1.0\n" @@ -28,10 +28,10 @@ msgid "" " \n" " \n" "\n" -"

\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" +"
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -53,7 +53,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -134,6 +134,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -141,7 +148,7 @@ msgid "%s (copy)" msgstr "%s (copia)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "%s creato" @@ -154,9 +161,9 @@ msgstr "%s si è unito alla rete %s." #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:86 +#: code:addons/mail/static/src/xml/thread.xml:96 #, python-format -msgid "(in channel" +msgid "(from" msgstr "" #. module: mail @@ -436,7 +443,7 @@ msgstr "Tutti i Messaggi" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "" @@ -560,16 +567,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "Disponibile per mass mailing" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "Best Sales Practices" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "Appuntamenti CdA" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -790,6 +787,13 @@ msgstr "Componi nuovo Messaggio" msgid "Composition mode" msgstr "Modo composizione" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -957,21 +961,14 @@ msgstr "Descrizione che verrà aggiunta al messaggio inviato per questo sottotip #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1451,21 +1448,13 @@ msgstr "" #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban msgid "Important Messages" -msgstr "" +msgstr "Messaggi importanti" #. module: mail #: model:ir.ui.view,arch_db:mail.view_message_search msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1500,7 +1489,7 @@ msgid "" msgstr "Espressione non valida, deve essere un dizionario python, es: \"{'field':'value'}\"" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1508,7 +1497,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "" @@ -1565,6 +1561,11 @@ msgstr "E' Follower" msgid "Is Notification" msgstr "E' una notifica" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1737,6 +1738,13 @@ msgstr "" msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1762,13 +1770,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "I membri di questi gruppi verranno automaticamente aggiunti ai followers. Ricorda che saranno in grado di gestire le loro sottoscrizioni manualmente se necessario." -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1980,12 +1981,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1995,11 +2010,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2056,7 +2092,7 @@ msgstr "Numero di messaggi che richiedono un'azione" #: model:ir.model.fields,help:mail.field_res_partner_message_unread_counter #: model:ir.model.fields,help:mail.field_res_users_message_unread_counter msgid "Number of unread messages" -msgstr "" +msgstr "Numero di messaggi non letti" #. module: mail #: model:ir.actions.act_window,help:mail.action_contacts @@ -2325,7 +2361,7 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" +"- followers: only followers of the related document or members of following channels\n" msgstr "" #. module: mail @@ -2366,23 +2402,11 @@ msgstr "Privacy" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "R&D" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2868,11 +2892,6 @@ msgid "" " will be taken from the email template." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2919,6 +2938,13 @@ msgstr "A (Partners)" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2978,8 +3004,15 @@ msgstr "Impossibile inviare email, si prega di configuare l'indirizzo email del #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -3005,32 +3038,39 @@ msgstr "Messaggi Non Letti" #: model:ir.model.fields,field_description:mail.field_res_partner_message_unread_counter #: model:ir.model.fields,field_description:mail.field_res_users_message_unread_counter msgid "Unread Messages Counter" +msgstr "Contatore di messsaggi non letti" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "Annulla la sottoscrizione" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "Errore caricamento" @@ -3106,9 +3146,16 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:6 +#: code:addons/mail/static/src/xml/composer.xml:7 #, python-format -msgid "Write something" +msgid "Write something..." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:122 +#, python-format +msgid "Yesterday" msgstr "" #. module: mail @@ -3118,6 +3165,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3159,18 +3214,11 @@ msgstr "Dovresti allegare file al template, così che vengano allegati a tutte l #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:346 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3189,6 +3237,11 @@ msgstr "" msgid "base.config.settings" msgstr "base.config.settings" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3196,13 +3249,13 @@ msgstr "da" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:30 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:314 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "" @@ -3234,6 +3287,13 @@ msgstr "" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3241,7 +3301,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3266,11 +3326,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "publisher_warranty.contract" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "record:" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/ja.po b/addons/mail/i18n/ja.po index 2bf63c97391..ffa846d3aac 100644 --- a/addons/mail/i18n/ja.po +++ b/addons/mail/i18n/ja.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-12-05 03:28+0000\n" -"Last-Translator: Yoshi Tashiro \n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" +"Last-Translator: Martin Trigaux\n" "Language-Team: Japanese (http://www.transifex.com/odoo/odoo-9/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,10 +29,10 @@ msgid "" " \n" " \n" "\n" -"

\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" +"
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -54,7 +54,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -135,6 +135,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -142,7 +149,7 @@ msgid "%s (copy)" msgstr "%s（コピー）" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "%s 登録" @@ -155,9 +162,9 @@ msgstr "%s が %s ネットワークに參加しました。" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:86 +#: code:addons/mail/static/src/xml/thread.xml:96 #, python-format -msgid "(in channel" +msgid "(from" msgstr "" #. module: mail @@ -437,7 +444,7 @@ msgstr "すべてのメッセージ" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "匿名" @@ -561,16 +568,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "最適な販売プラクティス" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "役員会" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -619,14 +616,14 @@ msgstr "CCメッセージの宛先" #: model:ir.model.fields,help:mail.field_email_template_preview_email_cc #: model:ir.model.fields,help:mail.field_mail_template_email_cc msgid "Carbon copy recipients (placeholders may be used here)" -msgstr "写しの宛先名" +msgstr "CC宛先" #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_email_cc #: model:ir.model.fields,field_description:mail.field_mail_mail_email_cc #: model:ir.model.fields,field_description:mail.field_mail_template_email_cc msgid "Cc" -msgstr "写し(CC)" +msgstr "CC" #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_tracking_value_form @@ -791,6 +788,13 @@ msgstr "新規メッセージ作成" msgid "Composition mode" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -958,21 +962,14 @@ msgstr "このサブタイプのために投稿したメッセージに追加さ #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1459,14 +1456,6 @@ msgstr "" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1501,7 +1490,7 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1509,7 +1498,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "" @@ -1566,6 +1562,11 @@ msgstr "" msgid "Is Notification" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1738,6 +1739,13 @@ msgstr "" msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1763,13 +1771,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "グループのメンバーはフォロワーとして自動で追加されます。必要があればマニュアルで購読を管理できます。" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1981,12 +1982,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1996,11 +2011,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2326,7 +2362,7 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" +"- followers: only followers of the related document or members of following channels\n" msgstr "" #. module: mail @@ -2367,23 +2403,11 @@ msgstr "プライバシー" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2869,11 +2893,6 @@ msgid "" " will be taken from the email template." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2920,6 +2939,13 @@ msgstr "宛先(取引先)" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2979,8 +3005,15 @@ msgstr "Eメールが送信できません。送信者のEメールアドレス #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -3010,28 +3043,35 @@ msgstr "未読メッセージカウンター" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "購読解除" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "" @@ -3107,9 +3147,16 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:6 +#: code:addons/mail/static/src/xml/composer.xml:7 #, python-format -msgid "Write something" +msgid "Write something..." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:122 +#, python-format +msgid "Yesterday" msgstr "" #. module: mail @@ -3119,6 +3166,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3160,18 +3215,11 @@ msgstr "このテンプレートにファイルを添付できます。（この #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:346 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3190,6 +3238,11 @@ msgstr "" msgid "base.config.settings" msgstr "base.config.settings" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3197,13 +3250,13 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:30 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:314 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "" @@ -3235,6 +3288,13 @@ msgstr "" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3242,7 +3302,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3267,11 +3327,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/ka.po b/addons/mail/i18n/ka.po index ec1d787285a..0ab36d8b05c 100644 --- a/addons/mail/i18n/ka.po +++ b/addons/mail/i18n/ka.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-11-25 12:48+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Georgian (http://www.transifex.com/odoo/odoo-9/language/ka/)\n" "MIME-Version: 1.0\n" @@ -28,10 +28,10 @@ msgid "" " \n" " \n" "\n" -"

\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" +"
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -53,7 +53,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -134,6 +134,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -141,7 +148,7 @@ msgid "%s (copy)" msgstr "%s (ასლი)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "" @@ -154,9 +161,9 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:86 +#: code:addons/mail/static/src/xml/thread.xml:96 #, python-format -msgid "(in channel" +msgid "(from" msgstr "" #. module: mail @@ -436,7 +443,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "" @@ -560,16 +567,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -790,6 +787,13 @@ msgstr "" msgid "Composition mode" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -957,21 +961,14 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1458,14 +1455,6 @@ msgstr "" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1500,7 +1489,7 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1508,7 +1497,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "" @@ -1565,6 +1561,11 @@ msgstr "" msgid "Is Notification" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1737,6 +1738,13 @@ msgstr "" msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1762,13 +1770,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1980,12 +1981,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1995,11 +2010,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2325,7 +2361,7 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" +"- followers: only followers of the related document or members of following channels\n" msgstr "" #. module: mail @@ -2366,23 +2402,11 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2868,11 +2892,6 @@ msgid "" " will be taken from the email template." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2919,6 +2938,13 @@ msgstr "" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2978,8 +3004,15 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -3009,28 +3042,35 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "" @@ -3106,9 +3146,16 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:6 +#: code:addons/mail/static/src/xml/composer.xml:7 #, python-format -msgid "Write something" +msgid "Write something..." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:122 +#, python-format +msgid "Yesterday" msgstr "" #. module: mail @@ -3118,6 +3165,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3159,18 +3214,11 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:346 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3189,6 +3237,11 @@ msgstr "" msgid "base.config.settings" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3196,13 +3249,13 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:30 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:314 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "" @@ -3234,6 +3287,13 @@ msgstr "" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3241,7 +3301,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3266,11 +3326,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/kab.po b/addons/mail/i18n/kab.po index 8f106f374cd..a2730b67ee0 100644 --- a/addons/mail/i18n/kab.po +++ b/addons/mail/i18n/kab.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-10-10 09:46+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Kabyle (http://www.transifex.com/odoo/odoo-9/language/kab/)\n" "MIME-Version: 1.0\n" @@ -28,10 +28,10 @@ msgid "" " \n" " \n" "\n" -"

\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" "
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -53,7 +53,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -78,49 +78,44 @@ msgid "" "

\n" "
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" +"
\n" +"
\n" -"
\n" -"
\n" -"
\n" -"
\n" +" \n" +" \n" +" \n" "
\n" +"
\n" +"
\n" +"
\n" +"
\n" "
\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" -"
\n" +" \n" " ${object.body | safe}\n" " % if ctx.get('tracking'):\n" +"
    \n" " % for tracking in ctx['tracking']\n" -" ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}\n" +"
  • ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}
    • \n" " % endfor\n" +"
\n" " % endif\n" "
\n" +"
\n" "
\n" "% if ctx.get('signature'):\n" -"
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -"
\n" -"  \n" -" ${ctx['signature'] | safe}\n" -"  \n" -"
\n" -"
\n" +"
\n" +" \n" +" \n" +" \n" +" \n" +"
\n" +" ${ctx['signature'] | safe}\n" +"
\n" "
\n" -"% endif\n" +"% endif" msgstr "" #. module: mail @@ -139,6 +134,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -146,7 +148,7 @@ msgid "%s (copy)" msgstr "%s (Anɣel )" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "%s yerna" @@ -157,6 +159,13 @@ msgstr "%s yerna" msgid "%s has joined the %s network." msgstr "%s yernad ɣer uẓeṭṭa %s ." +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:96 +#, python-format +msgid "(from" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:48 @@ -173,9 +182,33 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:122 +#: code:addons/mail/static/src/xml/thread.xml:147 #, python-format -msgid "-------- Show more messages --------" +msgid "-------- Show older messages --------" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:513 +#, python-format +msgid "" +"
created #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:489 +#, python-format +msgid "" +"
joined #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:151 +#, python-format +msgid "" +"
left #%s
" msgstr "" #. module: mail @@ -266,13 +299,6 @@ msgstr "" msgid "Access Groups" msgstr "Igrawen n unekcum" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/js/client_action.js:154 -#, python-format -msgid "Action" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_message_needaction #: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction @@ -417,7 +443,7 @@ msgstr "Iznan Imaṛṛa" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "" @@ -541,16 +567,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -638,6 +654,7 @@ msgstr "" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/client_action.xml:23 +#: code:addons/mail/static/src/xml/client_action.xml:89 #: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids @@ -770,6 +787,13 @@ msgstr "" msgid "Composition mode" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -937,21 +961,14 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1438,14 +1455,6 @@ msgstr "" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1480,7 +1489,7 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1488,7 +1497,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "Anaɛruḍ ɣer uḍfaṛ %s:%s" @@ -1545,6 +1561,11 @@ msgstr "" msgid "Is Notification" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1717,6 +1738,13 @@ msgstr "" msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1742,13 +1770,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1914,11 +1935,8 @@ msgstr "" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_needaction -#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids #: model:ir.model.fields,help:mail.field_mail_compose_message_needaction #: model:ir.model.fields,help:mail.field_mail_mail_needaction #: model:ir.model.fields,help:mail.field_mail_message_needaction @@ -1963,12 +1981,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1978,11 +2010,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2249,6 +2302,13 @@ msgstr "Amaɣnu n umendid" msgid "Partners that did not ask not to be included in mass mailing campaigns" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids +#: 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 "" + #. module: mail #: model:ir.model.fields,help:mail.field_email_template_preview_auto_delete #: model:ir.model.fields,help:mail.field_mail_mail_auto_delete @@ -2301,7 +2361,7 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" +"- followers: only followers of the related document or members of following channels\n" msgstr "" #. module: mail @@ -2342,23 +2402,11 @@ msgstr "Tusligt" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2844,11 +2892,6 @@ msgid "" " will be taken from the email template." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2895,6 +2938,13 @@ msgstr "I (Imendiden)" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2954,8 +3004,15 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -2985,28 +3042,35 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "Tucḍa n usali " @@ -3081,16 +3145,17 @@ msgid "Who can follow the group's activities?" msgstr "" #. module: mail -#: model:mail.channel,name:mail.channel_all_employees -msgid "Whole Company" -msgstr "Takebbwanit imaṛṛa" +#. openerp-web +#: code:addons/mail/static/src/xml/composer.xml:7 +#, python-format +msgid "Write something..." +msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/chatter.xml:57 -#: code:addons/mail/static/src/xml/composer.xml:7 +#: code:addons/mail/static/src/js/thread.js:122 #, python-format -msgid "Write something" +msgid "Yesterday" msgstr "" #. module: mail @@ -3100,6 +3165,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3141,18 +3214,11 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:469 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3171,6 +3237,11 @@ msgstr "" msgid "base.config.settings" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3178,24 +3249,29 @@ msgstr "s" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:29 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:281 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "arrat" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:232 +#: code:addons/mail/static/src/js/chatter.js:220 #, python-format msgid "followers" msgstr "imagazen" +#. module: mail +#: model:mail.channel,name:mail.channel_all_employees +msgid "general" +msgstr "" + #. module: mail #: model:ir.model,name:mail.model_ir_actions_server msgid "ir.actions.server" @@ -3211,6 +3287,13 @@ msgstr "" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3218,7 +3301,7 @@ msgstr "mycompany.odoo.com" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3243,11 +3326,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "akalas" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/ko.po b/addons/mail/i18n/ko.po index d376be6b88f..24555f6a77b 100644 --- a/addons/mail/i18n/ko.po +++ b/addons/mail/i18n/ko.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-10-21 10:59+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Korean (http://www.transifex.com/odoo/odoo-9/language/ko/)\n" "MIME-Version: 1.0\n" @@ -28,10 +28,10 @@ msgid "" " \n" "
\n" "\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" "
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -53,7 +53,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -78,49 +78,44 @@ msgid "" "

\n" "
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" +"
\n" +"
\n" -"
\n" -"
\n" -"
\n" -"
\n" +" \n" +" \n" +" \n" "
\n" +"
\n" +"
\n" +"
\n" +"
\n" "
\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" -"
\n" +" \n" " ${object.body | safe}\n" " % if ctx.get('tracking'):\n" +"
    \n" " % for tracking in ctx['tracking']\n" -" ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}\n" +"
  • ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}
    • \n" " % endfor\n" +"
\n" " % endif\n" "
\n" +"
\n" "
\n" "% if ctx.get('signature'):\n" -"
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -"
\n" -"  \n" -" ${ctx['signature'] | safe}\n" -"  \n" -"
\n" -"
\n" +"
\n" +" \n" +" \n" +" \n" +" \n" +"
\n" +" ${ctx['signature'] | safe}\n" +"
\n" "
\n" -"% endif\n" +"% endif" msgstr "" #. module: mail @@ -139,6 +134,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -146,7 +148,7 @@ msgid "%s (copy)" msgstr "%s (사본)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "%s을(를) 작성함" @@ -157,6 +159,13 @@ msgstr "%s을(를) 작성함" msgid "%s has joined the %s network." msgstr "%s이(가) %s 네트워크에 참여했습니다." +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:96 +#, python-format +msgid "(from" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:48 @@ -173,9 +182,33 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:122 +#: code:addons/mail/static/src/xml/thread.xml:147 #, python-format -msgid "-------- Show more messages --------" +msgid "-------- Show older messages --------" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:513 +#, python-format +msgid "" +"
created #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:489 +#, python-format +msgid "" +"
joined #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:151 +#, python-format +msgid "" +"
left #%s
" msgstr "" #. module: mail @@ -266,13 +299,6 @@ msgstr "" msgid "Access Groups" msgstr "접근 그룹" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/js/client_action.js:154 -#, python-format -msgid "Action" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_message_needaction #: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction @@ -417,7 +443,7 @@ msgstr "모든 메시지" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "" @@ -541,16 +567,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "대량 메일 발송 사용 가능" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "최고의 영업 모범 사례" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "임원 회의" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -638,6 +654,7 @@ msgstr "" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/client_action.xml:23 +#: code:addons/mail/static/src/xml/client_action.xml:89 #: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids @@ -770,6 +787,13 @@ msgstr "" msgid "Composition mode" msgstr "작성 모드" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -937,21 +961,14 @@ msgstr "이 하위유형으로 게시된 메시지에 추가되는 설명입니 #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1438,14 +1455,6 @@ msgstr "" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1480,7 +1489,7 @@ msgid "" msgstr "잘못된 표현. 문자 그대로 파이썬 사전에 정의되어야 합니다. 예. \"{'field': 'value'}\"" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1488,7 +1497,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "%s을(를) 팔로우할 수 있도록 초대 : %s" @@ -1545,6 +1561,11 @@ msgstr "" msgid "Is Notification" msgstr "알림임" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1717,6 +1738,13 @@ msgstr "기존 mail.message 사용자에게 메일로 알림을 작성했습니 msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1742,13 +1770,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "해당 그룹의 구성원은 자동으로 팔로워로 추가됩니다. 필요한 경우 수동으로 구독을 관리할 수 있습니다." -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1914,11 +1935,8 @@ msgstr "생성된 보고서 파일에 사용할 이름(사전 표시 문자를 #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_needaction -#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids #: model:ir.model.fields,help:mail.field_mail_compose_message_needaction #: model:ir.model.fields,help:mail.field_mail_mail_needaction #: model:ir.model.fields,help:mail.field_mail_message_needaction @@ -1963,12 +1981,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1978,11 +2010,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2249,6 +2302,13 @@ msgstr "파트너 프로필" msgid "Partners that did not ask not to be included in mass mailing campaigns" msgstr "대량 메일 발송 캠페인에서 제외할지 물어보지 않는 파트너" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids +#: 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 "" + #. module: mail #: model:ir.model.fields,help:mail.field_email_template_preview_auto_delete #: model:ir.model.fields,help:mail.field_mail_mail_auto_delete @@ -2301,8 +2361,8 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" -msgstr "메일 게이트웨이를 이용해서 문서에 메시지를 게시하는 보안정책.\n- 모두 : 모두다 메시지 게시 가능\n- 파트너 : 인증된 파트너만 가능\n- 팔로워 : 관련 문서의 팔로워만 가능\n" +"- followers: only followers of the related document or members of following channels\n" +msgstr "" #. module: mail #: model:ir.model.fields,help:mail.field_res_partner_notify_email @@ -2342,23 +2402,11 @@ msgstr "개인 정보 보호" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "연구개발" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2844,11 +2892,6 @@ msgid "" " will be taken from the email template." msgstr "값은 본 계약의 정보로 표시됩니다. 이메일을 보낼 때\n 해당 값은 이메일 서식에서 가져옵니다." -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2895,6 +2938,13 @@ msgstr "받는 사람 (파트너)" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2954,8 +3004,15 @@ msgstr "이메일을 보낼 수 없으면 보낸 사람의 이메일 주소 또 #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -2985,28 +3042,35 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "구독 취소" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "업로드 작업 오류" @@ -3081,16 +3145,17 @@ msgid "Who can follow the group's activities?" msgstr "" #. module: mail -#: model:mail.channel,name:mail.channel_all_employees -msgid "Whole Company" -msgstr "회사 전체" +#. openerp-web +#: code:addons/mail/static/src/xml/composer.xml:7 +#, python-format +msgid "Write something..." +msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/chatter.xml:57 -#: code:addons/mail/static/src/xml/composer.xml:7 +#: code:addons/mail/static/src/js/thread.js:122 #, python-format -msgid "Write something" +msgid "Yesterday" msgstr "" #. module: mail @@ -3100,6 +3165,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3141,18 +3214,11 @@ msgstr "이 서식에 파일을 첨부할 수 있습니다. 이 서식으로 작 #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:469 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3171,6 +3237,11 @@ msgstr "" msgid "base.config.settings" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3178,24 +3249,29 @@ msgstr "작성자" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:29 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:281 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "문서" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:232 +#: code:addons/mail/static/src/js/chatter.js:220 #, python-format msgid "followers" msgstr "팔로워" +#. module: mail +#: model:mail.channel,name:mail.channel_all_employees +msgid "general" +msgstr "" + #. module: mail #: model:ir.model,name:mail.model_ir_actions_server msgid "ir.actions.server" @@ -3211,6 +3287,13 @@ msgstr "" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3218,7 +3301,7 @@ msgstr "mycompany.odoo.com" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3243,11 +3326,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "레코드 :" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/lt.po b/addons/mail/i18n/lt.po index 4f10dd48de6..e4add6d0560 100644 --- a/addons/mail/i18n/lt.po +++ b/addons/mail/i18n/lt.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-11-22 16:11+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Lithuanian (http://www.transifex.com/odoo/odoo-9/language/lt/)\n" "MIME-Version: 1.0\n" @@ -28,10 +28,10 @@ msgid "" " \n" "
\n" "\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" +"
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -53,7 +53,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -134,6 +134,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -141,7 +148,7 @@ msgid "%s (copy)" msgstr "%s (kopija)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "%s sukurta" @@ -154,9 +161,9 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:86 +#: code:addons/mail/static/src/xml/thread.xml:96 #, python-format -msgid "(in channel" +msgid "(from" msgstr "" #. module: mail @@ -436,7 +443,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "" @@ -560,16 +567,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "Galimas masiniams siuntimams" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -790,6 +787,13 @@ msgstr "Rašyti žinutę" msgid "Composition mode" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -957,21 +961,14 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1458,14 +1455,6 @@ msgstr "" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1500,7 +1489,7 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1508,7 +1497,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "" @@ -1565,6 +1561,11 @@ msgstr "" msgid "Is Notification" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1737,6 +1738,13 @@ msgstr "" msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1762,13 +1770,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "Šių grupių nariai automatiškai taps prenumeratoriais. Tačiau jie galės valdyti savo prenumeratą savarankišai." -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1980,12 +1981,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1995,11 +2010,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2325,7 +2361,7 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" +"- followers: only followers of the related document or members of following channels\n" msgstr "" #. module: mail @@ -2366,23 +2402,11 @@ msgstr "Slaptumas" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2868,11 +2892,6 @@ msgid "" " will be taken from the email template." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2919,6 +2938,13 @@ msgstr "" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2978,8 +3004,15 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -3009,28 +3042,35 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "" @@ -3106,9 +3146,16 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:6 +#: code:addons/mail/static/src/xml/composer.xml:7 #, python-format -msgid "Write something" +msgid "Write something..." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:122 +#, python-format +msgid "Yesterday" msgstr "" #. module: mail @@ -3118,6 +3165,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3159,18 +3214,11 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:346 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3189,6 +3237,11 @@ msgstr "" msgid "base.config.settings" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3196,13 +3249,13 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:30 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:314 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "" @@ -3234,6 +3287,13 @@ msgstr "" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3241,7 +3301,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3266,11 +3326,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/lv.po b/addons/mail/i18n/lv.po index 2fd4368887d..6f8dc1585d5 100644 --- a/addons/mail/i18n/lv.po +++ b/addons/mail/i18n/lv.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-10-10 09:46+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Latvian (http://www.transifex.com/odoo/odoo-9/language/lv/)\n" "MIME-Version: 1.0\n" @@ -28,10 +28,10 @@ msgid "" " \n" " \n" "\n" -"

\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" "
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -53,7 +53,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -78,49 +78,44 @@ msgid "" "

\n" "
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" +"
\n" +"
\n" -"
\n" -"
\n" -"
\n" -"
\n" +" \n" +" \n" +" \n" "
\n" +"
\n" +"
\n" +"
\n" +"
\n" "
\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" -"
\n" +" \n" " ${object.body | safe}\n" " % if ctx.get('tracking'):\n" +"
    \n" " % for tracking in ctx['tracking']\n" -" ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}\n" +"
  • ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}
    • \n" " % endfor\n" +"
\n" " % endif\n" "
\n" +"
\n" "
\n" "% if ctx.get('signature'):\n" -"
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -"
\n" -"  \n" -" ${ctx['signature'] | safe}\n" -"  \n" -"
\n" -"
\n" +"
\n" +" \n" +" \n" +" \n" +" \n" +"
\n" +" ${ctx['signature'] | safe}\n" +"
\n" "
\n" -"% endif\n" +"% endif" msgstr "" #. module: mail @@ -139,6 +134,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -146,7 +148,7 @@ msgid "%s (copy)" msgstr "%s (kopēt)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "" @@ -157,6 +159,13 @@ msgstr "" msgid "%s has joined the %s network." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:96 +#, python-format +msgid "(from" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:48 @@ -173,9 +182,33 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:122 +#: code:addons/mail/static/src/xml/thread.xml:147 #, python-format -msgid "-------- Show more messages --------" +msgid "-------- Show older messages --------" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:513 +#, python-format +msgid "" +"
created #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:489 +#, python-format +msgid "" +"
joined #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:151 +#, python-format +msgid "" +"
left #%s
" msgstr "" #. module: mail @@ -266,13 +299,6 @@ msgstr "" msgid "Access Groups" msgstr "Piekļuves Grupas" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/js/client_action.js:154 -#, python-format -msgid "Action" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_message_needaction #: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction @@ -417,7 +443,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "" @@ -541,16 +567,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -638,6 +654,7 @@ msgstr "" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/client_action.xml:23 +#: code:addons/mail/static/src/xml/client_action.xml:89 #: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids @@ -770,6 +787,13 @@ msgstr "" msgid "Composition mode" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -937,21 +961,14 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1438,14 +1455,6 @@ msgstr "" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1480,7 +1489,7 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1488,7 +1497,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "" @@ -1545,6 +1561,11 @@ msgstr "" msgid "Is Notification" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1717,6 +1738,13 @@ msgstr "" msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1742,13 +1770,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1914,11 +1935,8 @@ msgstr "" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_needaction -#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids #: model:ir.model.fields,help:mail.field_mail_compose_message_needaction #: model:ir.model.fields,help:mail.field_mail_mail_needaction #: model:ir.model.fields,help:mail.field_mail_message_needaction @@ -1963,12 +1981,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1978,11 +2010,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2249,6 +2302,13 @@ msgstr "" msgid "Partners that did not ask not to be included in mass mailing campaigns" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids +#: 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 "" + #. module: mail #: model:ir.model.fields,help:mail.field_email_template_preview_auto_delete #: model:ir.model.fields,help:mail.field_mail_mail_auto_delete @@ -2301,7 +2361,7 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" +"- followers: only followers of the related document or members of following channels\n" msgstr "" #. module: mail @@ -2342,23 +2402,11 @@ msgstr "Privātums" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2844,11 +2892,6 @@ msgid "" " will be taken from the email template." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2895,6 +2938,13 @@ msgstr "Kam (partneri)" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2954,8 +3004,15 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -2985,28 +3042,35 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "Atrakstīties" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "" @@ -3081,16 +3145,17 @@ msgid "Who can follow the group's activities?" msgstr "" #. module: mail -#: model:mail.channel,name:mail.channel_all_employees -msgid "Whole Company" +#. openerp-web +#: code:addons/mail/static/src/xml/composer.xml:7 +#, python-format +msgid "Write something..." msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/chatter.xml:57 -#: code:addons/mail/static/src/xml/composer.xml:7 +#: code:addons/mail/static/src/js/thread.js:122 #, python-format -msgid "Write something" +msgid "Yesterday" msgstr "" #. module: mail @@ -3100,6 +3165,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3141,18 +3214,11 @@ msgstr "Jums jāpievieno pielikumā šai sagatavei failus, kuri tiks pievienoti #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:469 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3171,6 +3237,11 @@ msgstr "" msgid "base.config.settings" msgstr "base.config.settings" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3178,24 +3249,29 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:29 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:281 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:232 +#: code:addons/mail/static/src/js/chatter.js:220 #, python-format msgid "followers" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_all_employees +msgid "general" +msgstr "" + #. module: mail #: model:ir.model,name:mail.model_ir_actions_server msgid "ir.actions.server" @@ -3211,6 +3287,13 @@ msgstr "" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3218,7 +3301,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3243,11 +3326,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/mail.pot b/addons/mail/i18n/mail.pot index 4e3dccb2340..fae4c77ded0 100644 --- a/addons/mail/i18n/mail.pot +++ b/addons/mail/i18n/mail.pot @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 9.0\n" +"Project-Id-Version: Odoo Server 9.0c\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-10-09 09:18+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-10 13:38+0000\n" "Last-Translator: <>\n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -25,10 +25,10 @@ msgid "\n" " \n" "
\n" "\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" "
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -50,7 +50,7 @@ msgid "\n" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -75,50 +75,44 @@ msgid "\n" "

\n" "
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" +"
\n" +"
\n" -"
\n" -"
\n" -"
\n" -"
\n" +" \n" +" \n" +" \n" "
\n" +"
\n" +"
\n" +"
\n" +"
\n" "
\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" -"
\n" +" \n" " ${object.body | safe}\n" " % if ctx.get('tracking'):\n" +"
    \n" " % for tracking in ctx['tracking']\n" -" ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}\n" +"
  • ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}
    • \n" " % endfor\n" +"
\n" " % endif\n" "
\n" +"
\n" "
\n" "% if ctx.get('signature'):\n" -"
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -"
\n" -"  \n" -" ${ctx['signature'] | safe}\n" -"  \n" -"
\n" -"
\n" +"
\n" +" \n" +" \n" +" \n" +" \n" +"
\n" +" ${ctx['signature'] | safe}\n" +"
\n" "
\n" -"% endif\n" -"" +"% endif" msgstr "" #. module: mail @@ -133,6 +127,13 @@ msgstr "" msgid "${object.subject or (object.record_name and 'Re: %s' % object.record_name) or (object.parent_id and object.parent_id.subject and 'Re: %s' % object.parent_id.subject) or (object.parent_id and object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -140,7 +141,7 @@ msgid "%s (copy)" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "" @@ -151,6 +152,13 @@ msgstr "" msgid "%s has joined the %s network." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:96 +#, python-format +msgid "(from" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:48 @@ -165,9 +173,27 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:122 +#: code:addons/mail/static/src/xml/thread.xml:147 #, python-format -msgid "-------- Show more messages --------" +msgid "-------- Show older messages --------" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:513 +#, python-format +msgid "
created #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:489 +#, python-format +msgid "
joined #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:151 +#, python-format +msgid "
left #%s
" msgstr "" #. module: mail @@ -247,13 +273,6 @@ msgstr "" msgid "Access Groups" msgstr "" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/js/client_action.js:154 -#, python-format -msgid "Action" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_message_needaction #: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction @@ -398,7 +417,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "" @@ -516,16 +535,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -613,6 +622,7 @@ msgstr "" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/client_action.xml:23 +#: code:addons/mail/static/src/xml/client_action.xml:89 #: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids @@ -744,6 +754,13 @@ msgstr "" msgid "Composition mode" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -908,19 +925,14 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "Did you know ? Type '@someone' in the composer to cite someone in your message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1381,13 +1393,6 @@ msgstr "" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1420,13 +1425,20 @@ msgid "Invalid expression, it must be a literal python dictionary definition e.g msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "Invalid record set: should be called as model (without records) or on single-record recordset" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "" @@ -1483,6 +1495,11 @@ msgstr "" msgid "Is Notification" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1652,6 +1669,13 @@ msgstr "" msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1672,13 +1696,6 @@ msgstr "" msgid "Members of those groups will automatically added as followers. Note that they will be able to manage their subscription manually if necessary." msgstr "" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1831,11 +1848,8 @@ msgstr "" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_needaction -#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids #: model:ir.model.fields,help:mail.field_mail_compose_message_needaction #: model:ir.model.fields,help:mail.field_mail_mail_needaction #: model:ir.model.fields,help:mail.field_mail_message_needaction @@ -1880,12 +1894,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1895,11 +1923,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2151,6 +2200,13 @@ msgstr "" msgid "Partners that did not ask not to be included in mass mailing campaigns" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids +#: 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 "" + #. module: mail #: model:ir.model.fields,help:mail.field_email_template_preview_auto_delete #: model:ir.model.fields,help:mail.field_mail_mail_auto_delete @@ -2243,23 +2299,11 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2721,11 +2765,6 @@ msgid "The values displayed hereunder are informative. When sending the email, t " will be taken from the email template." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "This field holds the image used as photo for the group, limited to 1024x1024px." @@ -2768,6 +2807,13 @@ msgstr "" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2824,8 +2870,15 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -2854,28 +2907,35 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "" @@ -2945,16 +3005,17 @@ msgid "Who can follow the group's activities?" msgstr "" #. module: mail -#: model:mail.channel,name:mail.channel_all_employees -msgid "Whole Company" +#. openerp-web +#: code:addons/mail/static/src/xml/composer.xml:7 +#, python-format +msgid "Write something..." msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/chatter.xml:57 -#: code:addons/mail/static/src/xml/composer.xml:7 +#: code:addons/mail/static/src/js/thread.js:122 #, python-format -msgid "Write something" +msgid "Yesterday" msgstr "" #. module: mail @@ -2964,6 +3025,13 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -2998,17 +3066,11 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:469 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "Your template does not defined the email address of the sender. Please update your template." @@ -3025,6 +3087,11 @@ msgstr "" msgid "base.config.settings" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3032,24 +3099,29 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:29 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:281 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:232 +#: code:addons/mail/static/src/js/chatter.js:220 #, python-format msgid "followers" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_all_employees +msgid "general" +msgstr "" + #. module: mail #: model:ir.model,name:mail.model_ir_actions_server msgid "ir.actions.server" @@ -3065,6 +3137,13 @@ msgstr "" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3072,7 +3151,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3097,11 +3176,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/mk.po b/addons/mail/i18n/mk.po index e902cdaad30..29e5ae42b30 100644 --- a/addons/mail/i18n/mk.po +++ b/addons/mail/i18n/mk.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-10-22 11:34+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Macedonian (http://www.transifex.com/odoo/odoo-9/language/mk/)\n" "MIME-Version: 1.0\n" @@ -28,10 +28,10 @@ msgid "" " \n" "
\n" "\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" "
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -53,7 +53,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -78,49 +78,44 @@ msgid "" "

\n" "
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" +"
\n" +"
\n" -"
\n" -"
\n" -"
\n" -"
\n" +" \n" +" \n" +" \n" "
\n" +"
\n" +"
\n" +"
\n" +"
\n" "
\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" -"
\n" +" \n" " ${object.body | safe}\n" " % if ctx.get('tracking'):\n" +"
    \n" " % for tracking in ctx['tracking']\n" -" ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}\n" +"
  • ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}
    • \n" " % endfor\n" +"
\n" " % endif\n" "
\n" +"
\n" "
\n" "% if ctx.get('signature'):\n" -"
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -"
\n" -"  \n" -" ${ctx['signature'] | safe}\n" -"  \n" -"
\n" -"
\n" +"
\n" +" \n" +" \n" +" \n" +" \n" +"
\n" +" ${ctx['signature'] | safe}\n" +"
\n" "
\n" -"% endif\n" +"% endif" msgstr "" #. module: mail @@ -139,6 +134,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -146,7 +148,7 @@ msgid "%s (copy)" msgstr "%s (копија)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "%s креирани" @@ -157,6 +159,13 @@ msgstr "%s креирани" msgid "%s has joined the %s network." msgstr "%s се приклучи на %s мрежата." +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:96 +#, python-format +msgid "(from" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:48 @@ -173,9 +182,33 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:122 +#: code:addons/mail/static/src/xml/thread.xml:147 #, python-format -msgid "-------- Show more messages --------" +msgid "-------- Show older messages --------" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:513 +#, python-format +msgid "" +"
created #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:489 +#, python-format +msgid "" +"
joined #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:151 +#, python-format +msgid "" +"
left #%s
" msgstr "" #. module: mail @@ -266,13 +299,6 @@ msgstr "" msgid "Access Groups" msgstr "Групи за пристап" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/js/client_action.js:154 -#, python-format -msgid "Action" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_message_needaction #: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction @@ -417,7 +443,7 @@ msgstr "Сите пораки" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "Анонимен" @@ -541,16 +567,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "Достапно за групно праќање на Е-маил пораки" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "Практика за најдобра продажба" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "Состаноци на одборот" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -638,6 +654,7 @@ msgstr "" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/client_action.xml:23 +#: code:addons/mail/static/src/xml/client_action.xml:89 #: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids @@ -770,6 +787,13 @@ msgstr "Состави нова порака" msgid "Composition mode" msgstr "Режим на составување" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -937,21 +961,14 @@ msgstr "Опис што ќе биде додаден во пораката пр #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1438,14 +1455,6 @@ msgstr "" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1480,7 +1489,7 @@ msgid "" msgstr "Невалиден израз, мора да биде буквална дефиниција од python речникот пример \"{'field': 'value'}\"" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1488,7 +1497,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "Покана за следење %s: %s" @@ -1545,6 +1561,11 @@ msgstr "е следач" msgid "Is Notification" msgstr "Е известување" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1717,6 +1738,13 @@ msgstr "Е-маил е креиран за да ги извести луѓето msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1742,13 +1770,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "Членовите на овие групи автоматски се додаваат како пратители. Имајте во предвид дека тие ќе можат сами да управуваат со претплатата рачно доколку е потребно." -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1914,11 +1935,8 @@ msgstr "Име што ќе се користи кога ќе се генерир #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_needaction -#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids #: model:ir.model.fields,help:mail.field_mail_compose_message_needaction #: model:ir.model.fields,help:mail.field_mail_mail_needaction #: model:ir.model.fields,help:mail.field_mail_message_needaction @@ -1963,12 +1981,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1978,11 +2010,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2249,6 +2302,13 @@ msgstr "Профил на партнер" msgid "Partners that did not ask not to be included in mass mailing campaigns" msgstr "Партнери кои не побарале да не бидат вклучени во групни е-маил кампањи" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids +#: 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 "" + #. module: mail #: model:ir.model.fields,help:mail.field_email_template_preview_auto_delete #: model:ir.model.fields,help:mail.field_mail_mail_auto_delete @@ -2301,7 +2361,7 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" +"- followers: only followers of the related document or members of following channels\n" msgstr "" #. module: mail @@ -2342,23 +2402,11 @@ msgstr "Приватност" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "R&D" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2844,11 +2892,6 @@ msgid "" " will be taken from the email template." msgstr "Вредностите прикажани овде се од информативен карактер. Кога праќате е-маил, вредностите\n ќе се земат од урнекот за е-маил." -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2895,6 +2938,13 @@ msgstr "До (Партнери)" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2954,8 +3004,15 @@ msgstr "Пораката не може да се испрати, ве молим #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -2985,28 +3042,35 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "Отпиши се" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "Грешка при качување" @@ -3081,16 +3145,17 @@ msgid "Who can follow the group's activities?" msgstr "" #. module: mail -#: model:mail.channel,name:mail.channel_all_employees -msgid "Whole Company" -msgstr "Цела компанија" +#. openerp-web +#: code:addons/mail/static/src/xml/composer.xml:7 +#, python-format +msgid "Write something..." +msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/chatter.xml:57 -#: code:addons/mail/static/src/xml/composer.xml:7 +#: code:addons/mail/static/src/js/thread.js:122 #, python-format -msgid "Write something" +msgid "Yesterday" msgstr "" #. module: mail @@ -3100,6 +3165,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3141,18 +3214,11 @@ msgstr "Можете да додатете фајлови на овој урне #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:469 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3171,6 +3237,11 @@ msgstr "" msgid "base.config.settings" msgstr "base.config.settings" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3178,24 +3249,29 @@ msgstr "од" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:29 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:281 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "документ" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:232 +#: code:addons/mail/static/src/js/chatter.js:220 #, python-format msgid "followers" msgstr "пратители" +#. module: mail +#: model:mail.channel,name:mail.channel_all_employees +msgid "general" +msgstr "" + #. module: mail #: model:ir.model,name:mail.model_ir_actions_server msgid "ir.actions.server" @@ -3211,6 +3287,13 @@ msgstr "" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3218,7 +3301,7 @@ msgstr "mycompany.odoo.com" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3243,11 +3326,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "publisher_warranty.contract" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "запис:" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/mn.po b/addons/mail/i18n/mn.po index c2776575cbf..09df927c772 100644 --- a/addons/mail/i18n/mn.po +++ b/addons/mail/i18n/mn.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-11-18 13:53+0000\n" -"Last-Translator: Otgonbayar Agvaan \n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" +"Last-Translator: Martin Trigaux\n" "Language-Team: Mongolian (http://www.transifex.com/odoo/odoo-9/language/mn/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,10 +29,10 @@ msgid "" " \n" "
\n" "\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -"
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -54,7 +54,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -117,7 +117,7 @@ msgid "" "

\n" "
\n" "% endif" -msgstr "\n
\n
\n \n \n \n
\n
\n
\n \n \n \n \n \n
\n % if ctx.get('button_access'):\n ${ctx['button_access']['title']}\n % endif\n\n % if ctx.get('button_follow'):\n ${ctx['button_follow']['title']}\n \n % elif ctx.get('button_unfollow'):\n ${ctx['button_unfollow']['title']}\n % endif\n\n % if not ctx.get('button_access') and not ctx.get('button_follow') and not ctx.get('button_unfollow') and ctx.get('model_name'):\n

\n Тухай ${ctx['model_name']}\n % if ctx.get('record_name'):\n : ${ctx['record_name']}\n % endif\n \n

\n % endif\n 		\n

\n % if ctx.get('actions'):\n % for action in ctx['actions']:\n ${action['title']}\n %if len(ctx['actions']) > 1 and loop.index < len(ctx['actions']):\n |\n % endif\n % endfor\n % else:\n Илгээсэн\n % if ctx.get('website_url'):\n \n % endif\n ${ctx.get('company_name')}\n % if ctx.get('website_url'):\n \n % endif\n хэрэглэгдсэн\n Odoo\n % endif\n

\n
\n
\n \n \n \n \n
\n
\n
\n
\n
\n
\n
\n \n \n \n \n
\n ${object.body | safe}\n % if ctx.get('tracking'):\n
    \n % for tracking in ctx['tracking']\n
  • ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}
    • \n % endfor\n
\n % endif\n
\n
\n% if ctx.get('signature'):\n
\n \n \n \n \n
\n ${ctx['signature'] | safe}\n
\n
\n% endif" +msgstr "" #. module: mail #. openerp-web @@ -135,6 +135,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "${object.subject or (object.record_name and 'Re: %s' % object.record_name) or (object.parent_id and object.parent_id.subject and 'Re: %s' % object.parent_id.subject) or (object.parent_id and object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -142,7 +149,7 @@ msgid "%s (copy)" msgstr "%s (хуулбар)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "%s үүсгэгдсэн" @@ -155,10 +162,10 @@ msgstr "%s нь %s сүлжээрүү нэгдлээ." #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:86 +#: code:addons/mail/static/src/xml/thread.xml:96 #, python-format -msgid "(in channel" -msgstr "(сувагт" +msgid "(from" +msgstr "" #. module: mail #. openerp-web @@ -437,7 +444,7 @@ msgstr "Бүр зурвасууд" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "Зочин" @@ -561,16 +568,6 @@ msgstr "Шаардлагатай үйлдлийг уншсанаар автом msgid "Available for mass mailing" msgstr "Масс мэйл илгээж болно" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "Борлуулалтын Шилдэг Туршлагууд" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "Захиралуудын уулзалтууд" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -791,6 +788,13 @@ msgstr "Шинэ зурвас үүсгэх" msgid "Composition mode" msgstr "Үүсгэх горим" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -958,21 +962,14 @@ msgstr "Энэ дэд төрөлийн зурвасыг илгээхэд нэм #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "Салгах" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "Та мэдэх үү ? '@someone' зурвасдаа хэн нэгийг зурвас үүсгэхдээ дурьдсанаар тэр хүний inbox-д таны зурвас харагдана." - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "Шууд Зурвасууд" @@ -1459,14 +1456,6 @@ msgstr "Чухал зурвасууд" msgid "Important messages" msgstr "Чухал зурвасууд" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "\"Сувгууд\" хэсэгт, нийтийн болон хязгаарлагдсан сувагууд байна.
\n \"Шууд Зурвас\" хэсэгт тухайлсан нэг хүнтэй шууд ярилцах боломжийг олгоно.
\n \"Хувийн бүлгэм\" хэсэгт таны хувийн ярилцлагуудыг агуулна. Хувийн сувагт холбогдохдоо нэг бол та өөрөө үүсгэж болно эсвэл өөр хэн нэгний урьсан сувагт холбогдоно.
" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1501,7 +1490,7 @@ msgid "" msgstr "Буруу илэрхийлэл, энэ нь үсгэн python dictionary тодорхойлолт байх ёстой тухайлбал \"{'field': 'value'}\"" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1509,7 +1498,14 @@ msgid "" msgstr "Буруу бичлэгийн олонлог: модел (бичлэг үгүй) гэж дуудагдсан байх эсвэл бичлэгийн олонлог дээр нэг бичлэг байгаа." #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "Дагах урилга %s: %s" @@ -1566,6 +1562,11 @@ msgstr "Дагагч эсэх" msgid "Is Notification" msgstr "Мэдэгдэл үү" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1738,6 +1739,13 @@ msgstr "mail.message -н байгаа хүмүүст мэдэгдэхээр мэ msgid "Mailing Opt-Out" msgstr "Мэйлдэхээс Хасах" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1763,13 +1771,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "Энэ бүлгэмийн гишүүд автоматаар дагагчаар нэмэгдэнэ. Гэхдээ тэд шаардлагатай бол өөрийн бүртгэлийг гараараа менежмент хийх боломжтой." -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "Дурьдсан:" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1981,12 +1982,26 @@ msgstr "Шинэ текст утга" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "Шинэ зурвас" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1996,11 +2011,32 @@ msgstr "Шинэ хүмүүс" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "Дагагч байхгүй" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2326,8 +2362,8 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" -msgstr "mailgateway ашиглан баримтанд зурвас илгээх бодлого.\n- бүгд: бигд илгээж болно\n- харилцагчид: зөвхөн баталгаажсан харилцагчид\n- дагагчид: баримтын зөвхөн дагагчид\n" +"- followers: only followers of the related document or members of following channels\n" +msgstr "" #. module: mail #: model:ir.model.fields,help:mail.field_res_partner_notify_email @@ -2367,23 +2403,11 @@ msgstr "Хувийн нууц" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "Хувийн Суваг" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "Хувийн Суваг" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "R&D" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2869,11 +2893,6 @@ msgid "" " will be taken from the email template." msgstr "Энд харуулж байгаа утга нь мэдээллийн чанартай. Эмэйл илгээх үед \n үлгэрээс утга нь авагдана." -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "Харуулах зурвас алга байна.
" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2920,6 +2939,13 @@ msgstr "Хэнд (Харилцагчид)" msgid "To: Followers of" msgstr "Хэнд: Дараахийн дагагчидад" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2979,8 +3005,15 @@ msgstr "Имэйл илгээж чадахгүй, илгээгчийн имэй #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -3010,28 +3043,35 @@ msgstr "Уншаагүй зурвасын тоолуур" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "Захиалга цуцлах" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "Бүртгэл арилгагдсан" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "Ачааллаж байна" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "Хуулалтын алдаа" @@ -3107,10 +3147,17 @@ msgstr "Группийн үйл ажиллагааг хэн дагаж чада #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:6 +#: code:addons/mail/static/src/xml/composer.xml:7 #, python-format -msgid "Write something" -msgstr "Ямар нэг зүйл бичнэ үү" +msgid "Write something..." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:122 +#, python-format +msgid "Yesterday" +msgstr "" #. module: mail #. openerp-web @@ -3119,6 +3166,14 @@ msgstr "Ямар нэг зүйл бичнэ үү" msgid "You added %s to the conversation." msgstr "Та %s-г хөөрөлдөөнд нэмлээ." +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3160,18 +3215,11 @@ msgstr "Энэ имэйл үлгэрээр үүсгэгдэх бүх имэйл #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:346 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "Та %s-с бүртгэл чинь хасагдлаа." -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "Таны \"Inbox\"-д таныг дурссан бүх зурвасууд харагдана, мөн дагаж байгаа баримтын зурвасууд харагдана.
\n \"Одоор тэмдэглэсэн\" хэсэгт таны эрхэмлэсэн бүх зурвас харагдана." - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3190,6 +3238,11 @@ msgstr "Таны үлгэр email_from-г тодорхойлох ёстой" msgid "base.config.settings" msgstr "base.config.settings" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3197,13 +3250,13 @@ msgstr "аар" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:30 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "dm" #. module: mail -#: code:addons/mail/models/mail_thread.py:314 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "баримт" @@ -3235,6 +3288,13 @@ msgstr "ir.autovacuum" msgid "members" msgstr "гишүүд" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3242,7 +3302,7 @@ msgstr "mycompany.odoo.com" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3267,11 +3327,21 @@ msgstr "нийтийн" msgid "publisher_warranty.contract" msgstr "publisher_warranty.contract" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "бичлэг:" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/nb.po b/addons/mail/i18n/nb.po index 4dcca7ba293..d440ffa36aa 100644 --- a/addons/mail/i18n/nb.po +++ b/addons/mail/i18n/nb.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-11-13 21:40+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/odoo/odoo-9/language/nb/)\n" "MIME-Version: 1.0\n" @@ -28,10 +28,10 @@ msgid "" " \n" " \n" "\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" +"
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -53,7 +53,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -134,6 +134,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -141,7 +148,7 @@ msgid "%s (copy)" msgstr "%s (kopi)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "" @@ -154,9 +161,9 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:86 +#: code:addons/mail/static/src/xml/thread.xml:96 #, python-format -msgid "(in channel" +msgid "(from" msgstr "" #. module: mail @@ -436,7 +443,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "" @@ -560,16 +567,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -790,6 +787,13 @@ msgstr "" msgid "Composition mode" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -957,21 +961,14 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1458,14 +1455,6 @@ msgstr "" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1500,7 +1489,7 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1508,7 +1497,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "" @@ -1565,6 +1561,11 @@ msgstr "" msgid "Is Notification" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1737,6 +1738,13 @@ msgstr "" msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1762,13 +1770,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1980,12 +1981,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1995,11 +2010,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2325,7 +2361,7 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" +"- followers: only followers of the related document or members of following channels\n" msgstr "" #. module: mail @@ -2366,23 +2402,11 @@ msgstr "Privat." #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2868,11 +2892,6 @@ msgid "" " will be taken from the email template." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2919,6 +2938,13 @@ msgstr "" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2978,8 +3004,15 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -3009,28 +3042,35 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "Avslutt abonnement." #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "" @@ -3106,9 +3146,16 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:6 +#: code:addons/mail/static/src/xml/composer.xml:7 #, python-format -msgid "Write something" +msgid "Write something..." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:122 +#, python-format +msgid "Yesterday" msgstr "" #. module: mail @@ -3118,6 +3165,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3159,18 +3214,11 @@ msgstr "Du kan legge til filer til denne malen, som skal legges til all e-post s #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:346 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3189,6 +3237,11 @@ msgstr "" msgid "base.config.settings" msgstr "Base.Konfigurasjon.Innstillinger." +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3196,13 +3249,13 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:30 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:314 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "" @@ -3234,6 +3287,13 @@ msgstr "" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3241,7 +3301,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3266,11 +3326,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/nl.po b/addons/mail/i18n/nl.po index 6172d519e64..e6ddd59dea2 100644 --- a/addons/mail/i18n/nl.po +++ b/addons/mail/i18n/nl.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-11-22 13:58+0000\n" -"Last-Translator: Erwin van der Ploeg \n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 09:13+0000\n" +"Last-Translator: Yenthe Van Ginneken \n" "Language-Team: Dutch (http://www.transifex.com/odoo/odoo-9/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,10 +32,10 @@ msgid "" " \n" " \n" "\n" -"

\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -"
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -57,7 +57,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -120,7 +120,7 @@ msgid "" "

\n" "
\n" "% endif" -msgstr "\n
\n
\n \n \n \n
\n
\n
\n \n \n \n \n \n
\n % if ctx.get('button_access'):\n ${ctx['button_access']['title']}\n % endif\n\n % if ctx.get('button_follow'):\n ${ctx['button_follow']['title']}\n \n % elif ctx.get('button_unfollow'):\n ${ctx['button_unfollow']['title']}\n % endif\n\n % if not ctx.get('button_access') and not ctx.get('button_follow') and not ctx.get('button_unfollow') and ctx.get('model_name'):\n

\n Over ${ctx['model_name']}\n % if ctx.get('record_name'):\n : ${ctx['record_name']}\n % endif\n \n

\n % endif\n 		\n

\n % if ctx.get('actions'):\n % for action in ctx['actions']:\n ${action['title']}\n %if len(ctx['actions']) > 1 and loop.index < len(ctx['actions']):\n |\n % endif\n % endfor\n % else:\n Verzonden door\n % if ctx.get('website_url'):\n \n % endif\n ${ctx.get('company_name')}\n % if ctx.get('website_url'):\n \n % endif\n gebruikt\n Odoo\n % endif\n

\n
\n
\n \n \n \n \n
\n
\n
\n
\n
\n
\n
\n \n \n \n \n
\n ${object.body | safe}\n % if ctx.get('tracking'):\n
    \n % for tracking in ctx['tracking']\n
  • ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}
    • \n % endfor\n
\n % endif\n
\n
\n% if ctx.get('signature'):\n
\n \n \n \n \n
\n ${ctx['signature'] | safe}\n
\n
\n% endif" +msgstr "" #. module: mail #. openerp-web @@ -138,6 +138,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "${object.subject or (object.record_name and 'Re: %s' % object.record_name) or (object.parent_id and object.parent_id.subject and 'Re: %s' % object.parent_id.subject) or (object.parent_id and object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "%d Berichten" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -145,7 +152,7 @@ msgid "%s (copy)" msgstr "%s (kopie)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "%s aangemaakt" @@ -158,10 +165,10 @@ msgstr "%s heeft zich aangesloten bij het %s netwerk." #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:86 +#: code:addons/mail/static/src/xml/thread.xml:96 #, python-format -msgid "(in channel" -msgstr "(in kanaal" +msgid "(from" +msgstr "(van" #. module: mail #. openerp-web @@ -440,7 +447,7 @@ msgstr "Alle berichten" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "Anoniem" @@ -564,16 +571,6 @@ msgstr "Zet automatisch vereist actie naar gelezen" msgid "Available for mass mailing" msgstr "Beschikbaar voor bulk-mailing" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "Beste verkoop technieken" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "Bestuursvergaderingen" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -794,6 +791,13 @@ msgstr "Maak een nieuw bericht" msgid "Composition mode" msgstr "Bewerkmodus" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "Proficiat, uw inbox is leeg" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -961,21 +965,14 @@ msgstr "Omschrijving welke wordt toegevoegd aan het bericht voor dit subtype. In #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "Ontkoppel" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "Wist u dit? Type '@iemand' in de composer om iemand te citeren in uw bericht en laat het voorkomen in uw inbox." - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "Directe berichten" @@ -1462,14 +1459,6 @@ msgstr "Belangrijke berichten" msgid "Important messages" msgstr "Belangrijke berichten" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "In de \"Kanalen\" sectie vind u de publieke en beperkte kanalen.
\nDe *Directe berichten\" sectie staat u toe om direct tegen eender wie te spreken.
\nDe \"Privégroep\" sectie bevat privé conversaties. U kan lid worden van een privékanaal door het kanaal zelf aan te maken of door uitgenodigd te worden door iemand anders.
" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1504,7 +1493,7 @@ msgid "" msgstr "Ongeldige expressie, het moet een letterlijke python dictionary definition zijn, bijvoorbeeld: \"{'field': 'value'}\"" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1512,7 +1501,14 @@ msgid "" msgstr "Foutieve record set: moet als model aangesproken worden (zonder records) of op één recordset" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "Uitnodiging" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "Uitnodiging om te volgen %s: %s" @@ -1569,6 +1565,11 @@ msgstr "Is een volger" msgid "Is Notification" msgstr "Is melding" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "Is een lid" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1741,6 +1742,13 @@ msgstr "E-mail is aangemaakt om mensen op de hoogte te brengen van een bestaande msgid "Mailing Opt-Out" msgstr "Mailing opt-out" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "Markeer alles als gelezen" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1766,13 +1774,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "Leden van die groepen worden automatisch toegevoegd als volger. Zij kunnen zelfstandig hun lidmaatschap beheren als dat nodig is." -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "Vermelding(en):" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1984,12 +1985,26 @@ msgstr "Nieuwe waarde tekst" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "Nieuw bericht" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "Nieuwe berichten" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "Nieuwe berichten verschijnen hier." + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1999,11 +2014,32 @@ msgstr "Nieuwe persoon" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "Geen volger" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "Geen overeenkomsten gevonden" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "Geen berichten komen overeen met uw zoekopdracht. Probeer uw zoekfilters te wijzigen." + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "Geen berichten met ster." + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2329,8 +2365,8 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" -msgstr "Beleid om een bericht te versturen bij een document door gebruik te maken van de mail gateway.\n-iedereen: iedereen mag versturen\n-relaties: alleen geautoriseerde relaties\n-volgers: allen volgers van een bijbehorend document\n" +"- followers: only followers of the related document or members of following channels\n" +msgstr "Beleid om een bericht te versturen bij een document door gebruik te maken van de mail gateway.\n-iedereen: iedereen mag versturen\n-relaties: alleen geautoriseerde relaties\n-volgers: allen volgers van een bijbehorend document of volgers van gevolgde kanalen\n" #. module: mail #: model:ir.model.fields,help:mail.field_res_partner_notify_email @@ -2370,23 +2406,11 @@ msgstr "Privacy" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "Privé-kanaal" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "Privé kanalen" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "R&D" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2872,11 +2896,6 @@ msgid "" " will be taken from the email template." msgstr "De waardes hieronder weergegeven zijn informatief. Bij het versturen van een e-mail, worden deze waardes\n overgenomen van het e-mailsjabloon." -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "Er zijn geen berichten om te tonen.
" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2923,6 +2942,13 @@ msgstr "Naar (Relaties)" msgid "To: Followers of" msgstr "Aan: volgers van" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "Vandaag" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2982,8 +3008,15 @@ msgstr "Niet mogelijk om e-mail te versturen. Stel het e-mail adres of alias van #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "Ongedaan maken" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -3013,28 +3046,35 @@ msgstr "Teller ongelezen berichten" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "Alle sterren verwijderen" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "Uitschrijven" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "Uitgeschreven" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "Uploaden" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "Fout bij uploaden" @@ -3110,10 +3150,17 @@ msgstr "Wie kan de groepsactiviteiten volgen?" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:6 +#: code:addons/mail/static/src/xml/composer.xml:7 #, python-format -msgid "Write something" -msgstr "Schrijf iets" +msgid "Write something..." +msgstr "Schrijf iets..." + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:122 +#, python-format +msgid "Yesterday" +msgstr "Gisteren" #. module: mail #. openerp-web @@ -3122,6 +3169,14 @@ msgstr "Schrijf iets" msgid "You added %s to the conversation." msgstr "U heeft %s toegevoegd aan de conversatie." +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3163,18 +3218,11 @@ msgstr "U kunt bestanden toevoegen aan dit sjabloon. Deze worden vervolgens toeg #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:346 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "U heeft zich uitgeschreven van %s." -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "Uw \"inbox\" bevat alle berichten waarin u bent vermeld en alle berichten die u heeft ontvangen als een volger van een document.
\nDe \"Met ster\" sectie bevat al uw favorieten berichten." - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3193,6 +3241,11 @@ msgstr "Uw sjabloon moet email_from definiëren" msgid "base.config.settings" msgstr "base.config.settings" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "Bestuursvergaderingen" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3200,13 +3253,13 @@ msgstr "door" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:30 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "dm" #. module: mail -#: code:addons/mail/models/mail_thread.py:314 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "document" @@ -3238,6 +3291,13 @@ msgstr "ir.autovacuum" msgid "members" msgstr "leden" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3245,7 +3305,7 @@ msgstr "mijnbedrijf.odoo.com" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3270,11 +3330,21 @@ msgstr "publiek" msgid "publisher_warranty.contract" msgstr "publisher_warranty.contract" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "rd" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "regel:" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "verkoop" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/nl_BE.po b/addons/mail/i18n/nl_BE.po index 5e692e6e3e8..2b3c5e5ddc2 100644 --- a/addons/mail/i18n/nl_BE.po +++ b/addons/mail/i18n/nl_BE.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-10-10 09:46+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Dutch (Belgium) (http://www.transifex.com/odoo/odoo-9/language/nl_BE/)\n" "MIME-Version: 1.0\n" @@ -28,10 +28,10 @@ msgid "" " \n" " \n" "\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" "
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -53,7 +53,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -78,49 +78,44 @@ msgid "" "

\n" "
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" +"
\n" +"
\n" -"
\n" -"
\n" -"
\n" -"
\n" +" \n" +" \n" +" \n" "
\n" +"
\n" +"
\n" +"
\n" +"
\n" "
\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" -"
\n" +" \n" " ${object.body | safe}\n" " % if ctx.get('tracking'):\n" +"
    \n" " % for tracking in ctx['tracking']\n" -" ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}\n" +"
  • ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}
    • \n" " % endfor\n" +"
\n" " % endif\n" "
\n" +"
\n" "
\n" "% if ctx.get('signature'):\n" -"
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -"
\n" -"  \n" -" ${ctx['signature'] | safe}\n" -"  \n" -"
\n" -"
\n" +"
\n" +" \n" +" \n" +" \n" +" \n" +"
\n" +" ${ctx['signature'] | safe}\n" +"
\n" "
\n" -"% endif\n" +"% endif" msgstr "" #. module: mail @@ -139,6 +134,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -146,7 +148,7 @@ msgid "%s (copy)" msgstr "%s (kopie)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "" @@ -157,6 +159,13 @@ msgstr "" msgid "%s has joined the %s network." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:96 +#, python-format +msgid "(from" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:48 @@ -173,9 +182,33 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:122 +#: code:addons/mail/static/src/xml/thread.xml:147 #, python-format -msgid "-------- Show more messages --------" +msgid "-------- Show older messages --------" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:513 +#, python-format +msgid "" +"
created #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:489 +#, python-format +msgid "" +"
joined #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:151 +#, python-format +msgid "" +"
left #%s
" msgstr "" #. module: mail @@ -266,13 +299,6 @@ msgstr "" msgid "Access Groups" msgstr "" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/js/client_action.js:154 -#, python-format -msgid "Action" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_message_needaction #: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction @@ -417,7 +443,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "" @@ -541,16 +567,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "Beschikbaar voor mass mailing" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -638,6 +654,7 @@ msgstr "" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/client_action.xml:23 +#: code:addons/mail/static/src/xml/client_action.xml:89 #: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids @@ -770,6 +787,13 @@ msgstr "" msgid "Composition mode" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -937,21 +961,14 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1438,14 +1455,6 @@ msgstr "Belangrijke berichten" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1480,7 +1489,7 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1488,7 +1497,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "" @@ -1545,6 +1561,11 @@ msgstr "Is Volger" msgid "Is Notification" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1717,6 +1738,13 @@ msgstr "" msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1742,13 +1770,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1914,11 +1935,8 @@ msgstr "" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_needaction -#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids #: model:ir.model.fields,help:mail.field_mail_compose_message_needaction #: model:ir.model.fields,help:mail.field_mail_mail_needaction #: model:ir.model.fields,help:mail.field_mail_message_needaction @@ -1963,12 +1981,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1978,11 +2010,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2249,6 +2302,13 @@ msgstr "" msgid "Partners that did not ask not to be included in mass mailing campaigns" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids +#: 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 "" + #. module: mail #: model:ir.model.fields,help:mail.field_email_template_preview_auto_delete #: model:ir.model.fields,help:mail.field_mail_mail_auto_delete @@ -2301,7 +2361,7 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" +"- followers: only followers of the related document or members of following channels\n" msgstr "" #. module: mail @@ -2342,23 +2402,11 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2844,11 +2892,6 @@ msgid "" " will be taken from the email template." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2895,6 +2938,13 @@ msgstr "" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2954,8 +3004,15 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -2985,28 +3042,35 @@ msgstr "Teller ongelezen berichten" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "" @@ -3081,16 +3145,17 @@ msgid "Who can follow the group's activities?" msgstr "" #. module: mail -#: model:mail.channel,name:mail.channel_all_employees -msgid "Whole Company" +#. openerp-web +#: code:addons/mail/static/src/xml/composer.xml:7 +#, python-format +msgid "Write something..." msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/chatter.xml:57 -#: code:addons/mail/static/src/xml/composer.xml:7 +#: code:addons/mail/static/src/js/thread.js:122 #, python-format -msgid "Write something" +msgid "Yesterday" msgstr "" #. module: mail @@ -3100,6 +3165,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3141,18 +3214,11 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:469 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3171,6 +3237,11 @@ msgstr "" msgid "base.config.settings" msgstr "base.config.settings" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3178,24 +3249,29 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:29 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:281 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:232 +#: code:addons/mail/static/src/js/chatter.js:220 #, python-format msgid "followers" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_all_employees +msgid "general" +msgstr "" + #. module: mail #: model:ir.model,name:mail.model_ir_actions_server msgid "ir.actions.server" @@ -3211,6 +3287,13 @@ msgstr "" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3218,7 +3301,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3243,11 +3326,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/pl.po b/addons/mail/i18n/pl.po index e1371e5fc59..6b88addc45c 100644 --- a/addons/mail/i18n/pl.po +++ b/addons/mail/i18n/pl.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-10-10 09:46+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Polish (http://www.transifex.com/odoo/odoo-9/language/pl/)\n" "MIME-Version: 1.0\n" @@ -29,10 +29,10 @@ msgid "" " \n" "
\n" "\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" "
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -54,7 +54,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -79,49 +79,44 @@ msgid "" "

\n" "
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" +"
\n" +"
\n" -"
\n" -"
\n" -"
\n" -"
\n" +" \n" +" \n" +" \n" "
\n" +"
\n" +"
\n" +"
\n" +"
\n" "
\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" -"
\n" +" \n" " ${object.body | safe}\n" " % if ctx.get('tracking'):\n" +"
    \n" " % for tracking in ctx['tracking']\n" -" ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}\n" +"
  • ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}
    • \n" " % endfor\n" +"
\n" " % endif\n" "
\n" +" \n" +" \n" "
\n" "% if ctx.get('signature'):\n" -"
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -"
\n" -"  \n" -" ${ctx['signature'] | safe}\n" -"  \n" -"
\n" -"
\n" +"
\n" +" \n" +" \n" +" \n" +" \n" +"
\n" +" ${ctx['signature'] | safe}\n" +"
\n" "
\n" -"% endif\n" +"% endif" msgstr "" #. module: mail @@ -140,6 +135,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -147,7 +149,7 @@ msgid "%s (copy)" msgstr "%s (kopia)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "%s utworzono" @@ -158,6 +160,13 @@ msgstr "%s utworzono" msgid "%s has joined the %s network." msgstr "%s dołączył do sieci %s." +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:96 +#, python-format +msgid "(from" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:48 @@ -174,9 +183,33 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:122 +#: code:addons/mail/static/src/xml/thread.xml:147 #, python-format -msgid "-------- Show more messages --------" +msgid "-------- Show older messages --------" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:513 +#, python-format +msgid "" +"
created #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:489 +#, python-format +msgid "" +"
joined #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:151 +#, python-format +msgid "" +"
left #%s
" msgstr "" #. module: mail @@ -267,13 +300,6 @@ msgstr "" msgid "Access Groups" msgstr "Grupy dostępu" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/js/client_action.js:154 -#, python-format -msgid "Action" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_message_needaction #: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction @@ -418,7 +444,7 @@ msgstr "Wszystkie wiadomości" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "Anonimowo" @@ -542,16 +568,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "Dostępne dla poczty masowej" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "Najlepsze praktyki sprzedaży" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "Spotkania" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -639,6 +655,7 @@ msgstr "" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/client_action.xml:23 +#: code:addons/mail/static/src/xml/client_action.xml:89 #: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids @@ -771,6 +788,13 @@ msgstr "Utwórz nową wiadomość" msgid "Composition mode" msgstr "Tryb pisania" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -938,21 +962,14 @@ msgstr "Opis, który zostanie dodany do wiadomości umieszczonej dla tego podtyp #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1439,14 +1456,6 @@ msgstr "" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1481,7 +1490,7 @@ msgid "" msgstr "Niedozwolone wyrażenie, to musi być python dictionary np. \"{'field': 'value'}\"" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1489,7 +1498,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "Zaproszenie do obserwacji %s: %s" @@ -1546,6 +1562,11 @@ msgstr "Jest obserwatorem" msgid "Is Notification" msgstr "Jest powiadomieniem" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1718,6 +1739,13 @@ msgstr "Wiadomość została utworzona, aby poinformować o istniejącym mail.me msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1743,13 +1771,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "Członkowie tych grup będą automatycznie dodani jako obserwatorzy. Zwróć uwagę, że oni sami mogą zmieniać swoje ustawienia do subskrypcji." -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1915,11 +1936,8 @@ msgstr "Nazwa dla pliku raportu (może zawierać wyrażenia)\nRozszerzenie możn #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_needaction -#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids #: model:ir.model.fields,help:mail.field_mail_compose_message_needaction #: model:ir.model.fields,help:mail.field_mail_mail_needaction #: model:ir.model.fields,help:mail.field_mail_message_needaction @@ -1964,12 +1982,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1979,11 +2011,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2250,6 +2303,13 @@ msgstr "Profil Partnera" msgid "Partners that did not ask not to be included in mass mailing campaigns" msgstr "Partnerzy, którzy nie chcieli być uwzględnieni w kampaniach masowego mailingu" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids +#: 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 "" + #. module: mail #: model:ir.model.fields,help:mail.field_email_template_preview_auto_delete #: model:ir.model.fields,help:mail.field_mail_mail_auto_delete @@ -2302,7 +2362,7 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" +"- followers: only followers of the related document or members of following channels\n" msgstr "" #. module: mail @@ -2343,23 +2403,11 @@ msgstr "Prywatność" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "B + R" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2845,11 +2893,6 @@ msgid "" " will be taken from the email template." msgstr "Wyświetlone wartości mają charakter przykładowy. Przy wysyłaniu wiadomości, wartości\n zostaną wzięte z szablonu e-mail." -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2896,6 +2939,13 @@ msgstr "Do (Partnerzy)" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2955,8 +3005,15 @@ msgstr "Nie można wysłać maila. Skonfiguruj adres nadawcy lub alias." #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -2986,28 +3043,35 @@ msgstr "Licznik nieprzeczytanych wiadomości" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "Zrezygnuj z subskrypcji" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "Błąd uploadu" @@ -3082,16 +3146,17 @@ msgid "Who can follow the group's activities?" msgstr "" #. module: mail -#: model:mail.channel,name:mail.channel_all_employees -msgid "Whole Company" -msgstr "Cała firma" +#. openerp-web +#: code:addons/mail/static/src/xml/composer.xml:7 +#, python-format +msgid "Write something..." +msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/chatter.xml:57 -#: code:addons/mail/static/src/xml/composer.xml:7 +#: code:addons/mail/static/src/js/thread.js:122 #, python-format -msgid "Write something" +msgid "Yesterday" msgstr "" #. module: mail @@ -3101,6 +3166,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3142,18 +3215,11 @@ msgstr "Możesz załączać pliki do tego szablonu, które mają być dodane do #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:469 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3172,6 +3238,11 @@ msgstr "" msgid "base.config.settings" msgstr "base.config.settings" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3179,24 +3250,29 @@ msgstr "przez" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:29 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:281 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "dokument" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:232 +#: code:addons/mail/static/src/js/chatter.js:220 #, python-format msgid "followers" msgstr "obserwatorzy" +#. module: mail +#: model:mail.channel,name:mail.channel_all_employees +msgid "general" +msgstr "" + #. module: mail #: model:ir.model,name:mail.model_ir_actions_server msgid "ir.actions.server" @@ -3212,6 +3288,13 @@ msgstr "" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3219,7 +3302,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3244,11 +3327,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "rekord:" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/pt.po b/addons/mail/i18n/pt.po index ead15807b70..a3fe48fb9e9 100644 --- a/addons/mail/i18n/pt.po +++ b/addons/mail/i18n/pt.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-11-25 19:39+0000\n" -"Last-Translator: Ricardo Correia \n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-12 13:18+0000\n" +"Last-Translator: Martin Trigaux\n" "Language-Team: Portuguese (http://www.transifex.com/odoo/odoo-9/language/pt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,10 +30,10 @@ msgid "" " \n" "
\n" "\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -"
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -55,7 +55,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -136,6 +136,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "${object.subject or (object.record_name and 'Re: %s' % object.record_name) or (object.parent_id and object.parent_id.subject and 'Re: %s' % object.parent_id.subject) or (object.parent_id and object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -143,7 +150,7 @@ msgid "%s (copy)" msgstr "%s (cópia)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "%s criado" @@ -156,10 +163,10 @@ msgstr "%s conectou-se à rede de %s." #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:86 +#: code:addons/mail/static/src/xml/thread.xml:96 #, python-format -msgid "(in channel" -msgstr "(no canal" +msgid "(from" +msgstr "" #. module: mail #. openerp-web @@ -438,7 +445,7 @@ msgstr "Todas as Mensagens" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "Anónimo" @@ -562,16 +569,6 @@ msgstr "Automaticamente definir a ação necessária como a Ler" msgid "Available for mass mailing" msgstr "Disponível para Emails em Massa" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "Melhores Práticas de Vendas" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "Reuniões" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -792,6 +789,13 @@ msgstr "Compor Nova Mensagem" msgid "Composition mode" msgstr "Modo de composição" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -959,21 +963,14 @@ msgstr "Descrição que será adicionada na mensagem enviada para este subtipo. #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "Desanexar" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "Sabia que? Escreva '@CCCCC' na composição para citar CCCCC na sua mensagem e ela aparecerá na sua própria caixa de entrada." - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "Mensagens diretas" @@ -1460,14 +1457,6 @@ msgstr "Mensagens Importantes" msgid "Important messages" msgstr "Mensagens Importantes" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1502,7 +1491,7 @@ msgid "" msgstr "Expressão inválida, deve ser uma definição literal de dicionário estilo python como \"{'field': 'value'}\"" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1510,7 +1499,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "Convite para seguir %s: %s" @@ -1567,6 +1563,11 @@ msgstr "É um seguidor" msgid "Is Notification" msgstr "É notificação" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1739,6 +1740,13 @@ msgstr "Mensagem foi criada para notificar as pessoas de uma mail.message existe msgid "Mailing Opt-Out" msgstr "Excluir Emails" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1764,13 +1772,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "Membros destes grupos serão adicionados automaticamente como seguidores. Observe que eles poderão gerenciar sua inscrição manualmente se necessário." -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "Menção(s):" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1982,12 +1983,26 @@ msgstr "Novo Valor de Texto: " #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "Nova Mensagem" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1997,11 +2012,32 @@ msgstr "Novas pessoas" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "Sem seguidor" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2327,8 +2363,8 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" -msgstr "Política para enviar uma mensagem sobre o documento usando o MailGateway .\n- Todos : todos podem postar\n- Parceiros: parceiros apenas autenticados\n- Seguidores: apenas os seguidores do documento relacionado\n" +"- followers: only followers of the related document or members of following channels\n" +msgstr "" #. module: mail #: model:ir.model.fields,help:mail.field_res_partner_notify_email @@ -2368,23 +2404,11 @@ msgstr "Privacidade" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "Canal privado" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "Canais privados" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "R&D" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2870,11 +2894,6 @@ msgid "" " will be taken from the email template." msgstr "Os valores exibidos abaixo são de caráter informativo. Ao enviar o e-mail, os valores \n                                 serão tomadas a partir do modelo de e-mail." -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "Não existem mensagem a mostrar.
" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2921,6 +2940,13 @@ msgstr "Para (Parceiros)" msgid "To: Followers of" msgstr "Para: Seguidores de" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2980,8 +3006,15 @@ msgstr "Não foi possível enviar o e-mail, por favor configure o endereço de e #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -3011,28 +3044,35 @@ msgstr "Contador de Mensagens por Ler" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "Cancelar Subscrição" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "Subscrição cancelada" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "Uploading" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "Erro de carregamento" @@ -3108,10 +3148,17 @@ msgstr "Quem pode seguir as actividades do grupo?" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:6 +#: code:addons/mail/static/src/xml/composer.xml:7 #, python-format -msgid "Write something" -msgstr "Escreva algo" +msgid "Write something..." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:122 +#, python-format +msgid "Yesterday" +msgstr "" #. module: mail #. openerp-web @@ -3120,6 +3167,14 @@ msgstr "Escreva algo" msgid "You added %s to the conversation." msgstr "Adicionou %s à conversa." +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3161,18 +3216,11 @@ msgstr "Pode anexar ficheiros a este template, para ser adicionado a todos os e- #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:346 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "Cancelou a subscrição de %s." -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "A sua Caixa de Entrada contém todas as mensagem em que foi mencionado e todas as mensagens que recebeu como um seguidor de um documento.
\nA seção \"Favoritos\" contem todas as suas mensagens favoritas." - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3191,6 +3239,11 @@ msgstr "O seu modelo deverá definir o campo email_from" msgid "base.config.settings" msgstr "base.config.settings" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3198,13 +3251,13 @@ msgstr "por" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:30 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "dm" #. module: mail -#: code:addons/mail/models/mail_thread.py:314 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "documento" @@ -3236,6 +3289,13 @@ msgstr "ir.autovacuum" msgid "members" msgstr "membros" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3243,7 +3303,7 @@ msgstr "mycompany.odoo.com" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3268,11 +3328,21 @@ msgstr "público" msgid "publisher_warranty.contract" msgstr "publisher_warranty.contract" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "record:" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/pt_BR.po b/addons/mail/i18n/pt_BR.po index 551d99b42d3..fe9cfcfb151 100644 --- a/addons/mail/i18n/pt_BR.po +++ b/addons/mail/i18n/pt_BR.po @@ -3,14 +3,15 @@ # * mail # # Translators: +# Grazziano Duarte , 2015 # Mateus Cerqueira Lopes , 2015 msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-11-13 15:34+0000\n" -"Last-Translator: Mateus Cerqueira Lopes \n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" +"Last-Translator: Martin Trigaux\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/odoo/odoo-9/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,10 +30,10 @@ msgid "" " \n" " \n" "\n" -"

\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" +"
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -54,7 +55,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -133,6 +134,13 @@ msgid "" "or (object.parent_id and object.parent_id.subject and 'Re: %s' % " "object.parent_id.subject) or (object.parent_id and " "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" +msgstr "${object.subject or (object.record_name and 'Re: %s' % object.record_name) or (object.parent_id and object.parent_id.subject and 'Re: %s' % object.parent_id.subject) or (object.parent_id and object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" msgstr "" #. module: mail @@ -142,7 +150,7 @@ msgid "%s (copy)" msgstr "%s (copia)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "%s created" @@ -155,10 +163,10 @@ msgstr "%s conectou-se à rede de %s." #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:86 +#: code:addons/mail/static/src/xml/thread.xml:96 #, python-format -msgid "(in channel" -msgstr "(no canal" +msgid "(from" +msgstr "" #. module: mail #. openerp-web @@ -172,7 +180,7 @@ msgstr "(Sem endereço de email)" msgid "" "* Smiley are only used for HTML code to display an image * Text (default " "value) is use to substitute text with another text" -msgstr "" +msgstr "* Smiley são utilizados apenas para o código HTML para exibir uma imagem * Texto (valor padrão) é usado para substituir o texto por outro texto" #. module: mail #. openerp-web @@ -187,7 +195,7 @@ msgstr "-------- Mostrar mensagens antigas --------" msgid "" "

created #%s
" -msgstr "" +msgstr "
criado #%s
" #. module: mail #: code:addons/mail/models/mail_channel.py:489 @@ -195,7 +203,7 @@ msgstr "" msgid "" "
joined #%s
" -msgstr "" +msgstr "
entrou #%s
" #. module: mail #: code:addons/mail/models/mail_channel.py:151 @@ -203,7 +211,7 @@ msgstr "" msgid "" "
left #%s
" -msgstr "" +msgstr "
deixou #%s
" #. module: mail #: code:addons/mail/wizard/invite.py:22 @@ -228,21 +236,21 @@ msgid "" " Followers of the document and" -msgstr "" +msgstr "\n Envio em massa de e-mail on\n Seguidores do documento e" #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_form msgid "" "Add\n" " Context Action" -msgstr "" +msgstr "Adicionar\nAção de Contexto" #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_form msgid "" "Remove\n" " Context Action" -msgstr "" +msgstr "Remover\nAção de Contexto" #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain @@ -263,7 +271,7 @@ msgstr "Todos os registros que correspondem ao seu filtro de pesquisa at msgid "" "Moreover, if you want to send a lot of emails, we recommend you to use the mass mailing module.
\n" " Confirming this wizard will probably take a few minutes blocking your browser." -msgstr "" +msgstr "Além disso, se você quiser enviar um monte de e-mails, recomendamos que você use o módulo de envio em massa.
\nConfirmando este assistente, provavelmente irá demorar alguns minutos, bloqueando seu navegador." #. module: mail #. openerp-web @@ -286,7 +294,7 @@ msgstr "Um dicionário python que será avaliado para gerar valores padrão quan msgid "" "A shortcode is a keyboard shortcut. For instance, you type #gm and it will " "be transformed into \"Good Morning\"." -msgstr "" +msgstr "Um código abreviado é um atalho de teclado. Por exemplo, você digita #bd e será transformado em \"Bom Dia\"." #. module: mail #: model:ir.model,name:mail.model_res_groups @@ -437,7 +445,7 @@ msgstr "Todas as mensagens" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "Anônimo" @@ -486,7 +494,7 @@ msgstr "Anexos" msgid "" "Attachments are linked to a document through model / res_id and to the " "messagethrough this field." -msgstr "" +msgstr "Anexos estão ligados a um documento através de modelo / res_id e à mensagem através deste campo." #. module: mail #: selection:mail.alias,alias_contact:0 @@ -554,23 +562,13 @@ msgstr "Conteúdos HTML limpos automaticamente" #. module: mail #: model:ir.model.fields,field_description:mail.field_res_users_chatter_needaction_auto msgid "Automatically set needaction as Read" -msgstr "" +msgstr "Definir automaticamente necessita de ação como lido" #. module: mail #: model:ir.ui.view,arch_db:mail.res_partner_opt_out_search msgid "Available for mass mailing" msgstr "Disponivel para envio los massa" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "Melhores Práticas de Vendas" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "Reuniões" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -636,7 +634,7 @@ msgstr "Alterar" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_field msgid "Changed Field" -msgstr "" +msgstr "Campo Alterado" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_channel_id @@ -653,7 +651,7 @@ msgstr "Tipo de Canal" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_channel_message_ids msgid "Channel message ids" -msgstr "" +msgstr "IDs de canal da mensagem" #. module: mail #. openerp-web @@ -675,7 +673,7 @@ msgstr "Canais" #: model:ir.actions.act_window,name:mail.mail_channel_partner_action #: model:ir.ui.menu,name:mail.mail_channel_partner_menu msgid "Channels/Partner" -msgstr "" +msgstr "Canais/Parceiro" #. module: mail #: model:ir.actions.client,name:mail.mail_channel_action_client_chat @@ -713,7 +711,7 @@ msgstr "Escolha um exemplo" #: code:addons/mail/models/mail_thread.py:308 #, python-format msgid "Click here to add new %(document)s or send an email to: %(email_link)s" -msgstr "" +msgstr "Clique aqui para adicionar novo %(document)s ou envie um e-mail para: %(email_link)s" #. module: mail #: code:addons/mail/models/mail_thread.py:324 @@ -729,7 +727,7 @@ msgstr "Clique para adicionar um contato no catálogo de endereços." #. module: mail #: model:ir.actions.act_window,help:mail.mail_shortcode_action msgid "Click to define a new chat shortcode." -msgstr "" +msgstr "Clique para definir um novo código abreviado de chat." #. module: mail #: selection:mail.channel.partner,fold_state:0 @@ -791,6 +789,13 @@ msgstr "Escrever nova Mensagem" msgid "Composition mode" msgstr "Modo de composição" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -958,21 +963,14 @@ msgstr "Descrição que será adicionada na mensagem enviada para este subtipo. #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" -msgstr "" - -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" +msgstr "Separar" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "Mensagens Diretas" @@ -1069,7 +1067,7 @@ msgstr "Configuração de Email" #: model:ir.model.fields,field_description:mail.field_res_partner_notify_email #: model:ir.model.fields,field_description:mail.field_res_users_notify_email msgid "Email Messages and Notifications" -msgstr "" +msgstr "Mensagens de E-mail e Notificações" #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form @@ -1120,7 +1118,7 @@ msgstr "Endereço de e-mail associado internamente a este usuário. Mensagens re 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 "" +msgstr "Endereço de e-mail do remetente. Este campo é definido quando nenhum sócio correspondente for encontrado e substitui o campo author_id no chat." #. module: mail #: model:ir.ui.view,arch_db:mail.email_compose_message_wizard_form @@ -1157,7 +1155,7 @@ msgstr "Erro durante a comunicação com o servidor de garantia." msgid "" "Error without exception. Probably due do sending an email without computed " "recipients." -msgstr "" +msgstr "Erro sem exceção. Provavelmente devido ao envio de um e-mail sem destinatários." #. module: mail #: sql_constraint:mail.followers:0 @@ -1199,7 +1197,7 @@ msgstr "Falhou" #: code:addons/mail/models/mail_template.py:352 #, python-format msgid "Failed to render template %r using values %r" -msgstr "" +msgstr "Falha ao renderizar modelo %r usando valores %r" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_mail_failure_reason @@ -1212,14 +1210,14 @@ msgstr "Motivo da Falha" msgid "" "Failure reason. This is usually the exception thrown by the email server, " "stored to ease the debugging of mailing issues." -msgstr "" +msgstr "Motivo da falha. Geralmente a exceção lançada pelo servidor de e-mail, armazenada para facilitar a depuração de problemas." #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_starred_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_starred_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_message_starred_partner_ids msgid "Favorited By" -msgstr "" +msgstr "Adotado como favorito por" #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_model_object_field @@ -1323,7 +1321,7 @@ msgstr "De" #. module: mail #: model:ir.ui.view,arch_db:mail.view_message_form msgid "Gateway" -msgstr "" +msgstr "Gateway" #. module: mail #: code:addons/mail/models/res_users.py:48 @@ -1459,14 +1457,6 @@ msgstr "Mensagens Importantes" msgid "Important messages" msgstr "Mensagens Importantes" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1490,7 +1480,7 @@ msgstr "Mensagem inicial do tópico." #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_message_subtype_internal msgid "Internal Only" -msgstr "" +msgstr "Apenas Interno" #. module: mail #: code:addons/mail/models/mail_alias.py:99 @@ -1501,15 +1491,22 @@ msgid "" msgstr "Expressão inválida, deve ser uma definição literal de dicionário estilo python como \"{'field': 'value'}\"" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " "single-record recordset" +msgstr "Conjunto de registro inválido: deve ser chamado como modelo (sem registros) ou no conjunto de registros de um único registro" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "Convite para seguir %s: %s" @@ -1527,7 +1524,7 @@ msgstr "Convidar" #: code:addons/mail/static/src/js/chatter.js:144 #, python-format msgid "Invite Follower" -msgstr "" +msgstr "Convidar Seguidor" #. module: mail #. openerp-web @@ -1541,7 +1538,7 @@ msgstr "Seguir pessoa" #: code:addons/mail/static/src/js/client_action.js:454 #, python-format msgid "Invite people to %s" -msgstr "" +msgstr "Convidar pessoas para %s" #. module: mail #: model:ir.model,name:mail.model_mail_wizard_invite @@ -1551,7 +1548,7 @@ msgstr "Assistente de Convite" #. module: mail #: selection:mail.channel,public:0 msgid "Invited people only" -msgstr "" +msgstr "Somente pessoas convidadas" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_message_is_follower @@ -1566,6 +1563,11 @@ msgstr "É um seguidor" msgid "Is Notification" msgstr "É Notificação" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1618,12 +1620,12 @@ msgstr "Última modificação em" #: model:ir.model.fields,field_description:mail.field_mail_channel_channel_last_seen_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_seen_message_id msgid "Last Seen" -msgstr "" +msgstr "Visto pela ultima vez" #. module: mail #: model:ir.model,name:mail.model_mail_channel_partner msgid "Last Seen Many2many" -msgstr "" +msgstr "Visto pela ultima vez Many2many" #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_write_uid @@ -1661,7 +1663,7 @@ msgstr "Última atualização em" #: model:ir.model.fields,help:mail.field_mail_wizard_invite_channel_ids msgid "" "List of channels that will be added as listeners of the current document." -msgstr "" +msgstr "Lista de canais que serão adicionados como ouvintes do documento atual.q" #. module: mail #: model:ir.model.fields,help:mail.field_mail_wizard_invite_partner_ids @@ -1672,12 +1674,12 @@ msgstr "Lista de pessoas que foram incluídas como seguidores deste documento" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_followers_channel_id msgid "Listener" -msgstr "" +msgstr "Ouvinte" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_channel_partner_ids msgid "Listeners" -msgstr "" +msgstr "Ouvintes" #. module: mail #: selection:mail.channel,channel_type:0 @@ -1689,7 +1691,7 @@ msgstr "" #: code:addons/mail/static/src/xml/chatter.xml:75 #, python-format msgid "Log a note. Followers will not be notified." -msgstr "" +msgstr "Registrar uma nota. Seguidores não serão notificados." #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_is_log @@ -1710,7 +1712,7 @@ msgstr "Registra uma nota interna" msgid "" "Log an internal note which will not be sent to followers, but which can be read\n" " by users accessing this document." -msgstr "" +msgstr "Registrar uma nota interna que não será enviada para seguidores, mas que pode ser lida\npor usuários que acessam este documento." #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form @@ -1738,6 +1740,13 @@ msgstr "Mensagens foram criadas para notificar as pessoas." msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1763,13 +1772,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "Membros destes grupos serão adicionados automaticamente como seguidores. Observe que eles poderão gerenciar sua inscrição manualmente se necessário." -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1879,7 +1881,7 @@ msgstr "Histórico de mensagens e comunicação" msgid "" "Messages with internal subtypes will be visible only by employees, aka " "members of base_user group" -msgstr "" +msgstr "Mensagens com subtipos internos serão visíveis somente por funcionários, conhecidos como membros do grupo base_user" #. module: mail #: model:ir.ui.view,arch_db:mail.view_users_form_mail @@ -1952,22 +1954,22 @@ msgstr "Nunca" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_char msgid "New Value Char" -msgstr "" +msgstr "Novo Valor Char" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_datetime msgid "New Value Datetime" -msgstr "" +msgstr "Novo Valor Datetime" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_float msgid "New Value Float" -msgstr "" +msgstr "Novo Valor Float" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_integer msgid "New Value Integer" -msgstr "" +msgstr "Novo Valor Integer" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_monetary @@ -1981,26 +1983,61 @@ msgstr "Texto do Novo Valor" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "Nova Mensagem" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:81 +#: code:addons/mail/static/src/xml/thread.xml:140 #, python-format -msgid "New people" +msgid "New messages" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/client_action.js:81 +#, python-format +msgid "New people" +msgstr "Novas pessoas" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "Sem seguidor" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2018,7 +2055,7 @@ msgstr "Observação" #: code:addons/mail/static/src/xml/thread.xml:48 #, python-format msgid "Note by" -msgstr "" +msgstr "Nota por" #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_search @@ -2065,37 +2102,37 @@ msgid "" "Odoo helps you easily track all activities related to\n" " a customer; discussions, history of business opportunities,\n" " documents, etc." -msgstr "" +msgstr "Odoo ajuda você a controlar facilmente todas as atividades relacionadas a\num cliente; discussões, histórico de oportunidades de negócio,\ndocumentos, etc." #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_char msgid "Old Value Char" -msgstr "" +msgstr "Antigo Valor Char" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_datetime msgid "Old Value DateTime" -msgstr "" +msgstr "Antigo Valor DateTime" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_float msgid "Old Value Float" -msgstr "" +msgstr "Antigo Valor Float" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_integer msgid "Old Value Integer" -msgstr "" +msgstr "Antigo Valor Integer" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_monetary msgid "Old Value Monetary" -msgstr "" +msgstr "Antigo Valor Monetary" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_text msgid "Old Value Text" -msgstr "" +msgstr "Antigo Valor Text" #. module: mail #. openerp-web @@ -2124,7 +2161,7 @@ msgstr "Abrir documento principal" #: code:addons/mail/static/src/xml/client_action.xml:36 #, python-format msgid "Open chat" -msgstr "" +msgstr "Abrir chat" #. module: mail #: model:ir.model.fields,field_description:mail.field_res_partner_opt_out @@ -2249,7 +2286,7 @@ msgid "" "Parent subtype, used for automatic subscription. This field is not correctly" " named. For example on a project, the parent_id of project subtypes refers " "to task-related subtypes." -msgstr "" +msgstr "Subtipo pai, usado para a subscrição automática. Este campo não está corretamente identificado. Por exemplo, em um projeto, o parent_id dos subtipos do projeto refere-se a subtipos relacionados a tarefas." #. module: mail #: model:ir.model,name:mail.model_res_partner @@ -2272,7 +2309,7 @@ msgstr "Parceiros que não pediram para não ser incluído em campanhas de envio #: 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 "" +msgstr "Parceiros com a Necessidade de Ação" #. module: mail #: model:ir.model.fields,help:mail.field_email_template_preview_auto_delete @@ -2326,8 +2363,8 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" -msgstr "Política para enviar uma mensagem sobre o documento usando o MailGateway.\n- todos: todos podem postar\n- parceiros: parceiros única autenticados\n- seguidores: apenas seguidores do documento relacionado\n" +"- followers: only followers of the related document or members of following channels\n" +msgstr "" #. module: mail #: model:ir.model.fields,help:mail.field_res_partner_notify_email @@ -2367,22 +2404,10 @@ msgstr "Privacidade" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" -msgstr "" - -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "R&D" +msgstr "Canais Privados" #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 @@ -2546,7 +2571,7 @@ msgstr "Salvar como novo modelo" #: code:addons/mail/static/src/js/chat_window.js:23 #, python-format msgid "Say something" -msgstr "" +msgstr "Dizer algo" #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_alias_search @@ -2638,7 +2663,7 @@ msgstr "" #: model:ir.ui.view,arch_db:mail.mail_shortcode_view_form #: model:ir.ui.view,arch_db:mail.mail_shortcode_view_tree msgid "Shortcodes" -msgstr "" +msgstr "Códigos Curtos" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_shortcode_source @@ -2697,7 +2722,7 @@ msgstr "Imagem em tamanho reduzido do grupo. Ela será automaticamente redimensi #. module: mail #: selection:mail.shortcode,shortcode_type:0 msgid "Smiley" -msgstr "" +msgstr "Smiley" #. module: mail #. openerp-web @@ -2762,7 +2787,7 @@ msgstr "Assunto:" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_shortcode_substitution msgid "Substitution" -msgstr "" +msgstr "Substituição" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_subtype_id @@ -2869,11 +2894,6 @@ msgid "" " will be taken from the email template." msgstr "Os valores apresentados a seguir são informativos. Ao enviar o e-mail, os valores\nserá usados a partir do modelo de e-mail." -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "Não há mensagens para mostrar.
" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2886,7 +2906,7 @@ msgstr "Este campo armazena a imagem utilizada como foto para o grupo, limitada msgid "" "This group is visible by non members. Invisible groups can add members " "through the invite button." -msgstr "" +msgstr "Este grupo é visível por não membros. Grupos invisíveis podem adicionar membros através do botão convidar." #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_search @@ -2918,6 +2938,13 @@ msgstr "Para (Parceiros)" #: code:addons/mail/static/src/xml/chatter.xml:30 #, python-format msgid "To: Followers of" +msgstr "Para: Seguidores de" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" msgstr "" #. module: mail @@ -2932,7 +2959,7 @@ msgstr "Tópicos discutidos neste grupo..." msgid "" "Tracked values are stored in a separate model. This field allow to " "reconstructthe tracking and to generate statistics on the model." -msgstr "" +msgstr "Valores rastreados são armazenados em um modelo separado. Este campo permite reconstruir o rastreamento e gerar estatísticas sobre o modelo." #. module: mail #: model:ir.ui.view,arch_db:mail.view_message_form @@ -2956,7 +2983,7 @@ msgstr "" #: model:ir.model.fields,field_description:mail.field_mail_mail_tracking_value_ids #: model:ir.model.fields,field_description:mail.field_mail_message_tracking_value_ids msgid "Tracking values" -msgstr "" +msgstr "Valores de Rastreamento" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_message_type @@ -2979,8 +3006,15 @@ msgstr "Não foi possível enviar o e-mail, por favor configure o endereço de e #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -3010,28 +3044,35 @@ msgstr "Contador de Mensagens Não Lidas." #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "Cancelar a inscrição" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "Cancelar a inscrição" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "Enviando" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "Erro no upload" @@ -3077,7 +3118,7 @@ msgstr "Visualizar" msgid "" "Warning! \n" " If you remove a follower, he won't be notified of any email or discussion on this document. Do you really want to remove this follower ?" -msgstr "" +msgstr "Aviso!\nSe você remover um seguidor, ele não será notificado de qualquer e-mail ou discussão sobre este documento. Você realmente deseja remover este seguidor?" #. module: mail #: model:ir.model.fields,help:mail.field_email_template_preview_sub_model_object_field @@ -3103,20 +3144,35 @@ msgstr "Se a mensagem é uma nota interna(somente modo comentário)" #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Who can follow the group's activities?" +msgstr "Quem pode acompanhar as atividades do grupo?" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/composer.xml:7 +#, python-format +msgid "Write something..." msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:6 +#: code:addons/mail/static/src/js/thread.js:122 #, python-format -msgid "Write something" -msgstr "Escreva alguma coisa" +msgid "Yesterday" +msgstr "" #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:80 #, python-format msgid "You added %s to the conversation." +msgstr "Você adicionou %s para a conversa." + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." msgstr "" #. module: mail @@ -3141,14 +3197,14 @@ msgstr "Você não pode excluir estes grupos. Eles são necessários à outros m msgid "" "You could also add a new %(document)s by sending an email to: " "%(email_link)s." -msgstr "" +msgstr "Você pode adicionar um novo %(document)s enviando um e-mail para: %(email_link)s." #. module: mail #. openerp-web #: code:addons/mail/static/src/js/chat_manager.js:478 #, python-format msgid "You have been invited to: " -msgstr "" +msgstr "Você foi convidado para:" #. module: mail #: model:ir.model.fields,help:mail.field_email_template_preview_attachment_ids @@ -3160,36 +3216,34 @@ msgstr "Você pode anexar arquivos a este modelo, para ser adicionado a todos os #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:346 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." -msgstr "" - -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" +msgstr "Você foi descadastrado de %s." #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" "Your template does not defined the email address of the sender. Please " "update your template." -msgstr "" +msgstr "Seu modelo não definiu o endereço de e-mail do remetente. Por favor, atualize seu modelo." #. module: mail #: code:addons/mail/models/ir_actions.py:32 #, python-format msgid "Your template should define email_from" -msgstr "" +msgstr "Seu modelo deve definir email_from" #. module: mail #: model:ir.model,name:mail.model_base_config_settings msgid "base.config.settings" msgstr "base.config.settings" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3197,13 +3251,13 @@ msgstr "por" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:30 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:314 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "documento" @@ -3218,7 +3272,7 @@ msgstr "seguidores" #. module: mail #: model:mail.channel,name:mail.channel_all_employees msgid "general" -msgstr "" +msgstr "geral" #. module: mail #: model:ir.model,name:mail.model_ir_actions_server @@ -3235,6 +3289,13 @@ msgstr "ir.autovacuum" msgid "members" msgstr "membros" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3242,7 +3303,7 @@ msgstr "minhaempresa.odoo.com" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3267,11 +3328,21 @@ msgstr "público" msgid "publisher_warranty.contract" msgstr "Contrato de Serviço" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "registro:" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/ro.po b/addons/mail/i18n/ro.po index e851a46883a..9f5ea7ffc94 100644 --- a/addons/mail/i18n/ro.po +++ b/addons/mail/i18n/ro.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-10-10 09:46+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Romanian (http://www.transifex.com/odoo/odoo-9/language/ro/)\n" "MIME-Version: 1.0\n" @@ -28,10 +28,10 @@ msgid "" " \n" " \n" "\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" "
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -53,7 +53,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -78,49 +78,44 @@ msgid "" "

\n" "
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" +"
\n" +"
\n" -"
\n" -"
\n" -"
\n" -"
\n" +" \n" +" \n" +" \n" "
\n" +"
\n" +"
\n" +"
\n" +"
\n" "
\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" -"
\n" +" \n" " ${object.body | safe}\n" " % if ctx.get('tracking'):\n" +"
    \n" " % for tracking in ctx['tracking']\n" -" ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}\n" +"
  • ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}
    • \n" " % endfor\n" +"
\n" " % endif\n" "
\n" +"
\n" "
\n" "% if ctx.get('signature'):\n" -"
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -"
\n" -"  \n" -" ${ctx['signature'] | safe}\n" -"  \n" -"
\n" -"
\n" +"
\n" +" \n" +" \n" +" \n" +" \n" +"
\n" +" ${ctx['signature'] | safe}\n" +"
\n" "
\n" -"% endif\n" +"% endif" msgstr "" #. module: mail @@ -139,6 +134,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -146,7 +148,7 @@ msgid "%s (copy)" msgstr "%s (copie)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "%s creat(ă)" @@ -157,6 +159,13 @@ msgstr "%s creat(ă)" msgid "%s has joined the %s network." msgstr "%s s-a alăturat rețelei %s." +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:96 +#, python-format +msgid "(from" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:48 @@ -173,9 +182,33 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:122 +#: code:addons/mail/static/src/xml/thread.xml:147 #, python-format -msgid "-------- Show more messages --------" +msgid "-------- Show older messages --------" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:513 +#, python-format +msgid "" +"
created #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:489 +#, python-format +msgid "" +"
joined #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:151 +#, python-format +msgid "" +"
left #%s
" msgstr "" #. module: mail @@ -266,13 +299,6 @@ msgstr "" msgid "Access Groups" msgstr "Acces Grupuri" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/js/client_action.js:154 -#, python-format -msgid "Action" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_message_needaction #: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction @@ -417,7 +443,7 @@ msgstr "Toate mesajele" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "Anonim" @@ -541,16 +567,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "Disponibil pentru corespondență în masă" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "Cele mai Bune Practici de Vânzări" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "Sedințele consiliului" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -638,6 +654,7 @@ msgstr "" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/client_action.xml:23 +#: code:addons/mail/static/src/xml/client_action.xml:89 #: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids @@ -770,6 +787,13 @@ msgstr "Compune un Mesaj nou" msgid "Composition mode" msgstr "Modul de compunere" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -937,21 +961,14 @@ msgstr "Descriere care va fi adăugată în mesajul postat pentru acest subtip. #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1438,14 +1455,6 @@ msgstr "" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1480,7 +1489,7 @@ msgid "" msgstr "Expresie nevalidă, trebuie să fie o definiție literală din dicționarul python, de exemplu \"{'camp': 'valoare'}\"" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1488,7 +1497,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "Invitație de a urmări %s: %s" @@ -1545,6 +1561,11 @@ msgstr "" msgid "Is Notification" msgstr "Este o înștiințare" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1717,6 +1738,13 @@ msgstr "" msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1742,13 +1770,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "Membrii acelor grupuri vor fi adaugați automat ca persoane interesate. Observați că ei vor putea să își gestioneze manual abonamentul dacă este nevoie." -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1914,11 +1935,8 @@ msgstr "Numele care va fi folosit pentru fisierul raportului generat (poate sa c #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_needaction -#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids #: model:ir.model.fields,help:mail.field_mail_compose_message_needaction #: model:ir.model.fields,help:mail.field_mail_mail_needaction #: model:ir.model.fields,help:mail.field_mail_message_needaction @@ -1963,12 +1981,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1978,11 +2010,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2249,6 +2302,13 @@ msgstr "Profil Partener" msgid "Partners that did not ask not to be included in mass mailing campaigns" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids +#: 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 "" + #. module: mail #: model:ir.model.fields,help:mail.field_email_template_preview_auto_delete #: model:ir.model.fields,help:mail.field_mail_mail_auto_delete @@ -2301,7 +2361,7 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" +"- followers: only followers of the related document or members of following channels\n" msgstr "" #. module: mail @@ -2342,23 +2402,11 @@ msgstr "Confidentialitate" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "R&D" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2844,11 +2892,6 @@ msgid "" " will be taken from the email template." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2895,6 +2938,13 @@ msgstr "Destinatar (Parteneri)" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2954,8 +3004,15 @@ msgstr "Email-ul nu a putut fi trimis, configurați adresa de email a expeditoru #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -2985,28 +3042,35 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "Dezabonare" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "Eroare încărcare" @@ -3081,16 +3145,17 @@ msgid "Who can follow the group's activities?" msgstr "" #. module: mail -#: model:mail.channel,name:mail.channel_all_employees -msgid "Whole Company" -msgstr "Întreaga Companie" +#. openerp-web +#: code:addons/mail/static/src/xml/composer.xml:7 +#, python-format +msgid "Write something..." +msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/chatter.xml:57 -#: code:addons/mail/static/src/xml/composer.xml:7 +#: code:addons/mail/static/src/js/thread.js:122 #, python-format -msgid "Write something" +msgid "Yesterday" msgstr "" #. module: mail @@ -3100,6 +3165,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3141,18 +3214,11 @@ msgstr "Puteti atasa fisiere la acest sablon, pentru a fi anexate tuturor e-mail #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:469 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3171,6 +3237,11 @@ msgstr "" msgid "base.config.settings" msgstr "base.config.settings (setari.config.de_baza)" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3178,24 +3249,29 @@ msgstr "de câtre" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:29 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:281 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "document" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:232 +#: code:addons/mail/static/src/js/chatter.js:220 #, python-format msgid "followers" msgstr "persoane interesate" +#. module: mail +#: model:mail.channel,name:mail.channel_all_employees +msgid "general" +msgstr "" + #. module: mail #: model:ir.model,name:mail.model_ir_actions_server msgid "ir.actions.server" @@ -3211,6 +3287,13 @@ msgstr "" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3218,7 +3301,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3243,11 +3326,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "publisher_warranty.contract (contract. garantie_editor)" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/ru.po b/addons/mail/i18n/ru.po index 33e62e70e8f..47e07142b18 100644 --- a/addons/mail/i18n/ru.po +++ b/addons/mail/i18n/ru.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-11-13 19:44+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Russian (http://www.transifex.com/odoo/odoo-9/language/ru/)\n" "MIME-Version: 1.0\n" @@ -31,10 +31,10 @@ msgid "" " \n" "
\n" "\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" +"
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -56,7 +56,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -137,6 +137,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -144,7 +151,7 @@ msgid "%s (copy)" msgstr "%s (копия)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "%s создан" @@ -157,9 +164,9 @@ msgstr "%s присоединился к сети %s." #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:86 +#: code:addons/mail/static/src/xml/thread.xml:96 #, python-format -msgid "(in channel" +msgid "(from" msgstr "" #. module: mail @@ -439,7 +446,7 @@ msgstr "Все сообщения" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "Анонимно" @@ -563,16 +570,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "Доступно для массовой рассылки" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "Лучшие практики продаж" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "Совещания" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -793,6 +790,13 @@ msgstr "Написать новое сообщение" msgid "Composition mode" msgstr "Режим составления" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -960,21 +964,14 @@ msgstr "Описание, которое будет добавлено в соо #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1461,14 +1458,6 @@ msgstr "Важные сообщения" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1503,7 +1492,7 @@ msgid "" msgstr "Неправильное выражение, здесь должен быть объявление словаря python например \"{'field': 'value'}\"" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1511,7 +1500,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "" @@ -1568,6 +1564,11 @@ msgstr "Подписчик" msgid "Is Notification" msgstr "это уведомление" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1740,6 +1741,13 @@ msgstr "" msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1765,13 +1773,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "Члены этих групп будут автоматически добавлены в качестве подписчиков. Обратите внимание что им будет доступно управлять их подпиской вручную если понадобится." -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1983,12 +1984,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1998,11 +2013,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2328,7 +2364,7 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" +"- followers: only followers of the related document or members of following channels\n" msgstr "" #. module: mail @@ -2369,23 +2405,11 @@ msgstr "Конфиденциальность" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "НИОКР" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2871,11 +2895,6 @@ msgid "" " will be taken from the email template." msgstr "Значения, показанные здесь, информативные. При отправке письма на электронную почту, значения\n будут взяты из шаблона электронной почты." -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2922,6 +2941,13 @@ msgstr "Кому (Партнеры)" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2981,8 +3007,15 @@ msgstr "Невозможно отправить эл. почту, пожалуй #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -3012,28 +3045,35 @@ msgstr "Счетчик непрочтённых сообщений" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "Отписаться" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "Ошибка выгрузки" @@ -3109,9 +3149,16 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:6 +#: code:addons/mail/static/src/xml/composer.xml:7 #, python-format -msgid "Write something" +msgid "Write something..." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:122 +#, python-format +msgid "Yesterday" msgstr "" #. module: mail @@ -3121,6 +3168,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3162,18 +3217,11 @@ msgstr "Вы можете прикрепить файлы к этому шабл #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:346 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3192,6 +3240,11 @@ msgstr "" msgid "base.config.settings" msgstr "base.config.settings" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3199,13 +3252,13 @@ msgstr "по" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:30 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:314 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "" @@ -3237,6 +3290,13 @@ msgstr "" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3244,7 +3304,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3269,11 +3329,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "publisher_warranty.contract" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "запись:" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/sk.po b/addons/mail/i18n/sk.po index a318ebad8ff..a0338fb5a44 100644 --- a/addons/mail/i18n/sk.po +++ b/addons/mail/i18n/sk.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-12-01 10:12+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 21:14+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Slovak (http://www.transifex.com/odoo/odoo-9/language/sk/)\n" "MIME-Version: 1.0\n" @@ -32,10 +32,10 @@ msgid "" " \n" " \n" "\n" -"

\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" +"
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -57,7 +57,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -138,6 +138,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -145,7 +152,7 @@ msgid "%s (copy)" msgstr "%s (kópia)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "%s vytvorené" @@ -158,9 +165,9 @@ msgstr "%s sa pridal do %s siete." #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:86 +#: code:addons/mail/static/src/xml/thread.xml:96 #, python-format -msgid "(in channel" +msgid "(from" msgstr "" #. module: mail @@ -440,7 +447,7 @@ msgstr "Všetky správy" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "" @@ -564,16 +571,6 @@ msgstr "Automaticky nastaviť needaction ako Prečítaný" msgid "Available for mass mailing" msgstr "Dostupné pre emailovú kampaň" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "Prax najlepšieho predaja" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "Zasadnutie správnej rady" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -794,6 +791,13 @@ msgstr "Vytvoriť novú správu" msgid "Composition mode" msgstr "Režim vytvárania" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -961,21 +965,14 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1455,21 +1452,13 @@ msgstr "" #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban msgid "Important Messages" -msgstr "" +msgstr "Dôležité správy" #. module: mail #: model:ir.ui.view,arch_db:mail.view_message_search msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1504,7 +1493,7 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1512,7 +1501,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "" @@ -1569,6 +1565,11 @@ msgstr "Je odberateľ" msgid "Is Notification" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1741,10 +1742,17 @@ msgstr "" msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" -msgstr "" +msgstr "Stredne veľká fotografia" #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image_medium @@ -1766,13 +1774,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1984,12 +1985,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1999,11 +2014,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2287,7 +2323,7 @@ msgstr "" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image msgid "Photo" -msgstr "" +msgstr "Fotografia" #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_copyvalue @@ -2329,7 +2365,7 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" +"- followers: only followers of the related document or members of following channels\n" msgstr "" #. module: mail @@ -2370,23 +2406,11 @@ msgstr "Súkromný" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2687,7 +2711,7 @@ msgstr "Malý obrázok tohto kontaktu. Veľkosť je automaticky zmenená na 64x6 #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_small msgid "Small-sized photo" -msgstr "" +msgstr "Malá fotografia" #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image_small @@ -2858,7 +2882,7 @@ msgid "" "The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n" "\n" "(Document type: %s, Operation: %s)" -msgstr "" +msgstr "Vyžiadaná operácia nemôže byť dokončená kôli bezpečnostným opatreniam. Prosím konaktujte vášho systémového administrátora.\n\n(Typ dokumentu: %s, operácia: %s)" #. module: mail #: model:ir.model.fields,help:mail.field_mail_shortcode_source @@ -2872,11 +2896,6 @@ msgid "" " will be taken from the email template." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2923,6 +2942,13 @@ msgstr "" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2982,8 +3008,15 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -3013,28 +3046,35 @@ msgstr "Počítadlo neprečítaných správ" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "" @@ -3088,7 +3128,7 @@ msgstr "" msgid "" "When a relationship field is selected as first field, this field lets you " "select the target field within the destination document model (sub-model)." -msgstr "" +msgstr "Keď je pole vzťah vybrané ako prvé pole, toto pole umožňuje vybrať cieľove pole vnútri modelu cieľového dokumentu (podmodel)." #. module: mail #: model:ir.model.fields,help:mail.field_email_template_preview_sub_object @@ -3096,7 +3136,7 @@ msgstr "" msgid "" "When a relationship field is selected as first field, this field shows the " "document model the relationship goes to." -msgstr "" +msgstr "Keď je vzťahové pole vybrané ako prvé pole, toto pole zobrazuje model dokumentu ku ktorému sa vzťahuje." #. module: mail #: model:ir.model.fields,help:mail.field_mail_compose_message_is_log @@ -3110,9 +3150,16 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:6 +#: code:addons/mail/static/src/xml/composer.xml:7 #, python-format -msgid "Write something" +msgid "Write something..." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:122 +#, python-format +msgid "Yesterday" msgstr "" #. module: mail @@ -3122,6 +3169,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3163,18 +3218,11 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:346 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3193,6 +3241,11 @@ msgstr "" msgid "base.config.settings" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3200,13 +3253,13 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:30 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:314 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "" @@ -3231,13 +3284,20 @@ msgstr "ir.actions.server" #. module: mail #: model:ir.model,name:mail.model_ir_autovacuum msgid "ir.autovacuum" -msgstr "" +msgstr "ir.autovacuum" #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3245,7 +3305,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3270,11 +3330,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 @@ -3288,4 +3358,4 @@ msgstr "" #: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "true" -msgstr "" +msgstr "pravda" diff --git a/addons/mail/i18n/sl.po b/addons/mail/i18n/sl.po index cf32ef8538e..17d57ac3331 100644 --- a/addons/mail/i18n/sl.po +++ b/addons/mail/i18n/sl.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-10-14 05:41+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Slovenian (http://www.transifex.com/odoo/odoo-9/language/sl/)\n" "MIME-Version: 1.0\n" @@ -28,10 +28,10 @@ msgid "" " \n" " \n" "\n" -"

\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" "
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -53,7 +53,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -78,49 +78,44 @@ msgid "" "

\n" "
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" +"
\n" +"
\n" -"
\n" -"
\n" -"
\n" -"
\n" +" \n" +" \n" +" \n" "
\n" +"
\n" +"
\n" +"
\n" +"
\n" "
\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" -"
\n" +" \n" " ${object.body | safe}\n" " % if ctx.get('tracking'):\n" +"
    \n" " % for tracking in ctx['tracking']\n" -" ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}\n" +"
  • ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}
    • \n" " % endfor\n" +"
\n" " % endif\n" "
\n" +"
\n" "
\n" "% if ctx.get('signature'):\n" -"
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -"
\n" -"  \n" -" ${ctx['signature'] | safe}\n" -"  \n" -"
\n" -"
\n" +"
\n" +" \n" +" \n" +" \n" +" \n" +"
\n" +" ${ctx['signature'] | safe}\n" +"
\n" "
\n" -"% endif\n" +"% endif" msgstr "" #. module: mail @@ -139,6 +134,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -146,7 +148,7 @@ msgid "%s (copy)" msgstr "%s (kopija)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "%s kreirano" @@ -157,6 +159,13 @@ msgstr "%s kreirano" msgid "%s has joined the %s network." msgstr "%s se je pridružil omrežju %s." +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:96 +#, python-format +msgid "(from" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:48 @@ -173,9 +182,33 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:122 +#: code:addons/mail/static/src/xml/thread.xml:147 #, python-format -msgid "-------- Show more messages --------" +msgid "-------- Show older messages --------" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:513 +#, python-format +msgid "" +"
created #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:489 +#, python-format +msgid "" +"
joined #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:151 +#, python-format +msgid "" +"
left #%s
" msgstr "" #. module: mail @@ -266,13 +299,6 @@ msgstr "" msgid "Access Groups" msgstr "Skupine pravic" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/js/client_action.js:154 -#, python-format -msgid "Action" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_message_needaction #: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction @@ -417,7 +443,7 @@ msgstr "Vsa sporočila" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "Anonimen" @@ -541,16 +567,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "Masovno pošiljanje elektronske pošte na voljo" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "Dobre prakse prodaje" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "Sestanki vodstva" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -638,6 +654,7 @@ msgstr "" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/client_action.xml:23 +#: code:addons/mail/static/src/xml/client_action.xml:89 #: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids @@ -770,6 +787,13 @@ msgstr "Novo sporočilo" msgid "Composition mode" msgstr "Način za sestavo" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -937,21 +961,14 @@ msgstr "Opis, ki se doda sporočilu knjiženemu na ta pod-tip. Če je prazno, se #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1438,14 +1455,6 @@ msgstr "Pomembna sporočila" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1480,7 +1489,7 @@ msgid "" msgstr "Napačen izraz, mora biti skladen z definicijo python slovarja, npr. \"{'field':'value'}\"" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1488,7 +1497,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "Vabilo na spremljanje %s: %s" @@ -1545,6 +1561,11 @@ msgstr "Je sledilec" msgid "Is Notification" msgstr "Je obvestilo" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1717,6 +1738,13 @@ msgstr "Za obveščanje ljudi v obstoječem sporočilu je bila ustvarjena e-poš msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1742,13 +1770,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "Člani te skupine bodo avtomatično dodani kot sledilci. Lahko bodo upravljali svojo prijavo tudi ročno, če bo treba." -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1914,11 +1935,8 @@ msgstr "Naziv ustvarjene datoteke poročila (možna uporaba oznak gradnika)\nPri #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_needaction -#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids #: model:ir.model.fields,help:mail.field_mail_compose_message_needaction #: model:ir.model.fields,help:mail.field_mail_mail_needaction #: model:ir.model.fields,help:mail.field_mail_message_needaction @@ -1963,12 +1981,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1978,11 +2010,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2249,6 +2302,13 @@ msgstr "Profil partnerja" msgid "Partners that did not ask not to be included in mass mailing campaigns" msgstr "Partnerji, ki niso podali zahteve po vključitvi v masovne e-mail kampanje" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids +#: 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 "" + #. module: mail #: model:ir.model.fields,help:mail.field_email_template_preview_auto_delete #: model:ir.model.fields,help:mail.field_mail_mail_auto_delete @@ -2301,8 +2361,8 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" -msgstr "Pravila vpisa sporočil na dokument preko mailgateway.\n- vsi: vsi lahko vpisujejo\n- partnerji: le overjeni partnerji\n- sledilci: le sledilci povezanega dokumenta\n" +"- followers: only followers of the related document or members of following channels\n" +msgstr "" #. module: mail #: model:ir.model.fields,help:mail.field_res_partner_notify_email @@ -2342,23 +2402,11 @@ msgstr "Zasebnost" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "R&D" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2844,11 +2892,6 @@ msgid "" " will be taken from the email template." msgstr "Tu prikazane vrednosti so informativne. Pri pošiljanju e-pošte se privzamejo\n vrednosti iz e-poštne predloge." -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2895,6 +2938,13 @@ msgstr "Za (partnerji)" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2954,8 +3004,15 @@ msgstr "E-pošte ni bilo mogoče poslati. Nastavite e-pošto pošiljatelja ali v #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -2985,28 +3042,35 @@ msgstr "Števec neprebranih sporočil" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "Odjavi se" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "Napaka pri nalaganju" @@ -3081,16 +3145,17 @@ msgid "Who can follow the group's activities?" msgstr "" #. module: mail -#: model:mail.channel,name:mail.channel_all_employees -msgid "Whole Company" -msgstr "Celotno podjetje" +#. openerp-web +#: code:addons/mail/static/src/xml/composer.xml:7 +#, python-format +msgid "Write something..." +msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/chatter.xml:57 -#: code:addons/mail/static/src/xml/composer.xml:7 +#: code:addons/mail/static/src/js/thread.js:122 #, python-format -msgid "Write something" +msgid "Yesterday" msgstr "" #. module: mail @@ -3100,6 +3165,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3141,18 +3214,11 @@ msgstr "K predlogi lahko pripnete datoteke, da bodo dodane elektronskemu sporoč #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:469 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3171,6 +3237,11 @@ msgstr "" msgid "base.config.settings" msgstr "base.config.settings" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3178,24 +3249,29 @@ msgstr "po" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:29 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:281 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "dokument" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:232 +#: code:addons/mail/static/src/js/chatter.js:220 #, python-format msgid "followers" msgstr "sledilci" +#. module: mail +#: model:mail.channel,name:mail.channel_all_employees +msgid "general" +msgstr "" + #. module: mail #: model:ir.model,name:mail.model_ir_actions_server msgid "ir.actions.server" @@ -3211,6 +3287,13 @@ msgstr "" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3218,7 +3301,7 @@ msgstr "druzba.com" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3243,11 +3326,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "publisher_warranty.contract" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "zapis:" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/sr.po b/addons/mail/i18n/sr.po index c55938a05f7..b5a79c916ce 100644 --- a/addons/mail/i18n/sr.po +++ b/addons/mail/i18n/sr.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-10-10 09:46+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Serbian (http://www.transifex.com/odoo/odoo-9/language/sr/)\n" "MIME-Version: 1.0\n" @@ -28,10 +28,10 @@ msgid "" " \n" "
\n" "\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" "
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -53,7 +53,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -78,49 +78,44 @@ msgid "" "

\n" "
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" +"
\n" +"
\n" -"
\n" -"
\n" -"
\n" -"
\n" +" \n" +" \n" +" \n" "
\n" +"
\n" +"
\n" +"
\n" +"
\n" "
\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" -"
\n" +" \n" " ${object.body | safe}\n" " % if ctx.get('tracking'):\n" +"
    \n" " % for tracking in ctx['tracking']\n" -" ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}\n" +"
  • ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}
    • \n" " % endfor\n" +"
\n" " % endif\n" "
\n" +"
\n" "
\n" "% if ctx.get('signature'):\n" -"
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -"
\n" -"  \n" -" ${ctx['signature'] | safe}\n" -"  \n" -"
\n" -"
\n" +"
\n" +" \n" +" \n" +" \n" +" \n" +"
\n" +" ${ctx['signature'] | safe}\n" +"
\n" "
\n" -"% endif\n" +"% endif" msgstr "" #. module: mail @@ -139,6 +134,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -146,7 +148,7 @@ msgid "%s (copy)" msgstr "%s (kopija)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "" @@ -157,6 +159,13 @@ msgstr "" msgid "%s has joined the %s network." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:96 +#, python-format +msgid "(from" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:48 @@ -173,9 +182,33 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:122 +#: code:addons/mail/static/src/xml/thread.xml:147 #, python-format -msgid "-------- Show more messages --------" +msgid "-------- Show older messages --------" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:513 +#, python-format +msgid "" +"
created #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:489 +#, python-format +msgid "" +"
joined #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:151 +#, python-format +msgid "" +"
left #%s
" msgstr "" #. module: mail @@ -266,13 +299,6 @@ msgstr "" msgid "Access Groups" msgstr "" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/js/client_action.js:154 -#, python-format -msgid "Action" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_message_needaction #: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction @@ -417,7 +443,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "" @@ -541,16 +567,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -638,6 +654,7 @@ msgstr "" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/client_action.xml:23 +#: code:addons/mail/static/src/xml/client_action.xml:89 #: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids @@ -770,6 +787,13 @@ msgstr "" msgid "Composition mode" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -937,21 +961,14 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1438,14 +1455,6 @@ msgstr "" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1480,7 +1489,7 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1488,7 +1497,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "" @@ -1545,6 +1561,11 @@ msgstr "" msgid "Is Notification" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1717,6 +1738,13 @@ msgstr "" msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1742,13 +1770,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1914,11 +1935,8 @@ msgstr "" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_needaction -#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids #: model:ir.model.fields,help:mail.field_mail_compose_message_needaction #: model:ir.model.fields,help:mail.field_mail_mail_needaction #: model:ir.model.fields,help:mail.field_mail_message_needaction @@ -1963,12 +1981,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1978,11 +2010,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2249,6 +2302,13 @@ msgstr "" msgid "Partners that did not ask not to be included in mass mailing campaigns" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids +#: 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 "" + #. module: mail #: model:ir.model.fields,help:mail.field_email_template_preview_auto_delete #: model:ir.model.fields,help:mail.field_mail_mail_auto_delete @@ -2301,7 +2361,7 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" +"- followers: only followers of the related document or members of following channels\n" msgstr "" #. module: mail @@ -2342,23 +2402,11 @@ msgstr "Privatnost" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2844,11 +2892,6 @@ msgid "" " will be taken from the email template." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2895,6 +2938,13 @@ msgstr "" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2954,8 +3004,15 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -2985,28 +3042,35 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "" @@ -3081,16 +3145,17 @@ msgid "Who can follow the group's activities?" msgstr "" #. module: mail -#: model:mail.channel,name:mail.channel_all_employees -msgid "Whole Company" +#. openerp-web +#: code:addons/mail/static/src/xml/composer.xml:7 +#, python-format +msgid "Write something..." msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/chatter.xml:57 -#: code:addons/mail/static/src/xml/composer.xml:7 +#: code:addons/mail/static/src/js/thread.js:122 #, python-format -msgid "Write something" +msgid "Yesterday" msgstr "" #. module: mail @@ -3100,6 +3165,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3141,18 +3214,11 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:469 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3171,6 +3237,11 @@ msgstr "" msgid "base.config.settings" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3178,24 +3249,29 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:29 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:281 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:232 +#: code:addons/mail/static/src/js/chatter.js:220 #, python-format msgid "followers" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_all_employees +msgid "general" +msgstr "" + #. module: mail #: model:ir.model,name:mail.model_ir_actions_server msgid "ir.actions.server" @@ -3211,6 +3287,13 @@ msgstr "" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3218,7 +3301,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3243,11 +3326,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/sr@latin.po b/addons/mail/i18n/sr@latin.po index fe1c1c2eaa6..08e817bf44e 100644 --- a/addons/mail/i18n/sr@latin.po +++ b/addons/mail/i18n/sr@latin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-11-11 08:22+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Serbian (Latin) (http://www.transifex.com/odoo/odoo-9/language/sr@latin/)\n" "MIME-Version: 1.0\n" @@ -28,10 +28,10 @@ msgid "" " \n" "
\n" "\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" +"
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -53,7 +53,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -134,6 +134,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -141,7 +148,7 @@ msgid "%s (copy)" msgstr "%s (kopiranje)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "" @@ -154,9 +161,9 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:86 +#: code:addons/mail/static/src/xml/thread.xml:96 #, python-format -msgid "(in channel" +msgid "(from" msgstr "" #. module: mail @@ -436,7 +443,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "" @@ -560,16 +567,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -790,6 +787,13 @@ msgstr "" msgid "Composition mode" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -957,21 +961,14 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1458,14 +1455,6 @@ msgstr "Važne poruke" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1500,7 +1489,7 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1508,7 +1497,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "" @@ -1565,6 +1561,11 @@ msgstr "Je pratioc" msgid "Is Notification" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1737,6 +1738,13 @@ msgstr "" msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1762,13 +1770,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1980,12 +1981,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1995,11 +2010,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2325,7 +2361,7 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" +"- followers: only followers of the related document or members of following channels\n" msgstr "" #. module: mail @@ -2366,23 +2402,11 @@ msgstr "Privatnost" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2868,11 +2892,6 @@ msgid "" " will be taken from the email template." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2919,6 +2938,13 @@ msgstr "" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2978,8 +3004,15 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -3009,28 +3042,35 @@ msgstr "Brojač nepročitanih poruka" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "" @@ -3106,9 +3146,16 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:6 +#: code:addons/mail/static/src/xml/composer.xml:7 #, python-format -msgid "Write something" +msgid "Write something..." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:122 +#, python-format +msgid "Yesterday" msgstr "" #. module: mail @@ -3118,6 +3165,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3159,18 +3214,11 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:346 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3189,6 +3237,11 @@ msgstr "" msgid "base.config.settings" msgstr "base.config.settings" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3196,13 +3249,13 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:30 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:314 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "" @@ -3234,6 +3287,13 @@ msgstr "" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3241,7 +3301,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3266,11 +3326,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/sv.po b/addons/mail/i18n/sv.po index 2c99417117f..77e25ec2637 100644 --- a/addons/mail/i18n/sv.po +++ b/addons/mail/i18n/sv.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-11-23 23:02+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Swedish (http://www.transifex.com/odoo/odoo-9/language/sv/)\n" "MIME-Version: 1.0\n" @@ -28,10 +28,10 @@ msgid "" " \n" " \n" "\n" -"

\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" +"
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -53,7 +53,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -134,6 +134,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -141,7 +148,7 @@ msgid "%s (copy)" msgstr "%s (kopia)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "%s skapad" @@ -154,9 +161,9 @@ msgstr "%s har gått med i %s nätverket." #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:86 +#: code:addons/mail/static/src/xml/thread.xml:96 #, python-format -msgid "(in channel" +msgid "(from" msgstr "" #. module: mail @@ -436,7 +443,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "Anonym" @@ -560,16 +567,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "Tillgänglig för mass-e-post" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "Marknadsföringspraxis" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "Styrelsemöten" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -790,6 +787,13 @@ msgstr "Skriv nytt meddelande" msgid "Composition mode" msgstr "Författarmod" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -957,21 +961,14 @@ msgstr "Description that will be added in the message posted for this subtype. I #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1458,14 +1455,6 @@ msgstr "" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1500,7 +1489,7 @@ msgid "" msgstr "Felaktigt uttryck, det måste vara en python dict-definition eg {'fält':'värde'}" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1508,7 +1497,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "" @@ -1565,6 +1561,11 @@ msgstr "" msgid "Is Notification" msgstr "Är en avisering" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1737,6 +1738,13 @@ msgstr "" msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1762,13 +1770,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "Medlemmarna i dessa grupper kommer automatiskt att läggas till som följare. Observera att de kommer att kunna hantera sin prenumeration för hand om det behövs." -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1980,12 +1981,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1995,11 +2010,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2325,7 +2361,7 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" +"- followers: only followers of the related document or members of following channels\n" msgstr "" #. module: mail @@ -2366,23 +2402,11 @@ msgstr "Integritet" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "FoU" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2868,11 +2892,6 @@ msgid "" " will be taken from the email template." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2919,6 +2938,13 @@ msgstr "" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2978,8 +3004,15 @@ msgstr "Kunde inte skicka e-post, vänligen konfigurera avsändarens e-postadres #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -3009,28 +3042,35 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "Avsluta prenumeration" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "Uppladdningsfel" @@ -3106,9 +3146,16 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:6 +#: code:addons/mail/static/src/xml/composer.xml:7 #, python-format -msgid "Write something" +msgid "Write something..." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:122 +#, python-format +msgid "Yesterday" msgstr "" #. module: mail @@ -3118,6 +3165,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3159,18 +3214,11 @@ msgstr "Du kan bilägga filer till denna mall, dessa läggs då till all e-post #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:346 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3189,6 +3237,11 @@ msgstr "" msgid "base.config.settings" msgstr "base.config.settings" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3196,13 +3249,13 @@ msgstr "av" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:30 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:314 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "" @@ -3234,6 +3287,13 @@ msgstr "" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3241,7 +3301,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3266,11 +3326,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "publisher_warranty.contract" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/th.po b/addons/mail/i18n/th.po index cc7aa6eae91..7c122df3f44 100644 --- a/addons/mail/i18n/th.po +++ b/addons/mail/i18n/th.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-10-10 09:46+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Thai (http://www.transifex.com/odoo/odoo-9/language/th/)\n" "MIME-Version: 1.0\n" @@ -28,10 +28,10 @@ msgid "" " \n" " \n" "\n" -"

\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" "
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -53,7 +53,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -78,49 +78,44 @@ msgid "" "

\n" "
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" +"
\n" +"
\n" -"
\n" -"
\n" -"
\n" -"
\n" +" \n" +" \n" +" \n" "
\n" +"
\n" +"
\n" +"
\n" +"
\n" "
\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" -"
\n" +" \n" " ${object.body | safe}\n" " % if ctx.get('tracking'):\n" +"
    \n" " % for tracking in ctx['tracking']\n" -" ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}\n" +"
  • ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}
    • \n" " % endfor\n" +"
\n" " % endif\n" "
\n" +"
\n" "
\n" "% if ctx.get('signature'):\n" -"
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -"
\n" -"  \n" -" ${ctx['signature'] | safe}\n" -"  \n" -"
\n" -"
\n" +"
\n" +" \n" +" \n" +" \n" +" \n" +"
\n" +" ${ctx['signature'] | safe}\n" +"
\n" "
\n" -"% endif\n" +"% endif" msgstr "" #. module: mail @@ -139,6 +134,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -146,7 +148,7 @@ msgid "%s (copy)" msgstr "%s (สำเนา)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "%s สร้างแล้ว" @@ -157,6 +159,13 @@ msgstr "%s สร้างแล้ว" msgid "%s has joined the %s network." msgstr "%s ได้เข้าร่วมเครือค่าย %s" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:96 +#, python-format +msgid "(from" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:48 @@ -173,9 +182,33 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:122 +#: code:addons/mail/static/src/xml/thread.xml:147 #, python-format -msgid "-------- Show more messages --------" +msgid "-------- Show older messages --------" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:513 +#, python-format +msgid "" +"
created #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:489 +#, python-format +msgid "" +"
joined #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:151 +#, python-format +msgid "" +"
left #%s
" msgstr "" #. module: mail @@ -266,13 +299,6 @@ msgstr "" msgid "Access Groups" msgstr "กลุ่มการเข้าถึง" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/js/client_action.js:154 -#, python-format -msgid "Action" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_message_needaction #: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction @@ -417,7 +443,7 @@ msgstr "ข้อความทั้งหมด" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "ผู้ใช้นิรนาม" @@ -541,16 +567,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "สามารถใช้ส่งจดหมายจำนวนมาก" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -638,6 +654,7 @@ msgstr "" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/client_action.xml:23 +#: code:addons/mail/static/src/xml/client_action.xml:89 #: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids @@ -770,6 +787,13 @@ msgstr "" msgid "Composition mode" msgstr "โหมดการเขียน" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -937,21 +961,14 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1438,14 +1455,6 @@ msgstr "" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1480,7 +1489,7 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1488,7 +1497,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "" @@ -1545,6 +1561,11 @@ msgstr "" msgid "Is Notification" msgstr "เป็นการแจ้งเตือน" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1717,6 +1738,13 @@ msgstr "" msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1742,13 +1770,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1914,11 +1935,8 @@ msgstr "" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_needaction -#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids #: model:ir.model.fields,help:mail.field_mail_compose_message_needaction #: model:ir.model.fields,help:mail.field_mail_mail_needaction #: model:ir.model.fields,help:mail.field_mail_message_needaction @@ -1963,12 +1981,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1978,11 +2010,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2249,6 +2302,13 @@ msgstr "" msgid "Partners that did not ask not to be included in mass mailing campaigns" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids +#: 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 "" + #. module: mail #: model:ir.model.fields,help:mail.field_email_template_preview_auto_delete #: model:ir.model.fields,help:mail.field_mail_mail_auto_delete @@ -2301,7 +2361,7 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" +"- followers: only followers of the related document or members of following channels\n" msgstr "" #. module: mail @@ -2342,23 +2402,11 @@ msgstr "ความเป็นส่วนตัว" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2844,11 +2892,6 @@ msgid "" " will be taken from the email template." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2895,6 +2938,13 @@ msgstr "ถึง (คู่ค้า)" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2954,8 +3004,15 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -2985,28 +3042,35 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "" @@ -3081,16 +3145,17 @@ msgid "Who can follow the group's activities?" msgstr "" #. module: mail -#: model:mail.channel,name:mail.channel_all_employees -msgid "Whole Company" +#. openerp-web +#: code:addons/mail/static/src/xml/composer.xml:7 +#, python-format +msgid "Write something..." msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/chatter.xml:57 -#: code:addons/mail/static/src/xml/composer.xml:7 +#: code:addons/mail/static/src/js/thread.js:122 #, python-format -msgid "Write something" +msgid "Yesterday" msgstr "" #. module: mail @@ -3100,6 +3165,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3141,18 +3214,11 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:469 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3171,6 +3237,11 @@ msgstr "" msgid "base.config.settings" msgstr "base.config.settings" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3178,24 +3249,29 @@ msgstr "โดย" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:29 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:281 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "เอกสาร" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:232 +#: code:addons/mail/static/src/js/chatter.js:220 #, python-format msgid "followers" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_all_employees +msgid "general" +msgstr "" + #. module: mail #: model:ir.model,name:mail.model_ir_actions_server msgid "ir.actions.server" @@ -3211,6 +3287,13 @@ msgstr "" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3218,7 +3301,7 @@ msgstr "mycompany.odoo.com" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3243,11 +3326,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/tr.po b/addons/mail/i18n/tr.po index 86a233f13d1..e7d6c4f3793 100644 --- a/addons/mail/i18n/tr.po +++ b/addons/mail/i18n/tr.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-10-17 13:25+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Turkish (http://www.transifex.com/odoo/odoo-9/language/tr/)\n" "MIME-Version: 1.0\n" @@ -28,10 +28,10 @@ msgid "" " \n" "
\n" "\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" "
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -53,7 +53,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -78,49 +78,44 @@ msgid "" "

\n" "
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" +"
\n" +"
\n" -"
\n" -"
\n" -"
\n" -"
\n" +" \n" +" \n" +" \n" "
\n" +"
\n" +"
\n" +"
\n" +"
\n" "
\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" -"
\n" +" \n" " ${object.body | safe}\n" " % if ctx.get('tracking'):\n" +"
    \n" " % for tracking in ctx['tracking']\n" -" ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}\n" +"
  • ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}
    • \n" " % endfor\n" +"
\n" " % endif\n" "
\n" +"
\n" "
\n" "% if ctx.get('signature'):\n" -"
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -"
\n" -"  \n" -" ${ctx['signature'] | safe}\n" -"  \n" -"
\n" -"
\n" +"
\n" +" \n" +" \n" +" \n" +" \n" +"
\n" +" ${ctx['signature'] | safe}\n" +"
\n" "
\n" -"% endif\n" +"% endif" msgstr "" #. module: mail @@ -139,6 +134,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -146,7 +148,7 @@ msgid "%s (copy)" msgstr "%s (kopya)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "%s oluşturuldu" @@ -157,6 +159,13 @@ msgstr "%s oluşturuldu" msgid "%s has joined the %s network." msgstr "%s katılıdı %s ağa" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:96 +#, python-format +msgid "(from" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:48 @@ -173,9 +182,33 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:122 +#: code:addons/mail/static/src/xml/thread.xml:147 #, python-format -msgid "-------- Show more messages --------" +msgid "-------- Show older messages --------" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:513 +#, python-format +msgid "" +"
created #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:489 +#, python-format +msgid "" +"
joined #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:151 +#, python-format +msgid "" +"
left #%s
" msgstr "" #. module: mail @@ -266,13 +299,6 @@ msgstr "" msgid "Access Groups" msgstr "Erişim Grupları" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/js/client_action.js:154 -#, python-format -msgid "Action" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_message_needaction #: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction @@ -417,7 +443,7 @@ msgstr "Tüm İletiler" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "İsimsiz" @@ -541,16 +567,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "Toplu posta için kullanılabilir" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "En İyi Satış Uygulamaları" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "Yönetim Kurulu Toplantıları" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -638,6 +654,7 @@ msgstr "" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/client_action.xml:23 +#: code:addons/mail/static/src/xml/client_action.xml:89 #: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids @@ -770,6 +787,13 @@ msgstr "Yeni Mesaj Yaz" msgid "Composition mode" msgstr "Kompozisyon modu" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -937,21 +961,14 @@ msgstr "Bu alt tip için gönderilen mesaja eklenecek açıklama. Geçersizse, y #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1438,14 +1455,6 @@ msgstr "" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1480,7 +1489,7 @@ msgid "" msgstr "Geçersiz ifade, bu tam bir python sözlük tanımı gibi olmalı \"{'field': 'value'}\"" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1488,7 +1497,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "Şunu takip etmek için davet : %s: %s" @@ -1545,6 +1561,11 @@ msgstr "Takipçi mi" msgid "Is Notification" msgstr "Bildirim mi" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1717,6 +1738,13 @@ msgstr "Varolan bir mail.message halkı bilgilendirmek için posta oluşturuldu" msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1742,13 +1770,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "O grubun üyeleri otomatik olarak izleyenler olarak eklenecektir. Gerek duydulduğunda aboneliklerini elle değiştirebileceklerini unutmayın." -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1914,11 +1935,8 @@ msgstr "Oluşturulan rapor için kullanılacak ad (yer tutucular içerebilir)\nU #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_needaction -#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids #: model:ir.model.fields,help:mail.field_mail_compose_message_needaction #: model:ir.model.fields,help:mail.field_mail_mail_needaction #: model:ir.model.fields,help:mail.field_mail_message_needaction @@ -1963,12 +1981,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1978,11 +2010,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2249,6 +2302,13 @@ msgstr "İş Ortağı Profili" msgid "Partners that did not ask not to be included in mass mailing campaigns" msgstr "İş Otaklarına sorulmadan toplu posta kampanyaları dahil edilmeyecekler" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids +#: 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 "" + #. module: mail #: model:ir.model.fields,help:mail.field_email_template_preview_auto_delete #: model:ir.model.fields,help:mail.field_mail_mail_auto_delete @@ -2301,8 +2361,8 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" -msgstr "Mail gateway'i kullanarak gönderilecek mesajların kurallarını belirleyin:\n Herkes : Herkes eposta alır.\n İş Ortakları : Sadece yetkili iş ortakları. \nTakipçiler : Sadece ilgili doküman veya konunun takipçileri\n" +"- followers: only followers of the related document or members of following channels\n" +msgstr "" #. module: mail #: model:ir.model.fields,help:mail.field_res_partner_notify_email @@ -2342,23 +2402,11 @@ msgstr "Özel" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "R&D" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2844,11 +2892,6 @@ msgid "" " will be taken from the email template." msgstr "Burada gösterilen değerler bilgi amaçlıdır. Eposta gönderirken, değerle\n eposta şablonundan alınacaktır." -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2895,6 +2938,13 @@ msgstr "Kime (İş Ortakları)" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2954,8 +3004,15 @@ msgstr "Eposta gönderilemiyor, lütfen alıcının eposta adresini ya da rumuzu #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -2985,28 +3042,35 @@ msgstr "Okunmamış Mesaj Sayacı" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "Üyelikten Çık" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "Yükleme hatası" @@ -3081,16 +3145,17 @@ msgid "Who can follow the group's activities?" msgstr "" #. module: mail -#: model:mail.channel,name:mail.channel_all_employees -msgid "Whole Company" -msgstr "Tüm Şirket" +#. openerp-web +#: code:addons/mail/static/src/xml/composer.xml:7 +#, python-format +msgid "Write something..." +msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/chatter.xml:57 -#: code:addons/mail/static/src/xml/composer.xml:7 +#: code:addons/mail/static/src/js/thread.js:122 #, python-format -msgid "Write something" +msgid "Yesterday" msgstr "" #. module: mail @@ -3100,6 +3165,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3141,18 +3214,11 @@ msgstr "Bu şablona dosya eleyebilirsiniz, bu şablonda oluşturulan tüm eposta #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:469 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3171,6 +3237,11 @@ msgstr "" msgid "base.config.settings" msgstr "base.config.settings" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3178,24 +3249,29 @@ msgstr "tarafından" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:29 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:281 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "belge" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:232 +#: code:addons/mail/static/src/js/chatter.js:220 #, python-format msgid "followers" msgstr "izleyiciler" +#. module: mail +#: model:mail.channel,name:mail.channel_all_employees +msgid "general" +msgstr "" + #. module: mail #: model:ir.model,name:mail.model_ir_actions_server msgid "ir.actions.server" @@ -3211,6 +3287,13 @@ msgstr "" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3218,7 +3301,7 @@ msgstr "mycompany.Odoo.com" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3243,11 +3326,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "publisher_warranty.contract" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "kayıt:" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/uk.po b/addons/mail/i18n/uk.po index 60c6ed38b1a..3f57e738e0b 100644 --- a/addons/mail/i18n/uk.po +++ b/addons/mail/i18n/uk.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-12-02 14:50+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Ukrainian (http://www.transifex.com/odoo/odoo-9/language/uk/)\n" "MIME-Version: 1.0\n" @@ -29,10 +29,10 @@ msgid "" " \n" "
\n" "\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" +"
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -54,7 +54,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -135,6 +135,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -142,7 +149,7 @@ msgid "%s (copy)" msgstr "%s (копія)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "" @@ -155,9 +162,9 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:86 +#: code:addons/mail/static/src/xml/thread.xml:96 #, python-format -msgid "(in channel" +msgid "(from" msgstr "" #. module: mail @@ -437,7 +444,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "" @@ -561,16 +568,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -791,6 +788,13 @@ msgstr "" msgid "Composition mode" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -958,21 +962,14 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1459,14 +1456,6 @@ msgstr "Важливі повідомлення" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1501,7 +1490,7 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1509,7 +1498,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "" @@ -1566,6 +1562,11 @@ msgstr "Стежить" msgid "Is Notification" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1738,6 +1739,13 @@ msgstr "" msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1763,13 +1771,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1981,12 +1982,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1996,11 +2011,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2326,7 +2362,7 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" +"- followers: only followers of the related document or members of following channels\n" msgstr "" #. module: mail @@ -2367,23 +2403,11 @@ msgstr "Приватність" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2869,11 +2893,6 @@ msgid "" " will be taken from the email template." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2920,6 +2939,13 @@ msgstr "" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2979,8 +3005,15 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -3010,28 +3043,35 @@ msgstr "Кількість непрочитаних повідомлень" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "Відписатися" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "" @@ -3107,9 +3147,16 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:6 +#: code:addons/mail/static/src/xml/composer.xml:7 #, python-format -msgid "Write something" +msgid "Write something..." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:122 +#, python-format +msgid "Yesterday" msgstr "" #. module: mail @@ -3119,6 +3166,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3160,18 +3215,11 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:346 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3190,6 +3238,11 @@ msgstr "" msgid "base.config.settings" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3197,13 +3250,13 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:30 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:314 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "" @@ -3235,6 +3288,13 @@ msgstr "ir.autovacuum" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3242,7 +3302,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3267,11 +3327,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/vi.po b/addons/mail/i18n/vi.po index 7d16895bd29..65ff206b338 100644 --- a/addons/mail/i18n/vi.po +++ b/addons/mail/i18n/vi.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-10-10 09:46+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Vietnamese (http://www.transifex.com/odoo/odoo-9/language/vi/)\n" "MIME-Version: 1.0\n" @@ -28,10 +28,10 @@ msgid "" " \n" " \n" "\n" -"

\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" "
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -53,7 +53,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -78,49 +78,44 @@ msgid "" "

\n" "
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -" \n" +"
\n" +"
\n" -"
\n" -"
\n" -"
\n" -"
\n" +" \n" +" \n" +" \n" "
\n" +"
\n" +"
\n" +"
\n" +"
\n" "
\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -" \n" -"
\n" +" \n" " ${object.body | safe}\n" " % if ctx.get('tracking'):\n" +"
    \n" " % for tracking in ctx['tracking']\n" -" ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}\n" +"
  • ${tracking[0]} : ${tracking[1]} -> ${tracking[2]}
    • \n" " % endfor\n" +"
\n" " % endif\n" "
\n" +"
\n" "
\n" "% if ctx.get('signature'):\n" -"
\n" -"
\n" -" \n" -" \n" -" \n" -" \n" -" \n" -"
\n" -"  \n" -" ${ctx['signature'] | safe}\n" -"  \n" -"
\n" -"
\n" +"
\n" +" \n" +" \n" +" \n" +" \n" +"
\n" +" ${ctx['signature'] | safe}\n" +"
\n" "
\n" -"% endif\n" +"% endif" msgstr "" #. module: mail @@ -139,6 +134,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -146,7 +148,7 @@ msgid "%s (copy)" msgstr "%s (bản sao)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "%s đã được tạo" @@ -157,6 +159,13 @@ msgstr "%s đã được tạo" msgid "%s has joined the %s network." msgstr "%s đã tham gia %s." +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:96 +#, python-format +msgid "(from" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:48 @@ -173,9 +182,33 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:122 +#: code:addons/mail/static/src/xml/thread.xml:147 #, python-format -msgid "-------- Show more messages --------" +msgid "-------- Show older messages --------" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:513 +#, python-format +msgid "" +"
created #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:489 +#, python-format +msgid "" +"
joined #%s
" +msgstr "" + +#. module: mail +#: code:addons/mail/models/mail_channel.py:151 +#, python-format +msgid "" +"
left #%s
" msgstr "" #. module: mail @@ -266,13 +299,6 @@ msgstr "" msgid "Access Groups" msgstr "Access Groups" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/js/client_action.js:154 -#, python-format -msgid "Action" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_message_needaction #: model:ir.model.fields,field_description:mail.field_mail_thread_message_needaction @@ -417,7 +443,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "" @@ -541,16 +567,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "Có khả năng gửi thư hàng loạt" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -638,6 +654,7 @@ msgstr "" #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/client_action.xml:23 +#: code:addons/mail/static/src/xml/client_action.xml:89 #: model:ir.model.fields,field_description:mail.field_mail_compose_message_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_channel_ids #: model:ir.model.fields,field_description:mail.field_mail_message_channel_ids @@ -770,6 +787,13 @@ msgstr "Soạn tin nhắn mới" msgid "Composition mode" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -937,21 +961,14 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1438,14 +1455,6 @@ msgstr "" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1480,7 +1489,7 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1488,7 +1497,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "" @@ -1545,6 +1561,11 @@ msgstr "" msgid "Is Notification" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1717,6 +1738,13 @@ msgstr "" msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1742,13 +1770,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1914,11 +1935,8 @@ msgstr "" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_mail_needaction -#: model:ir.model.fields,field_description:mail.field_mail_mail_needaction_partner_ids #: model:ir.model.fields,field_description:mail.field_mail_message_needaction -#: model:ir.model.fields,field_description:mail.field_mail_message_needaction_partner_ids #: model:ir.model.fields,help:mail.field_mail_compose_message_needaction #: model:ir.model.fields,help:mail.field_mail_mail_needaction #: model:ir.model.fields,help:mail.field_mail_message_needaction @@ -1963,12 +1981,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1978,11 +2010,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2249,6 +2302,13 @@ msgstr "" msgid "Partners that did not ask not to be included in mass mailing campaigns" msgstr "" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_compose_message_needaction_partner_ids +#: 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 "" + #. module: mail #: model:ir.model.fields,help:mail.field_email_template_preview_auto_delete #: model:ir.model.fields,help:mail.field_mail_mail_auto_delete @@ -2301,7 +2361,7 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" +"- followers: only followers of the related document or members of following channels\n" msgstr "" #. module: mail @@ -2342,23 +2402,11 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2844,11 +2892,6 @@ msgid "" " will be taken from the email template." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2895,6 +2938,13 @@ msgstr "Đến (Các đối tác)" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2954,8 +3004,15 @@ msgstr "Không thể gửi email, vui lòng cấu hình địa chỉ email ngư #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -2985,28 +3042,35 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "Lỗi tải lên" @@ -3081,16 +3145,17 @@ msgid "Who can follow the group's activities?" msgstr "" #. module: mail -#: model:mail.channel,name:mail.channel_all_employees -msgid "Whole Company" +#. openerp-web +#: code:addons/mail/static/src/xml/composer.xml:7 +#, python-format +msgid "Write something..." msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/chatter.xml:57 -#: code:addons/mail/static/src/xml/composer.xml:7 +#: code:addons/mail/static/src/js/thread.js:122 #, python-format -msgid "Write something" +msgid "Yesterday" msgstr "" #. module: mail @@ -3100,6 +3165,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3141,18 +3214,11 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:469 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3171,6 +3237,11 @@ msgstr "" msgid "base.config.settings" msgstr "base.config.settings" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3178,24 +3249,29 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:29 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:281 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "tài liệu" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:232 +#: code:addons/mail/static/src/js/chatter.js:220 #, python-format msgid "followers" msgstr "theo dõi" +#. module: mail +#: model:mail.channel,name:mail.channel_all_employees +msgid "general" +msgstr "" + #. module: mail #: model:ir.model,name:mail.model_ir_actions_server msgid "ir.actions.server" @@ -3211,6 +3287,13 @@ msgstr "" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3218,7 +3301,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3243,11 +3326,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/zh_CN.po b/addons/mail/i18n/zh_CN.po index b8ef14548ea..69a50b7d827 100644 --- a/addons/mail/i18n/zh_CN.po +++ b/addons/mail/i18n/zh_CN.po @@ -3,12 +3,13 @@ # * mail # # Translators: +# mrshelly , 2015 msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-12-02 07:35+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Chinese (China) (http://www.transifex.com/odoo/odoo-9/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -28,10 +29,10 @@ msgid "" " \n" "
\n" "\n" -"
\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -"
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -53,7 +54,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -134,6 +135,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -141,7 +149,7 @@ msgid "%s (copy)" msgstr "%s (副本)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "%s 创建" @@ -154,9 +162,9 @@ msgstr "%s 加入到 %s 网络." #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:86 +#: code:addons/mail/static/src/xml/thread.xml:96 #, python-format -msgid "(in channel" +msgid "(from" msgstr "" #. module: mail @@ -269,7 +277,7 @@ msgstr "" #: code:addons/mail/static/src/xml/client_action.xml:13 #, python-format msgid "@ Inbox" -msgstr "" +msgstr "@收件箱" #. module: mail #: model:ir.model.fields,help:mail.field_mail_alias_alias_defaults @@ -436,7 +444,7 @@ msgstr "全部接收" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "匿名" @@ -560,16 +568,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "可用于群发邮件" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "最佳销售实践" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "董事会议" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -718,7 +716,7 @@ msgstr "" #: code:addons/mail/models/mail_thread.py:324 #, python-format msgid "Click here to add new %s" -msgstr "" +msgstr "点击创建 %s" #. module: mail #: model:ir.actions.act_window,help:mail.action_contacts @@ -790,6 +788,13 @@ msgstr "写新消息" msgid "Composition mode" msgstr "写作模式" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -824,12 +829,12 @@ msgstr "" #: code:addons/mail/static/src/js/client_action.js:217 #, python-format msgid "Create %s" -msgstr "" +msgstr "创建 %s" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_create_date msgid "Create Date" -msgstr "" +msgstr "创建时间" #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_create_uid @@ -957,21 +962,14 @@ msgstr "将为该子模型的消息添加注解。如为空，则添加名称。 #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1322,7 +1320,7 @@ msgstr "从" #. module: mail #: model:ir.ui.view,arch_db:mail.view_message_form msgid "Gateway" -msgstr "" +msgstr "网关" #. module: mail #: code:addons/mail/models/res_users.py:48 @@ -1458,14 +1456,6 @@ msgstr "重要信息" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1500,7 +1490,7 @@ msgid "" msgstr "错误的表达式，必须是 python 字典定义，例如： \"{'field': 'value'}\"" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1508,7 +1498,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "邀请关注 %s: %s" @@ -1565,6 +1562,11 @@ msgstr "是否关注者" msgid "Is Notification" msgstr "是通知" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1737,6 +1739,13 @@ msgstr "邮件被创建，以通知现有的邮件消息的人" msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1762,13 +1771,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "这些群组的成员将自动添加为关注者。注意, 如果有必要，他们能手工管理他们的订阅。" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1780,7 +1782,7 @@ msgstr "消息" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_mail_message_id msgid "Message ID" -msgstr "" +msgstr "邮件消息ID" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_record_name @@ -1951,22 +1953,22 @@ msgstr "不接收" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_char msgid "New Value Char" -msgstr "" +msgstr "字符值" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_datetime msgid "New Value Datetime" -msgstr "" +msgstr "时间值" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_float msgid "New Value Float" -msgstr "" +msgstr "数值" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_integer msgid "New Value Integer" -msgstr "" +msgstr "整数值" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_monetary @@ -1976,14 +1978,28 @@ msgstr "" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_new_value_text msgid "New Value Text" +msgstr "文本值" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 +#, python-format +msgid "New message" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/xml/thread.xml:140 #, python-format -msgid "New message" +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." msgstr "" #. module: mail @@ -1995,11 +2011,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2069,22 +2106,22 @@ msgstr "" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_char msgid "Old Value Char" -msgstr "" +msgstr "旧字符值" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_datetime msgid "Old Value DateTime" -msgstr "" +msgstr "旧时间值" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_float msgid "Old Value Float" -msgstr "" +msgstr "旧数值" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_integer msgid "Old Value Integer" -msgstr "" +msgstr "旧整数值" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_monetary @@ -2094,7 +2131,7 @@ msgstr "" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_tracking_value_old_value_text msgid "Old Value Text" -msgstr "" +msgstr "旧文本值" #. module: mail #. openerp-web @@ -2325,8 +2362,8 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" -msgstr "文档信息发送使用邮件服务器规则。\n- 所有人：所有人都允许\n- 业务伙伴：仅认证的业务伙伴\n- 关注者：仅关注相关文档者\n" +"- followers: only followers of the related document or members of following channels\n" +msgstr "" #. module: mail #: model:ir.model.fields,help:mail.field_res_partner_notify_email @@ -2366,23 +2403,11 @@ msgstr "隐私" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "研究与开发" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2756,7 +2781,7 @@ msgstr "主题..." #: code:addons/mail/static/src/xml/thread.xml:68 #, python-format msgid "Subject:" -msgstr "" +msgstr "主题:" #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_shortcode_substitution @@ -2868,11 +2893,6 @@ msgid "" " will be taken from the email template." msgstr "资料显示在下面，当发送一个邮件时，将取值于邮件模板。" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2919,6 +2939,13 @@ msgstr "To（合作伙伴）" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2978,8 +3005,15 @@ msgstr "不能发送email，请配置发件人的email地址或者别名。" #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -3009,28 +3043,35 @@ msgstr "未读消息计数器" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "退订" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "上传错误" @@ -3106,9 +3147,16 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:6 +#: code:addons/mail/static/src/xml/composer.xml:7 #, python-format -msgid "Write something" +msgid "Write something..." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:122 +#, python-format +msgid "Yesterday" msgstr "" #. module: mail @@ -3118,6 +3166,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3159,18 +3215,11 @@ msgstr "你可以对这个模版附加文件，可以附加到所有基于此模 #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:346 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3189,6 +3238,11 @@ msgstr "" msgid "base.config.settings" msgstr "base.config.settings" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3196,13 +3250,13 @@ msgstr "作者" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:30 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:314 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "文档" @@ -3234,6 +3288,13 @@ msgstr "" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3241,7 +3302,7 @@ msgstr "mycompany.odoo.com" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3266,11 +3327,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "publisher_warranty.contract" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "记录：" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/i18n/zh_TW.po b/addons/mail/i18n/zh_TW.po index c54c59c1a3e..308d98933ba 100644 --- a/addons/mail/i18n/zh_TW.po +++ b/addons/mail/i18n/zh_TW.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo 9.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-10-09 09:18+0000\n" -"PO-Revision-Date: 2015-12-04 06:06+0000\n" +"POT-Creation-Date: 2015-12-10 13:38+0000\n" +"PO-Revision-Date: 2015-12-11 08:46+0000\n" "Last-Translator: Martin Trigaux\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/odoo/odoo-9/language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -28,10 +28,10 @@ msgid "" " \n" " \n" "\n" -"

\n" -" \n" +"
\n" +"
\n" " \n" -" \n" -"
\n" +" \n" " % if ctx.get('button_access'):\n" " ${ctx['button_access']['title']}\n" " % endif\n" @@ -53,7 +53,7 @@ msgid "" "

\n" " % endif\n" " 		\n" +" \n" "

\n" " % if ctx.get('actions'):\n" " % for action in ctx['actions']:\n" @@ -134,6 +134,13 @@ msgid "" "object.parent_id.record_name and 'Re: %s' % object.parent_id.record_name)}" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:59 +#, python-format +msgid "%d Messages" +msgstr "" + #. module: mail #: code:addons/mail/models/mail_template.py:216 #, python-format @@ -141,7 +148,7 @@ msgid "%s (copy)" msgstr "%s (副本)" #. module: mail -#: code:addons/mail/models/mail_thread.py:202 +#: code:addons/mail/models/mail_thread.py:234 #, python-format msgid "%s created" msgstr "" @@ -154,9 +161,9 @@ msgstr "%s 已加入 %s 網路." #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:86 +#: code:addons/mail/static/src/xml/thread.xml:96 #, python-format -msgid "(in channel" +msgid "(from" msgstr "" #. module: mail @@ -436,7 +443,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/thread.js:38 +#: code:addons/mail/static/src/js/chat_manager.js:190 #, python-format msgid "Anonymous" msgstr "" @@ -560,16 +567,6 @@ msgstr "" msgid "Available for mass mailing" msgstr "可以大量寄信" -#. module: mail -#: model:mail.channel,name:mail.channel_1 -msgid "Best Sales Practices" -msgstr "最佳銷售實例" - -#. module: mail -#: model:mail.channel,name:mail.channel_2 -msgid "Board meetings" -msgstr "董事會會議" - #. module: mail #: model:ir.model.fields,field_description:mail.field_email_template_preview_body_html #: model:ir.model.fields,field_description:mail.field_ir_act_server_body_html @@ -790,6 +787,13 @@ msgstr "撰寫新訊息" msgid "Composition mode" msgstr "撰寫模式" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:24 +#, python-format +msgid "Congratulations, your inbox is empty" +msgstr "" + #. module: mail #: model:ir.actions.act_window,name:mail.action_contacts #: model:ir.ui.menu,name:mail.menu_contacts @@ -957,21 +961,14 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:76 +#: code:addons/mail/static/src/xml/client_action.xml:107 #, python-format msgid "Detach" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Did you know ? Type '@someone' in the composer to cite someone in your " -"message, and make it appear in his own inbox." -msgstr "" - #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:31 +#: code:addons/mail/static/src/xml/client_action.xml:35 #, python-format msgid "Direct Messages" msgstr "" @@ -1458,14 +1455,6 @@ msgstr "" msgid "Important messages" msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"In the \"Channels\" section, you will find the public and restricted channel.
\n" -" The \"Direct Message\" section allows you to talk directly to one person.
\n" -" The \"Private Group\" section contains your private conversations. You can join a private channel either by creating a channel yourself, or by being invited to another one.
" -msgstr "" - #. module: mail #: code:addons/mail/models/mail_alias.py:141 #, python-format @@ -1500,7 +1489,7 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:1549 +#: code:addons/mail/models/mail_thread.py:1607 #, python-format msgid "" "Invalid record set: should be called as model (without records) or on " @@ -1508,7 +1497,14 @@ msgid "" msgstr "" #. module: mail -#: code:addons/mail/wizard/invite.py:52 +#. openerp-web +#: code:addons/mail/static/src/js/chat_manager.js:514 +#, python-format +msgid "Invitation" +msgstr "" + +#. module: mail +#: code:addons/mail/wizard/invite.py:53 #, python-format msgid "Invitation to follow %s: %s" msgstr "" @@ -1565,6 +1561,11 @@ msgstr "" msgid "Is Notification" msgstr "為通知" +#. module: mail +#: model:ir.model.fields,field_description:mail.field_mail_channel_is_member +msgid "Is a member" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_partner_is_pinned msgid "Is pinned on the interface" @@ -1737,6 +1738,13 @@ msgstr "" msgid "Mailing Opt-Out" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:108 +#, python-format +msgid "Mark all read" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_channel_image_medium msgid "Medium-sized photo" @@ -1762,13 +1770,6 @@ msgid "" "they will be able to manage their subscription manually if necessary." msgstr "群組成員將自動成為信件追隨者。需注意的是，必要時他們將可以手動管理其訂閱。" -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:51 -#, python-format -msgid "Mention(s):" -msgstr "" - #. module: mail #: model:ir.model,name:mail.model_mail_message #: model:ir.model.fields,field_description:mail.field_mail_mail_mail_message_id @@ -1980,12 +1981,26 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:48 -#: code:addons/mail/static/src/xml/chatter.xml:72 +#: code:addons/mail/static/src/js/chat_manager.js:99 +#: code:addons/mail/static/src/xml/chatter.xml:67 #, python-format msgid "New message" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:140 +#, python-format +msgid "New messages" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:25 +#, python-format +msgid "New messages appear here." +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/js/client_action.js:81 @@ -1995,11 +2010,32 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chatter.js:228 +#: code:addons/mail/static/src/js/chatter.js:216 #, python-format msgid "No follower" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:16 +#, python-format +msgid "No matches found" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:17 +#, python-format +msgid "No message matches your search. Try to change your search filters." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:28 +#, python-format +msgid "No starred message" +msgstr "" + #. module: mail #: model:ir.model.fields,field_description:mail.field_mail_compose_message_no_auto_thread #: model:ir.model.fields,field_description:mail.field_mail_mail_no_auto_thread @@ -2325,7 +2361,7 @@ msgid "" "Policy to post a message on the document using the mailgateway.\n" "- everyone: everyone can post\n" "- partners: only authenticated partners\n" -"- followers: only followers of the related document\n" +"- followers: only followers of the related document or members of following channels\n" msgstr "" #. module: mail @@ -2366,23 +2402,11 @@ msgstr "隱私" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/chat_manager.js:478 -#, python-format -msgid "Private Channel" -msgstr "" - -#. module: mail -#. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:41 +#: code:addons/mail/static/src/xml/client_action.xml:44 #, python-format msgid "Private Channels" msgstr "" -#. module: mail -#: model:mail.channel,name:mail.channel_3 -msgid "R&D" -msgstr "研究發展" - #. module: mail #: code:addons/mail/wizard/mail_compose_message.py:176 #, python-format @@ -2868,11 +2892,6 @@ msgid "" " will be taken from the email template." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "There are no messages to display.
" -msgstr "" - #. module: mail #: model:ir.model.fields,help:mail.field_mail_channel_image msgid "" @@ -2919,6 +2938,13 @@ msgstr "" msgid "To: Followers of" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:119 +#, python-format +msgid "Today" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.mail_channel_view_form msgid "Topics discussed in this group..." @@ -2978,8 +3004,15 @@ msgstr "無法傳送電子郵件，請設定送信者的電子郵件地址或別 #. module: mail #. openerp-web -#: code:addons/mail/models/mail_thread.py:606 -#: code:addons/mail/static/src/xml/chatter.xml:101 +#: code:addons/mail/static/src/xml/client_action.xml:98 +#, python-format +msgid "Undo" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/models/mail_thread.py:638 +#: code:addons/mail/static/src/xml/chatter.xml:96 #: model:ir.ui.view,arch_db:mail.mail_channel_view_kanban #, python-format msgid "Unfollow" @@ -3009,28 +3042,35 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:158 +#: code:addons/mail/static/src/xml/client_action.xml:109 +#, python-format +msgid "Unstar all" +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:110 #, python-format msgid "Unsubscribe" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:470 +#: code:addons/mail/static/src/js/client_action.js:402 #, python-format msgid "Unsubscribed" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:113 +#: code:addons/mail/static/src/xml/thread.xml:178 #, python-format msgid "Uploading" msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/composer.js:252 +#: code:addons/mail/static/src/js/composer.js:583 #, python-format msgid "Uploading error" msgstr "上傳錯誤" @@ -3106,9 +3146,16 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/composer.xml:6 +#: code:addons/mail/static/src/xml/composer.xml:7 #, python-format -msgid "Write something" +msgid "Write something..." +msgstr "" + +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/js/thread.js:122 +#, python-format +msgid "Yesterday" msgstr "" #. module: mail @@ -3118,6 +3165,14 @@ msgstr "" msgid "You added %s to the conversation." msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/thread.xml:29 +#, python-format +msgid "" +"You can mark any message as 'starred', and it shows up in this channel." +msgstr "" + #. module: mail #: code:addons/mail/models/res_users.py:47 #, python-format @@ -3159,18 +3214,11 @@ msgstr "這個範本您可以加入附件, 從這範本新建所有郵件" #. module: mail #. openerp-web -#: code:addons/mail/static/src/js/client_action.js:346 +#: code:addons/mail/static/src/js/client_action.js:401 #, python-format msgid "You unsubscribed from %s." msgstr "" -#. module: mail -#: model:ir.actions.client,help:mail.mail_channel_action_client_chat -msgid "" -"Your \"Inbox\" contains all the messages in which you've been mentioned, and the messages you receive as a follower of a document.
\n" -" The \"Starred\" section contains all your favorite messages." -msgstr "" - #. module: mail #: model:ir.ui.view,arch_db:mail.view_server_action_form_template msgid "" @@ -3189,6 +3237,11 @@ msgstr "" msgid "base.config.settings" msgstr "base.config.settings" +#. module: mail +#: model:mail.channel,name:mail.channel_2 +msgid "board-meetings" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_mail_form msgid "by" @@ -3196,13 +3249,13 @@ msgstr "由" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/client_action.xml:30 +#: code:addons/mail/static/src/xml/client_action.xml:33 #, python-format msgid "dm" msgstr "" #. module: mail -#: code:addons/mail/models/mail_thread.py:314 +#: code:addons/mail/models/mail_thread.py:313 #, python-format msgid "document" msgstr "" @@ -3234,6 +3287,13 @@ msgstr "" msgid "members" msgstr "" +#. module: mail +#. openerp-web +#: code:addons/mail/static/src/xml/client_action.xml:97 +#, python-format +msgid "mention(s) marked as read." +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.view_general_configuration_mail_alias_domain msgid "mycompany.odoo.com" @@ -3241,7 +3301,7 @@ msgstr "" #. module: mail #. openerp-web -#: code:addons/mail/static/src/xml/thread.xml:61 +#: code:addons/mail/static/src/xml/thread.xml:93 #: model:ir.ui.view,arch_db:mail.view_mail_form #, python-format msgid "on" @@ -3266,11 +3326,21 @@ msgstr "" msgid "publisher_warranty.contract" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_3 +msgid "rd" +msgstr "" + #. module: mail #: model:ir.ui.view,arch_db:mail.email_template_preview_form msgid "record:" msgstr "" +#. module: mail +#: model:mail.channel,name:mail.channel_1 +msgid "sales" +msgstr "" + #. module: mail #. openerp-web #: code:addons/mail/static/src/xml/chatter.xml:35 diff --git a/addons/mail/models/mail_message.py b/addons/mail/models/mail_message.py index 8d262a9a54d..d5ba5e63baf 100644 --- a/addons/mail/models/mail_message.py +++ b/addons/mail/models/mail_message.py @@ -329,6 +329,7 @@ class Message(models.Model): 'tracking_value_ids': tracking_value_ids, }) body_short = tools.html_email_clean(message_dict['body'], shorten=True, remove=True) + message_dict['body'] = tools.html_email_clean(message_dict['body'], shorten=False, remove=False) message_dict['body_short'] = body_short != message_dict['body'] and body_short or False return True diff --git a/addons/mail/models/mail_template.py b/addons/mail/models/mail_template.py index e216aa2e7c0..937168853ff 100644 --- a/addons/mail/models/mail_template.py +++ b/addons/mail/models/mail_template.py @@ -77,6 +77,7 @@ try: 'reduce': reduce, 'map': map, 'round': round, + 'cmp': cmp, # dateutil.relativedelta is an old-style class and cannot be directly # instanciated wihtin a jinja2 expression, so a lambda "proxy" is diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py index a7c66c97411..f4ae5dac02c 100644 --- a/addons/mail/models/mail_thread.py +++ b/addons/mail/models/mail_thread.py @@ -95,8 +95,7 @@ class MailThread(models.AbstractModel): compute='_get_followers', search='_search_follower_channels') message_ids = fields.One2many( 'mail.message', 'res_id', string='Messages', - domain=lambda self: [('model', '=', self._name)], auto_join=True, - help="Messages and communication history") + domain=lambda self: [('model', '=', self._name)], auto_join=True) message_last_post = fields.Datetime('Last Message Date', help='Date of the last message posted on the record.') message_unread = fields.Boolean( 'Unread Messages', compute='_get_message_unread', @@ -1475,6 +1474,7 @@ class MailThread(models.AbstractModel): followers = record.message_partner_ids Partner = self.env['res.partner'].sudo() + Users = self.env['res.users'].sudo() partner_ids = [] for contact in emails: @@ -1495,10 +1495,10 @@ class MailThread(models.AbstractModel): email_brackets = "<%s>" % email_address if not partner_id: # exact, case-insensitive match - partners = Partner.search([('email', '=ilike', email_address), ('user_ids', '!=', False)], limit=1) + partners = Users.search([('email', '=ilike', email_address)], limit=1).mapped('partner_id') if not partners: # if no match with addr-spec, attempt substring match within name-addr pair - partners = Partner.search([('email', 'ilike', email_brackets), ('user_ids', '!=', False)], limit=1) + partners = Users.search([('email', 'ilike', email_brackets)], limit=1).mapped('partner_id') if partners: partner_id = partners[0].id # third try: check in partners diff --git a/addons/mail/models/res_partner.py b/addons/mail/models/res_partner.py index e7fee6a5d1d..b0ea116fef3 100644 --- a/addons/mail/models/res_partner.py +++ b/addons/mail/models/res_partner.py @@ -102,7 +102,7 @@ class Partner(models.Model): @api.model def _notify_send(self, body, subject, recipients, **mail_values): emails = self.env['mail.mail'] - recipients_nbr, recipients_max = 0, 50 + recipients_nbr, recipients_max = len(recipients), 50 email_chunks = [recipients[x:x + recipients_max] for x in xrange(0, len(recipients), recipients_max)] for email_chunk in email_chunks: create_values = { diff --git a/addons/mail/models/res_users.py b/addons/mail/models/res_users.py index b803f3c47ee..e390b72da14 100644 --- a/addons/mail/models/res_users.py +++ b/addons/mail/models/res_users.py @@ -47,10 +47,10 @@ class Users(models.Model): msg = _("You cannot create a new user from here.\n To create new user please go to configuration panel.") raise openerp.exceptions.RedirectWarning(msg, action.id, _('Go to the configuration panel')) - user = super(Users, self.with_context({ - 'alias_model_name': self._name, - 'alias_parent_model_name': self._name - })).create(values) + user = super(Users, self.with_context( + alias_model_name=self._name, + alias_parent_model_name=self._name + )).create(values) user.alias_id.sudo().write({"alias_force_thread_id": user.id, "alias_parent_thread_id": user.id}) # create a welcome message diff --git a/addons/mail/static/src/js/chat_manager.js b/addons/mail/static/src/js/chat_manager.js index 2261b961410..cd758790d64 100644 --- a/addons/mail/static/src/js/chat_manager.js +++ b/addons/mail/static/src/js/chat_manager.js @@ -98,7 +98,7 @@ function add_message (data, options) { if (!query.is_displayed) { var title = _t('New message'); if (msg.author_id[1]) { - title += _t(' from ') + msg.author_id[1]; + title += _t(' from ') + _.escape(msg.author_id[1]); } var trunc_text = function (t, limit) { return (t.length > limit) ? t.substr(0, limit-1)+'…' : t; @@ -137,6 +137,7 @@ function make_message (data) { channel_ids: data.channel_ids, model: data.model, res_id: data.res_id, + url: session.url("/mail/view?message_id=" + data.id), }; _.each(_.keys(emoji_substitutions), function (key) { @@ -271,6 +272,7 @@ function make_channel (data, options) { if ('direct_partner' in data) { channel.type = "dm"; channel.name = data.direct_partner[0].name; + channel.direct_partner_id = data.direct_partner[0].id; channel.status = data.direct_partner[0].im_status; } return channel; @@ -398,6 +400,9 @@ function on_notification (notification) { } else if (model === 'res.partner') { // channel joined/left, message marked as read/(un)starred, chat open/closed on_partner_notification(notification[1]); + } else if (model === 'bus.presence') { + // update presence of users + on_presence_notification(notification[1]); } } @@ -450,6 +455,10 @@ function on_toggle_star_notification (data) { message.is_starred = data.starred; if (!message.is_starred) { remove_message_from_channel("channel_starred", message); + } else { + add_to_cache(message, []); + var channel_starred = chat_manager.get_channel('channel_starred'); + channel_starred.cache = _.pick(channel_starred.cache, "[]"); } chat_manager.bus.trigger('update_message', message); } @@ -487,8 +496,12 @@ function on_mark_as_unread_notification (data) { if (message) { invalidate_caches(message.channel_ids); add_channel_to_message(message, 'channel_inbox'); + add_to_cache(message, []); } }); + var channel_inbox = chat_manager.get_channel('channel_inbox'); + channel_inbox.cache = _.pick(channel_inbox.cache, "[]"); + _.each(data.channel_ids, function (channel_id) { var channel = chat_manager.get_channel(channel_id); if (channel) { @@ -500,6 +513,7 @@ function on_mark_as_unread_notification (data) { } function on_chat_session_notification (chat_session) { + var channel; if ((chat_session.channel_type === "channel") && (chat_session.state === "open")) { add_channel(chat_session, {autoswitch: false}); if (!chat_session.is_minimized && chat_session.info !== 'creation') { @@ -508,11 +522,23 @@ function on_chat_session_notification (chat_session) { } // partner specific change (open a detached window for example) if ((chat_session.state === "open") || (chat_session.state === "folded")) { - if (chat_session.is_minimized && chat_manager.get_channel(chat_session.id)) { - chat_manager.bus.trigger("open_chat", chat_session); + channel = chat_session.is_minimized && chat_manager.get_channel(chat_session.id); + if (channel) { + chat_manager.bus.trigger("open_chat", channel); } } else if (chat_session.state === "closed") { - chat_manager.bus.trigger("close_chat", chat_session); + channel = chat_manager.get_channel(chat_session.id); + if (channel) { + chat_manager.bus.trigger("close_chat", channel); + } + } +} + +function on_presence_notification (data) { + var dm = _.findWhere(channels, {direct_partner_id: data.id}); + if (dm) { + dm.status = data.im_status; + chat_manager.bus.trigger('update_dm_presence', dm); } } @@ -738,13 +764,13 @@ var chat_manager = { */ redirect: function (res_model, res_id, dm_redirection_callback) { var self = this; - var redirect_to_document = function (res_model, res_id) { + var redirect_to_document = function (res_model, res_id, view_id) { web_client.do_action({ type:'ir.actions.act_window', view_type: 'form', view_mode: 'form', res_model: res_model, - views: [[false, 'form']], + views: [[view_id || false, 'form']], res_id: res_id, }); }; @@ -758,7 +784,9 @@ var chat_manager = { } }); } else { - redirect_to_document(res_model, res_id); + new Model(res_model).call('get_formview_id', [res_id, session.context]).then(function (view_id) { + redirect_to_document(res_model, res_id, view_id); + }); } }, }; diff --git a/addons/mail/static/src/js/chat_window.js b/addons/mail/static/src/js/chat_window.js index e9fcaa9fe09..ca36b430791 100644 --- a/addons/mail/static/src/js/chat_window.js +++ b/addons/mail/static/src/js/chat_window.js @@ -8,6 +8,9 @@ var Widget = require('web.Widget'); var _t = core._t; +var HEIGHT_OPEN = '400px'; +var HEIGHT_FOLDED = '28px'; + return Widget.extend({ template: "mail.ChatWindow", events: { @@ -33,7 +36,6 @@ return Widget.extend({ this.thread = new ChatThread(this, { channel_id: this.channel_id, - display_avatar: false, display_needactions: false, display_stars: this.options.display_stars, }); @@ -41,7 +43,9 @@ return Widget.extend({ this.thread.on('redirect_to_channel', null, this.trigger.bind(this, 'redirect_to_channel')); this.thread.on('redirect', null, this.trigger.bind(this, 'redirect')); - this.fold(); + if (this.folded) { + this.$el.css('height', HEIGHT_FOLDED); + } var def = this.thread.appendTo(this.$content); return $.when(this._super(), def); }, @@ -64,7 +68,7 @@ return Widget.extend({ fold: function () { this.update_header(); this.$el.animate({ - height: this.folded ? "28px" : "333px" + height: this.folded ? HEIGHT_FOLDED : HEIGHT_OPEN }); }, toggle_fold: function (fold) { @@ -78,13 +82,16 @@ return Widget.extend({ on_keydown: function (event) { // ENTER key (avoid requiring jquery ui for external livechat) if (event.which === 13) { + var content = _.str.trim(this.$input.val()); var message = { - content: this.$input.val(), + content: content, attachment_ids: [], partner_ids: [], }; this.$input.val(''); - this.trigger('post_message', message, this.channel_id); + if (content) { + this.trigger('post_message', message, this.channel_id); + } } }, on_click_close: function (event) { diff --git a/addons/mail/static/src/js/chatter.js b/addons/mail/static/src/js/chatter.js index c99e958929e..94f3773258b 100644 --- a/addons/mail/static/src/js/chatter.js +++ b/addons/mail/static/src/js/chatter.js @@ -445,6 +445,9 @@ var ChatterComposer = ChatComposer.extend({ is_log: false, internal_subtypes: [], }); + if (this.options.is_log) { + this.options.send_text = _('Log'); + } this.events = _.extend(this.events, { 'click .o_composer_button_full_composer': 'on_open_full_composer', }); diff --git a/addons/mail/static/src/js/client_action.js b/addons/mail/static/src/js/client_action.js index fc9d73fbfb7..3d97a35af0e 100644 --- a/addons/mail/static/src/js/client_action.js +++ b/addons/mail/static/src/js/client_action.js @@ -52,8 +52,8 @@ var PartnerInviteDialog = Dialog.extend({ width: '100%', allowClear: true, multiple: true, - formatResult: function(item){ - var css_class = "fa-circle" + (item.im_status === 'online' ? "" : "-o"); + formatResult: function(item) { + var css_class = (item.im_status === 'away' ? "fa-clock-o" : "fa-circle" + (item.im_status === 'online' ? "" : "-o")); return $('').addClass(css_class).text(item.text); }, query: function (query) { @@ -76,7 +76,7 @@ var PartnerInviteDialog = Dialog.extend({ var ChannelModel = new Model('mail.channel'); return ChannelModel.call('channel_invite', [], {ids : [this.channel_id], partner_ids: _.pluck(data, 'id')}) .then(function(){ - var names = _.pluck(data, 'text').join(', '); + var names = _.escape(_.pluck(data, 'text').join(', ')); var notification = _.str.sprintf(_t('You added %s to the conversation.'), names); self.do_notify(_t('New people'), notification); }); @@ -120,7 +120,9 @@ var ChatAction = Widget.extend(ControlPanelMixin, { }, on_attach_callback: function () { - this.thread.scroll_to({offset: this.channels_scrolltop[this.channel.id]}); + if (this.channel) { + this.thread.scroll_to({offset: this.channels_scrolltop[this.channel.id]}); + } }, on_detach_callback: function () { this.channels_scrolltop[this.channel.id] = this.thread.get_scrolltop(); @@ -133,6 +135,7 @@ var ChatAction = Widget.extend(ControlPanelMixin, { this.action = action; this.options = options || {}; this.channels_scrolltop = {}; + this.throttled_render_sidebar = _.throttle(this.render_sidebar.bind(this), 100, { leading: false }); }, willStart: function () { @@ -162,7 +165,8 @@ var ChatAction = Widget.extend(ControlPanelMixin, { this.composer = new ChatComposer(this); this.thread = new ChatThread(this, { - display_help: true + display_help: true, + shorten_messages: false, }); this.$buttons = $(QWeb.render("mail.chat.ControlButtons", {})); @@ -210,9 +214,10 @@ var ChatAction = Widget.extend(ControlPanelMixin, { chat_manager.bus.on('anyone_listening', self, function (channel, query) { query.is_displayed = query.is_displayed || channel.id === self.channel.id; }); - chat_manager.bus.on('update_needaction', self, self.render_sidebar); chat_manager.bus.on('unsubscribe_from_channel', self, self.render_sidebar); - chat_manager.bus.on('update_channel_unread_counter', self, self.render_sidebar); + chat_manager.bus.on('update_needaction', self, self.throttled_render_sidebar); + chat_manager.bus.on('update_channel_unread_counter', self, self.throttled_render_sidebar); + chat_manager.bus.on('update_dm_presence', self, self.throttled_render_sidebar); }); }, @@ -291,9 +296,10 @@ var ChatAction = Widget.extend(ControlPanelMixin, { return Channel.call('channel_search_to_join', [search_val]).then(function(result){ var values = []; _.each(result, function(channel){ + var escaped_name = _.escape(channel.name); values.push(_.extend(channel, { - 'value': channel.name, - 'label': channel.name, + 'value': escaped_name, + 'label': escaped_name, })); }); return values; @@ -305,9 +311,10 @@ var ChatAction = Widget.extend(ControlPanelMixin, { return Partner.call('im_search', [search_val, 20]).then(function(result){ var values = []; _.each(result, function(user){ + var escaped_name = _.escape(user.name); values.push(_.extend(user, { - 'value': user.name, - 'label': user.name, + 'value': escaped_name, + 'label': escaped_name, })); }); return values; @@ -370,7 +377,15 @@ var ChatAction = Widget.extend(ControlPanelMixin, { .removeClass('o_unread_message') .addClass('o_active'); - self.thread.scroll_to({offset: new_channel_scrolltop}); + var $new_messages_separator = self.$('.o_thread_new_messages_separator'); + if ($new_messages_separator.length) { + self.thread.$el.scrollTo($new_messages_separator); + } else { + self.thread.scroll_to({offset: new_channel_scrolltop}); + } + + // Update control panel before focusing the composer, otherwise focus is on the searchview + self.update_cp(); if (!config.device.touch) { self.composer.focus(); } @@ -378,7 +393,6 @@ var ChatAction = Widget.extend(ControlPanelMixin, { self.$('.o_mail_chat_sidebar').hide(); } - self.update_cp(); self.action_manager.do_push_state({ action: self.action.id, active_id: self.channel.id, diff --git a/addons/mail/static/src/js/composer.js b/addons/mail/static/src/js/composer.js index 971c2e99c69..2965ccf9298 100644 --- a/addons/mail/static/src/js/composer.js +++ b/addons/mail/static/src/js/composer.js @@ -330,6 +330,7 @@ var Composer = Widget.extend({ input_max_height: 150, input_min_height: 28, mention_fetch_limit: 8, + send_text: _('Send'), }); this.context = this.options.context; @@ -397,7 +398,7 @@ var Composer = Widget.extend({ preprocess_message: function () { // Return a deferred as this function is extended with asynchronous // behavior for the chatter composer - var value = this.$input.val().replace(/\n|\r/g, '
'); + var value = _.escape(this.$input.val()).replace(/\n|\r/g, '
'); return $.when({ content: this.mention_manager.generate_links(value), attachment_ids: _.pluck(this.get('attachment_ids'), 'id'), diff --git a/addons/mail/static/src/js/systray.js b/addons/mail/static/src/js/systray.js index c5d34f179bc..19e225c364f 100644 --- a/addons/mail/static/src/js/systray.js +++ b/addons/mail/static/src/js/systray.js @@ -29,11 +29,14 @@ var NotificationTopButton = Widget.extend({ }, on_click: function (event) { event.preventDefault(); + this.discuss_redirect(); + }, + discuss_redirect: _.debounce(function () { var discuss_ids = chat_manager.get_discuss_ids(); this.do_action(discuss_ids.action_id, {clear_breadcrumbs: true}).then(function () { core.bus.trigger('change_menu_section', discuss_ids.menu_id); }); - }, + }, 1000, true), }); SystrayMenu.Items.push(NotificationTopButton); diff --git a/addons/mail/static/src/js/thread.js b/addons/mail/static/src/js/thread.js index 86b34255cf7..99b4d6ba1c2 100644 --- a/addons/mail/static/src/js/thread.js +++ b/addons/mail/static/src/js/thread.js @@ -16,8 +16,9 @@ var Thread = Widget.extend({ className: 'o_mail_thread', events: { - "click .o_mail_redirect": "on_click_redirect", - "click .o_channel_redirect": "on_channel_redirect", + "click a": "on_click_redirect", + "click img": "on_click_redirect", + "click strong": "on_click_redirect", "click .o_thread_show_more": "on_click_show_more", "click .o_thread_message_needaction": function (event) { event.stopPropagation(); @@ -51,6 +52,7 @@ var Thread = Widget.extend({ display_stars: true, display_document_link: true, display_avatar: true, + shorten_messages: true, squash_close_messages: true, }); }, @@ -84,16 +86,13 @@ var Thread = Widget.extend({ }, on_click_redirect: function (event) { - event.preventDefault(); - var res_id = $(event.target).data('oe-id'); - var res_model = $(event.target).data('oe-model'); - this._redirect({model:res_model, id: res_id}); - }, - - on_channel_redirect: function (event) { - event.preventDefault(); - var channel_id = $(event.target).data('oe-id'); - this._redirect({channel_id: channel_id}); + var id = $(event.target).data('oe-id'); + if (id) { + event.preventDefault(); + var model = $(event.target).data('oe-model'); + var options = model && (model !== 'mail.channel') ? {model: model, id: id} : {channel_id: id}; + this._redirect(options); + } }, _redirect: _.debounce(function (options) { diff --git a/addons/mail/static/src/js/window_manager.js b/addons/mail/static/src/js/window_manager.js index 5a62c15ed8b..f217d929c20 100644 --- a/addons/mail/static/src/js/window_manager.js +++ b/addons/mail/static/src/js/window_manager.js @@ -11,7 +11,7 @@ var web_client = require('web.web_client'); // chat window management //---------------------------------------------------------------- var chat_sessions = []; -var CHAT_WINDOW_WIDTH = 260; +var CHAT_WINDOW_WIDTH = 300; function open_chat (session) { if (!_.findWhere(chat_sessions, {id: session.id})) { @@ -38,6 +38,7 @@ function open_chat (session) { }); chat_session.window.on("post_message", null, function (message, channel_id) { + message.content = _.escape(message.content); chat_manager.post_message(message, {channel_id: channel_id}); }); chat_session.window.on("messages_read", null, function () { diff --git a/addons/mail/static/src/less/chat_window.less b/addons/mail/static/src/less/chat_window.less index b911ef467ed..ca2e8ca74f1 100644 --- a/addons/mail/static/src/less/chat_window.less +++ b/addons/mail/static/src/less/chat_window.less @@ -1,14 +1,22 @@ -@o-chat-window-bg: lighten(lightgray, 13%); +@o-chat-window-bg: white; .o_chat_window { .o-flex-display(); .o-flex-flow(column, nowrap); position: fixed; - width: 260px; - height: 333px; + width: 300px; + max-width: 100%; + height: 400px; + max-height: 100%; + font-size: 12px; background-color: @o-chat-window-bg; border: 1px solid gray; border-radius: 3px; + z-index: 2; + + @media (max-width: @screen-xs-max) { + display:none; + } .o_chat_header { .o-flex-display(); @@ -44,10 +52,18 @@ background-color: @o-chat-window-bg; } } + .o_thread_message { + .o_thread_message_sidebar { + margin-right: 5px; + } + } } - .o_chat_input > input { - padding: 5px; - width: 100%; + .o_chat_input { + .o-flex(0, 0, auto); + > input { + padding: 5px; + width: 100%; + } } } diff --git a/addons/mail/static/src/less/client_action.less b/addons/mail/static/src/less/client_action.less index f6479b9a418..408f3074311 100644 --- a/addons/mail/static/src/less/client_action.less +++ b/addons/mail/static/src/less/client_action.less @@ -1,27 +1,26 @@ // ------------------------------------------------------------------ // Layout // ------------------------------------------------------------------ +@mail-chat-sidebar-width: 250px; .o_mail_chat { .o-position-absolute(0, 0, 0, 0); height: 100%; @media (max-width: @screen-xs-max) { height: auto; - flex-direction: column; - } - .o-flex-display(); - .o-flex-flow(row, nowrap); - .o_mail_chat_sidebar { - .o-flex(0, 0, 220px); + width: @mail-chat-sidebar-width; + height: 100%; + float: left; overflow: auto; padding: 8px 0; font-weight: 300; @media (max-width: @screen-xs-max) { - flex: none; + width: 100%; + float: none; display: none; } @@ -70,12 +69,16 @@ } .o_mail_chat_content { - .o-flex(1, 1, 100%); .o-flex-display(); .o-flex-flow(column, nowrap); height: 100%; + margin-left: @mail-chat-sidebar-width; position: relative; + @media (max-width: @screen-xs-max) { + margin-left: 0; + } + .o_mail_thread { .o-flex(1, 0, 0); overflow: auto; @@ -103,6 +106,9 @@ .o_composer_buttons { .o-flex(0, 0, auto); + .o_composer_button_send { + float: right; + } } } } diff --git a/addons/mail/static/src/less/thread.less b/addons/mail/static/src/less/thread.less index e28b949bd5d..f2971dcf17e 100644 --- a/addons/mail/static/src/less/thread.less +++ b/addons/mail/static/src/less/thread.less @@ -1,6 +1,7 @@ @mail-thread-avatar-size: 36px; @mail-thread-icon-opacity: 0.6; @mail-thread-side-date-opacity: 0.6; +@mail-thread-note: @gray-lighter; .o_mail_thread { .o_thread_show_more { @@ -97,6 +98,10 @@ .o_thread_message_core { .o-flex(1, 1, auto); + &.o_mail_note { + background-color: @gray-lighter; + } + .o_mail_subject { font-style: italic; } diff --git a/addons/mail/static/src/xml/client_action.xml b/addons/mail/static/src/xml/client_action.xml index 11b32ee0e8d..bb29d8cca27 100644 --- a/addons/mail/static/src/xml/client_action.xml +++ b/addons/mail/static/src/xml/client_action.xml @@ -77,7 +77,7 @@

- + # diff --git a/addons/mail/static/src/xml/composer.xml b/addons/mail/static/src/xml/composer.xml index d199c0d5fdf..71afe4d1695 100644 --- a/addons/mail/static/src/xml/composer.xml +++ b/addons/mail/static/src/xml/composer.xml @@ -6,9 +6,9 @@