Skip to content

Commit 1f17b99

Browse files
committed
Merge remote-tracking branch 'odoo/9.0' into 9.0
Conflicts: addons/hr/hr.py
2 parents a07fa7a + 6a6827e commit 1f17b99

File tree

312 files changed

+6894
-3547
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

312 files changed

+6894
-3547
lines changed

addons/account/i18n/de.po

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ msgstr ""
3232
"Project-Id-Version: Odoo 9.0\n"
3333
"Report-Msgid-Bugs-To: \n"
3434
"POT-Creation-Date: 2015-12-17 14:09+0000\n"
35-
"PO-Revision-Date: 2016-01-20 13:20+0000\n"
35+
"PO-Revision-Date: 2016-01-23 19:33+0000\n"
3636
"Last-Translator: Wolfgang Taferner\n"
3737
"Language-Team: German (http://www.transifex.com/odoo/odoo-9/language/de/)\n"
3838
"MIME-Version: 1.0\n"
@@ -2375,7 +2375,7 @@ msgstr "Klicken Sie, um ein neues Konto hinzuzufügen."
23752375
#. module: account
23762376
#: model:ir.ui.view,arch_db:account.account_journal_dashboard_kanban_view
23772377
msgid "Click to add/remove from favorite"
2378-
msgstr "Klicken Sie hier zum hinzufügen/entfernen vom Favoriten"
2378+
msgstr "Anklicken um Favoriten hinzuzufügen oder zu entfernen"
23792379

23802380
#. module: account
23812381
#: model:ir.actions.act_window,help:account.action_invoice_tree1
@@ -2385,7 +2385,7 @@ msgstr "Klicken Sie, um eine Kundenrechnung zu erstellen."
23852385
#. module: account
23862386
#: model:ir.actions.act_window,help:account.action_move_journal_line
23872387
msgid "Click to create a journal entry."
2388-
msgstr "Klicken Sie um einen Buchungssatz zu erstellen."
2388+
msgstr "Klicken Sie, um zu buchen"
23892389

23902390
#. module: account
23912391
#: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
@@ -2452,7 +2452,7 @@ msgstr "Code"
24522452
#. module: account
24532453
#: model:ir.model.fields,field_description:account.field_account_cashbox_line_coin_value
24542454
msgid "Coin/Bill Value"
2455-
msgstr ""
2455+
msgstr "Wert der Münze/Geldscheins"
24562456

24572457
#. module: account
24582458
#: model:ir.model.fields,field_description:account.field_account_account_tag_color
@@ -3218,7 +3218,7 @@ msgstr "Definition"
32183218
#. module: account
32193219
#: model:ir.model.fields,field_description:account.field_account_account_deprecated
32203220
msgid "Deprecated"
3221-
msgstr "Inaktiv"
3221+
msgstr "Veraltet"
32223222

32233223
#. module: account
32243224
#: model:account.account.type,name:account.data_account_type_depreciation
@@ -3430,7 +3430,7 @@ msgstr "Erledigt"
34303430
#. module: account
34313431
#: model:ir.ui.view,arch_db:account.account_planner
34323432
msgid "Download the"
3433-
msgstr "Downloade"
3433+
msgstr "Download von "
34343434

34353435
#. module: account
34363436
#: selection:account.invoice,state:0 selection:account.invoice.report,state:0
@@ -4235,13 +4235,13 @@ msgstr "Wenn ein\"Betrag in Fremdwährung\" erfasst wird, ist auch ein \"Betrag\
42354235
#: model:ir.model.fields,help:account.field_account_bank_statement_message_unread
42364236
#: model:ir.model.fields,help:account.field_account_invoice_message_unread
42374237
msgid "If checked new messages require your attention."
4238-
msgstr "Als zu erledigen markieren"
4238+
msgstr "Falls markiert, benötigen neue Nachrichten Ihre Kenntnisnahme."
42394239

42404240
#. module: account
42414241
#: model:ir.model.fields,help:account.field_account_bank_statement_message_needaction
42424242
#: model:ir.model.fields,help:account.field_account_invoice_message_needaction
42434243
msgid "If checked, new messages require your attention."
4244-
msgstr "Falls markiert, brauchen neue Nachrichten Ihre Kenntnisnahme."
4244+
msgstr "Falls markiert, benötigen neue Nachrichten Ihre Kenntnisnahme."
42454245

42464246
#. module: account
42474247
#: model:ir.model.fields,help:account.field_account_account_template_nocreate
@@ -4504,7 +4504,7 @@ msgstr "Erlöskonto für Produktvorlage"
45044504
#: code:addons/account/static/src/js/account_reconciliation_widgets.js:1787
45054505
#, python-format
45064506
msgid "Incorrect Operation"
4507-
msgstr "fehlerhafte Funktion"
4507+
msgstr "Fehlerhafte Funktion"
45084508

45094509
#. module: account
45104510
#: model:ir.ui.view,arch_db:account.view_move_line_form
@@ -5013,7 +5013,7 @@ msgstr "Etikett"
50135013
#. module: account
50145014
#: model:ir.model.fields,field_description:account.field_account_tax_description
50155015
msgid "Label on Invoices"
5016-
msgstr ""
5016+
msgstr "Bezeichnung auf Rechnungen"
50175017

50185018
#. module: account
50195019
#: model:ir.model.fields,field_description:account.field_account_bank_statement_message_last_post
@@ -5551,12 +5551,12 @@ msgstr "Buchungs-Bezeichnung (id): %s (%s)"
55515551
#. module: account
55525552
#: model:ir.ui.view,arch_db:account.account_planner
55535553
msgid "Multi Currency"
5554-
msgstr "Multi-Währung"
5554+
msgstr "Mehrere Währungen"
55555555

55565556
#. module: account
55575557
#: model:ir.ui.menu,name:account.menu_config_multi_currency
55585558
msgid "Multi-Currencies"
5559-
msgstr "Multi-Währung"
5559+
msgstr "Mehrere Währungen"
55605560

55615561
#. module: account
55625562
#: model:ir.ui.view,arch_db:account.view_account_invoice_filter
@@ -5758,12 +5758,12 @@ msgstr "Nummer (Buchung)"
57585758
#: model:ir.model.fields,field_description:account.field_account_bank_statement_message_needaction_counter
57595759
#: model:ir.model.fields,field_description:account.field_account_invoice_message_needaction_counter
57605760
msgid "Number of Actions"
5761-
msgstr "Anzahl Aktionen"
5761+
msgstr "Anzahl der Aktionen"
57625762

57635763
#. module: account
57645764
#: model:ir.model.fields,field_description:account.field_account_cashbox_line_number
57655765
msgid "Number of Coins/Bills"
5766-
msgstr ""
5766+
msgstr "Anzahl der Münzen/Geldscheine"
57675767

57685768
#. module: account
57695769
#: model:ir.model.fields,field_description:account.field_account_payment_term_line_days
@@ -5779,7 +5779,7 @@ msgstr "Stellenzahl für die Kontonummer"
57795779
#: model:ir.model.fields,help:account.field_account_bank_statement_message_needaction_counter
57805780
#: model:ir.model.fields,help:account.field_account_invoice_message_needaction_counter
57815781
msgid "Number of messages which requires an action"
5782-
msgstr "Anzahl Nachrichten, die eine Aktion erfordern"
5782+
msgstr "Anzahl der Nachrichten, die eine Aktion erfordern"
57835783

57845784
#. module: account
57855785
#: model:ir.model.fields,help:account.field_account_bank_statement_message_unread_counter
@@ -6034,7 +6034,7 @@ msgstr ""
60346034
#: code:addons/account/models/account_invoice.py:108
60356035
#, python-format
60366036
msgid "Outstanding credits"
6037-
msgstr "Ausstehende Kredite"
6037+
msgstr "Nicht ausgeglichene Zahlungen"
60386038

60396039
#. module: account
60406040
#: model:ir.model.fields,field_description:account.field_account_invoice_outstanding_credits_debits_widget
@@ -6045,7 +6045,7 @@ msgstr ""
60456045
#: code:addons/account/models/account_invoice.py:111
60466046
#, python-format
60476047
msgid "Outstanding debits"
6048-
msgstr "Ausstehende Lastschriften"
6048+
msgstr "Noch nicht ausgeglichene Zahlungen"
60496049

60506050
#. module: account
60516051
#: model:ir.ui.view,arch_db:account.view_account_invoice_filter
@@ -6071,7 +6071,7 @@ msgstr ""
60716071
#. module: account
60726072
#: model:ir.ui.menu,name:account.menu_finance_legal_statement
60736073
msgid "PDF Reports"
6074-
msgstr ""
6074+
msgstr "PDF Berichte"
60756075

60766076
#. module: account
60776077
#: model:ir.ui.view,arch_db:account.invoice_form
@@ -6424,23 +6424,23 @@ msgstr ""
64246424
#: selection:account.tax,amount_type:0
64256425
#: selection:account.tax.template,amount_type:0
64266426
msgid "Percentage of Price"
6427-
msgstr ""
6427+
msgstr "Prozentsatz des Preis"
64286428

64296429
#. module: account
64306430
#: selection:account.tax,amount_type:0
64316431
#: selection:account.tax.template,amount_type:0
64326432
msgid "Percentage of Price Tax Included"
6433-
msgstr ""
6433+
msgstr "Prozentsatz des Preis inklusive Steuern"
64346434

64356435
#. module: account
64366436
#: selection:account.operation.template,second_amount_type:0
64376437
msgid "Percentage of amount"
6438-
msgstr ""
6438+
msgstr "Prozentsatz des Betrags"
64396439

64406440
#. module: account
64416441
#: selection:account.operation.template,amount_type:0
64426442
msgid "Percentage of balance"
6443-
msgstr ""
6443+
msgstr "Prozentsatz des Saldos"
64446444

64456445
#. module: account
64466446
#: code:addons/account/models/account_invoice.py:1273
@@ -6898,7 +6898,7 @@ msgstr ""
68986898
#. module: account
68996899
#: selection:account.journal,bank_statements_source:0
69006900
msgid "Record Manually"
6901-
msgstr "manuell Aufzeichnen"
6901+
msgstr "Manuell aufzeichnen"
69026902

69036903
#. module: account
69046904
#: model:ir.ui.view,arch_db:account.account_planner
@@ -6931,7 +6931,7 @@ msgstr "Referenz Mengeneinheit"
69316931
#. module: account
69326932
#: model:ir.ui.view,arch_db:account.report_overdue_document
69336933
msgid "Reference number"
6934-
msgstr "Referenz Nummer"
6934+
msgstr "Referenznummer"
69356935

69366936
#. module: account
69376937
#: model:ir.model.fields,help:account.field_account_invoice_line_origin
@@ -7335,7 +7335,7 @@ msgstr "Geld schicken"
73357335
#. module: account
73367336
#: model:ir.ui.view,arch_db:account.invoice_form
73377337
msgid "Send by Email"
7338-
msgstr "Sende mit Email"
7338+
msgstr "Per E-Mail versenden"
73397339

73407340
#. module: account
73417341
#: model:ir.ui.view,arch_db:account.account_planner
@@ -7422,7 +7422,7 @@ msgstr "Anzeigen"
74227422
#. module: account
74237423
#: model:ir.model.fields,field_description:account.field_account_journal_display_on_footer
74247424
msgid "Show in Invoices Footer"
7425-
msgstr "Zeige Rechnungsfusszeilen"
7425+
msgstr "Fußzeilen in Rechnung anzeigen"
74267426

74277427
#. module: account
74287428
#: model:ir.model.fields,field_description:account.field_account_journal_show_on_dashboard
@@ -9542,7 +9542,7 @@ msgstr ""
95429542
#. module: account
95439543
#: model:ir.ui.view,arch_db:account.invoice_supplier_form
95449544
msgid "for this supplier. You can allocate them to mark this bill as paid."
9545-
msgstr ""
9545+
msgstr "für diesen Lieferanten. Sie können diese zuweisen, um die Rechnung als bezahlt zu markieren."
95469546

95479547
#. module: account
95489548
#: model:ir.ui.view,arch_db:account.account_aged_balance_view
@@ -9560,7 +9560,7 @@ msgstr "andere"
95609560
#. module: account
95619561
#: model:ir.ui.view,arch_db:account.invoice_supplier_form
95629562
msgid "outstanding debits"
9563-
msgstr "Ausstehende Lastschriften"
9563+
msgstr "noch nicht ausgeglichene Zahlungen"
95649564

95659565
#. module: account
95669566
#: model:ir.ui.view,arch_db:account.invoice_form

addons/account/i18n/es.po

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
# Daniel Santibáñez Polanco <[email protected]>, 2016
1313
# Denis Ledoux <[email protected]>, 2016
1414
# Eneldo Serrata <[email protected]>, 2016
15+
# Glen Sojo <[email protected]>, 2016
1516
# Javier Ramirez <[email protected]>, 2015
1617
# Jesus Alan Ramos Rodriguez <[email protected]>, 2015
1718
# José Vicente <[email protected]>, 2015
@@ -27,8 +28,8 @@ msgstr ""
2728
"Project-Id-Version: Odoo 9.0\n"
2829
"Report-Msgid-Bugs-To: \n"
2930
"POT-Creation-Date: 2015-12-17 14:09+0000\n"
30-
"PO-Revision-Date: 2016-01-14 14:36+0000\n"
31-
"Last-Translator: Denis Ledoux <[email protected]>\n"
31+
"PO-Revision-Date: 2016-01-21 21:56+0000\n"
32+
"Last-Translator: Glen Sojo <[email protected]>\n"
3233
"Language-Team: Spanish (http://www.transifex.com/odoo/odoo-9/language/es/)\n"
3334
"MIME-Version: 1.0\n"
3435
"Content-Type: text/plain; charset=UTF-8\n"
@@ -2214,7 +2215,7 @@ msgstr "Líneas de caja"
22142215
#. module: account
22152216
#: model:ir.model.fields,field_description:account.field_account_cashbox_line_cashbox_id
22162217
msgid "Cashbox"
2217-
msgstr ""
2218+
msgstr "Caja"
22182219

22192220
#. module: account
22202221
#: model:ir.model.fields,field_description:account.field_account_chart_template_property_account_expense_categ_id
@@ -3588,7 +3589,7 @@ msgstr "Saldo final"
35883589
#. module: account
35893590
#: model:ir.model.fields,field_description:account.field_account_bank_statement_cashbox_end_id
35903591
msgid "Ending Cashbox"
3591-
msgstr ""
3592+
msgstr "Caja final"
35923593

35933594
#. module: account
35943595
#: model:ir.ui.view,arch_db:account.account_planner
@@ -7479,7 +7480,7 @@ msgstr "Saldo inicial"
74797480
#. module: account
74807481
#: model:ir.model.fields,field_description:account.field_account_bank_statement_cashbox_start_id
74817482
msgid "Starting Cashbox"
7482-
msgstr ""
7483+
msgstr "Caja inicial"
74837484

74847485
#. module: account
74857486
#: model:ir.ui.view,arch_db:account.view_account_payment_search
@@ -9649,7 +9650,7 @@ msgstr "la compañia matriz"
96499650
#. module: account
96509651
#: model:ir.ui.view,arch_db:account.account_planner
96519652
msgid "the product list"
9652-
msgstr ""
9653+
msgstr "la lista de productos"
96539654

96549655
#. module: account
96559656
#: model:ir.ui.view,arch_db:account.account_planner

addons/account/i18n/es_CL.po

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33
# * account
44
#
55
# Translators:
6+
# Daniel Santibáñez Polanco <[email protected]>, 2016
67
# Tomas Diaz L. <[email protected]>, 2015
78
msgid ""
89
msgstr ""
910
"Project-Id-Version: Odoo 9.0\n"
1011
"Report-Msgid-Bugs-To: \n"
1112
"POT-Creation-Date: 2015-12-17 14:09+0000\n"
12-
"PO-Revision-Date: 2016-01-11 21:14+0000\n"
13+
"PO-Revision-Date: 2016-01-22 14:02+0000\n"
1314
"Last-Translator: Daniel Santibáñez Polanco <[email protected]>\n"
1415
"Language-Team: Spanish (Chile) (http://www.transifex.com/odoo/odoo-9/language/es_CL/)\n"
1516
"MIME-Version: 1.0\n"
@@ -465,7 +466,7 @@ msgstr "<strong>Crear un resguardo de dep&#243;sito</strong><br/>\nLe permite an
465466
msgid ""
466467
"<strong>Create the bill in Odoo</strong><br/> with a proper due date, and "
467468
"create the vendor if it doesnt' exist yet."
468-
msgstr "<strong>Crear la factura en Odoo</strong><br/> con la fecha de vencimiento adecuada y crear el vendedor si todav&#237;a no existe."
469+
msgstr "<strong>Crear la factura en Odoo</strong><br/> con la fecha de vencimiento adecuada y crear el proveedor si todav&#237;a no existe."
469470

470471
#. module: account
471472
#: model:ir.ui.view,arch_db:account.report_invoice_document
@@ -2719,7 +2720,7 @@ msgstr "Crear factura rectificativa"
27192720
#. module: account
27202721
#: model:ir.ui.view,arch_db:account.account_planner
27212722
msgid "Create Vendors"
2722-
msgstr "Cree vendedores"
2723+
msgstr "Cree Proveedores"
27232724

27242725
#. module: account
27252726
#. openerp-web
@@ -8898,7 +8899,7 @@ msgstr ""
88988899
#: model:ir.ui.view,arch_db:account.view_account_invoice_report_search
88998900
#: model:ir.ui.view,arch_db:account.view_account_supplier_payment_tree
89008901
msgid "Vendor"
8901-
msgstr "Vendedor"
8902+
msgstr "Proveedor"
89028903

89038904
#. module: account
89048905
#: selection:account.invoice,type:0 selection:account.invoice.report,type:0
@@ -8907,7 +8908,7 @@ msgstr "Vendedor"
89078908
#: model:ir.ui.view,arch_db:account.report_invoice_document
89088909
#, python-format
89098910
msgid "Vendor Bill"
8910-
msgstr ""
8911+
msgstr "Factura del Proveedor"
89118912

89128913
#. module: account
89138914
#: code:addons/account/models/chart_template.py:156
@@ -8916,23 +8917,23 @@ msgstr ""
89168917
#: model:ir.ui.view,arch_db:account.account_planner
89178918
#, python-format
89188919
msgid "Vendor Bills"
8919-
msgstr ""
8920+
msgstr "Facturas del Proveedor"
89208921

89218922
#. module: account
89228923
#: model:ir.ui.view,arch_db:account.account_planner
89238924
msgid "Vendor Flow"
8924-
msgstr ""
8925+
msgstr "Flujo del Proveedor"
89258926

89268927
#. module: account
89278928
#: code:addons/account/models/account_payment.py:450
89288929
#, python-format
89298930
msgid "Vendor Payment"
8930-
msgstr ""
8931+
msgstr "Pago del Proveedor"
89318932

89328933
#. module: account
89338934
#: model:ir.model.fields,field_description:account.field_res_partner_property_supplier_payment_term_id
89348935
msgid "Vendor Payment Term"
8935-
msgstr ""
8936+
msgstr "Condiciones de Pago del Proveedor"
89368937

89378938
#. module: account
89388939
#: model:ir.model.fields,field_description:account.field_account_invoice_reference
@@ -8960,7 +8961,7 @@ msgstr ""
89608961
#: model:ir.ui.menu,name:account.menu_account_supplier
89618962
#, python-format
89628963
msgid "Vendors"
8963-
msgstr ""
8964+
msgstr "Proveedores"
89648965

89658966
#. module: account
89668967
#: selection:account.financial.report,type:0

0 commit comments

Comments
 (0)