From 1a9297aaed79ed0e267bf119ae352220cf711bf1 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Fri, 18 Oct 2013 16:04:24 +0200 Subject: [PATCH 1/4] [FIX] account: correct test on closing fiscal year to fail with error message and set the test to the previous year instead of next year (makes more sense) bzr revid: mat@openerp.com-20131018140424-yyfc561nisym2gem --- .../account/test/account_fiscalyear_close.yml | 38 +++++++++---------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/addons/account/test/account_fiscalyear_close.yml b/addons/account/test/account_fiscalyear_close.yml index 40d1b1a6a7b..73e34f2cca8 100644 --- a/addons/account/test/account_fiscalyear_close.yml +++ b/addons/account/test/account_fiscalyear_close.yml @@ -4,31 +4,27 @@ !record {model: account.fiscalyear, id: account_fiscalyear_fiscalyear0}: code: !eval "'FY%s'% (datetime.now().year+1)" company_id: base.main_company - date_start: !eval "'%s-01-01' %(datetime.now().year+1)" - date_stop: !eval "'%s-12-31' %(datetime.now().year+1)" - name: !eval "'Fiscal Year %s' %(datetime.now().year+1)" + date_start: !eval "'%s-01-01' %(datetime.now().year-1)" + date_stop: !eval "'%s-12-31' %(datetime.now().year-1)" + name: !eval "'Fiscal Year %s' %(datetime.now().year-1)" - - I create a period for the opening entries for the new fiscalyear + I generate periods for the new fiscalyear - - !record {model: account.period, id: account_period_jan11}: - company_id: base.main_company - date_start: !eval "'%s-01-01'% (datetime.now().year+1)" - date_stop: !eval "'%s-01-01'% (datetime.now().year+1)" - fiscalyear_id: account_fiscalyear_fiscalyear0 - name: !eval "'OP %s' %(datetime.now().year+1)" - special: 1 + !python {model: account.fiscalyear}: | + self.create_period(cr, uid, [ref("account_fiscalyear_fiscalyear0")]) - - I create a new account invoice a the partner in current fiscalyear + I create a new account invoice in the created fiscalyear - !record {model: account.invoice, id: account_invoice_current1}: partner_id: base.res_partner_2 + date_invoice: !eval "'%s-01-02' %(datetime.now().year-1)" invoice_line: - partner_id: base.res_partner_2 quantity: 1.0 price_unit: 15.00 name: Bying stuff - - I validate it the invoice + I validate the invoice - !python {model: account.invoice}: | import netsvc @@ -47,13 +43,13 @@ company_id: base.main_company centralisation: 1 - - I called the Generate Fiscalyear Opening Entries wizard + I call the Generate Fiscalyear Opening Entries wizard - !record {model: account.fiscalyear.close, id: account_fiscalyear_close_0}: - fy2_id: account_fiscalyear_fiscalyear0 - fy_id: account.data_fiscalyear + fy2_id: account.data_fiscalyear + fy_id: account_fiscalyear_fiscalyear0 journal_id: account.close_journal - period_id: account_period_jan11 + period_id: account.period_1 report_name: End of Fiscal Year Entry - I clicked on create Button @@ -66,7 +62,7 @@ I close the previous fiscalyear - !record {model: account.fiscalyear.close.state, id: account_fiscalyear_close_state_0}: - fy_id: data_fiscalyear + fy_id: account_fiscalyear_fiscalyear0 - I clicked on Close States Button to close fiscalyear - @@ -77,10 +73,10 @@ - I check that the fiscalyear state is now "Done" - - !assert {model: account.fiscalyear, id: data_fiscalyear, string: Fiscal Year is in Done state}: + !assert {model: account.fiscalyear, id: account_fiscalyear_fiscalyear0, string: Fiscal Year is in Done state}: - state == 'done' - I check that the past accounts are taken into account in partner credit - - !assert {model: res.partner, id: base.res_partner_2}: - - credit == 15.0, "Total Receivable does not takes unreconciled previous moves" + !assert {model: res.partner, id: base.res_partner_2, string: Total Receivable does not takes unreconciled moves of previous years}: + - credit == 15.0 From 16fd47c3e11d15d0d5ae8b2b5cf2251dc1dae1d8 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Mon, 21 Oct 2013 04:57:23 +0000 Subject: [PATCH 2/4] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20131019052801-ouw53m70o0eabxnv bzr revid: launchpad_translations_on_behalf_of_openerp-20131020050509-ar8koyz20p82rdjq bzr revid: launchpad_translations_on_behalf_of_openerp-20131021045723-bkmqoimoalwb3lzq --- addons/account/i18n/hr.po | 8 +- addons/account/i18n/ja.po | 16 ++-- addons/account_voucher/i18n/hr.po | 30 ++++--- addons/analytic/i18n/hr.po | 80 +++++++++--------- addons/crm/i18n/hr.po | 49 +++++++++-- addons/crm/i18n/nl.po | 10 +-- addons/event/i18n/nl.po | 28 +++++-- addons/mail/i18n/hr.po | 10 ++- addons/mail/i18n/ja.po | 10 +-- addons/mrp/i18n/zh_CN.po | 12 +-- addons/mrp_operations/i18n/zh_CN.po | 12 +-- addons/mrp_repair/i18n/zh_CN.po | 36 +++++---- addons/portal_crm/i18n/nl.po | 10 +-- addons/procurement/i18n/zh_CN.po | 20 +++-- addons/project_issue_sheet/i18n/sl.po | 72 +++++++++++++++++ addons/sale/i18n/ja.po | 112 +++++++++++++------------- addons/sale/i18n/nl.po | 14 ++-- addons/sale_stock/i18n/ja.po | 58 ++++++------- addons/warning/i18n/hr.po | 10 +-- 19 files changed, 373 insertions(+), 224 deletions(-) create mode 100644 addons/project_issue_sheet/i18n/sl.po diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po index 352f8a8b197..7a25397cf63 100644 --- a/addons/account/i18n/hr.po +++ b/addons/account/i18n/hr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-14 22:29+0000\n" -"PO-Revision-Date: 2013-10-16 11:57+0000\n" +"PO-Revision-Date: 2013-10-18 14:36+0000\n" "Last-Translator: Marko Carevic \n" "Language-Team: Croatian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-10-17 05:59+0000\n" -"X-Generator: Launchpad (build 16799)\n" +"X-Launchpad-Export-Date: 2013-10-19 05:27+0000\n" +"X-Generator: Launchpad (build 16807)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -4377,7 +4377,7 @@ msgstr "Datum" #. module: account #: view:account.move:0 msgid "Post" -msgstr "Objava" +msgstr "Knjiženje" #. module: account #: view:account.unreconcile:0 diff --git a/addons/account/i18n/ja.po b/addons/account/i18n/ja.po index 7d30c2b0b29..336395964a0 100644 --- a/addons/account/i18n/ja.po +++ b/addons/account/i18n/ja.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-14 22:29+0000\n" -"PO-Revision-Date: 2013-10-15 07:56+0000\n" +"PO-Revision-Date: 2013-10-21 04:18+0000\n" "Last-Translator: Yoshi Tashiro \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-10-16 05:13+0000\n" -"X-Generator: Launchpad (build 16799)\n" +"X-Launchpad-Export-Date: 2013-10-21 04:57+0000\n" +"X-Generator: Launchpad (build 16807)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -421,7 +421,7 @@ msgstr "明細入力に使用される通貨" #. module: account #: field:account.journal,default_debit_account_id:0 msgid "Default Debit Account" -msgstr "デフォルト借方アカウント" +msgstr "デフォルト借方勘定" #. module: account #: view:account.move:0 @@ -1629,7 +1629,7 @@ msgstr "桁数" #. module: account #: field:account.journal,entry_posted:0 msgid "Skip 'Draft' State for Manual Entries" -msgstr "手動入力のため、ドラフト状態をスキップします。" +msgstr "マニュアル入力につき「ドラフト」状態をスキップ" #. module: account #: code:addons/account/report/common_report_header.py:92 @@ -1739,7 +1739,7 @@ msgstr "非課税" #. module: account #: view:account.journal:0 msgid "Advanced Settings" -msgstr "" +msgstr "詳細設定" #. module: account #: view:account.bank.statement:0 @@ -8618,7 +8618,7 @@ msgstr "期末残高" #. module: account #: field:account.journal,centralisation:0 msgid "Centralized Counterpart" -msgstr "" +msgstr "相手勘定を集約" #. module: account #: help:account.move.line,blocked:0 @@ -8927,7 +8927,7 @@ msgstr "許可アカウント（制御なしは空）" #. module: account #: field:account.config.settings,sale_tax_rate:0 msgid "Sales tax (%)" -msgstr "" +msgstr "売上税 (%)" #. module: account #: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2 diff --git a/addons/account_voucher/i18n/hr.po b/addons/account_voucher/i18n/hr.po index d68411955db..93f35161e45 100644 --- a/addons/account_voucher/i18n/hr.po +++ b/addons/account_voucher/i18n/hr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-10-16 13:13+0000\n" +"PO-Revision-Date: 2013-10-18 15:15+0000\n" "Last-Translator: Marko Carevic \n" "Language-Team: Croatian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-10-17 05:59+0000\n" -"X-Generator: Launchpad (build 16799)\n" +"X-Launchpad-Export-Date: 2013-10-19 05:27+0000\n" +"X-Generator: Launchpad (build 16807)\n" #. module: account_voucher #: field:account.bank.statement.line,voucher_id:0 @@ -124,6 +124,8 @@ msgid "" "This sentence helps you to know how to specify the payment rate by giving " "you the direct effect it has" msgstr "" +"Ovo vam pomaže da znate kako specificirati termin plaćanja tako što vam daje " +"opis učinka" #. module: account_voucher #: view:sale.receipt.report:0 @@ -260,7 +262,7 @@ msgstr "Opcije plaćanja" #. module: account_voucher #: view:account.voucher:0 msgid "e.g. 003/10" -msgstr "" +msgstr "npr. 003/10" #. module: account_voucher #: view:account.voucher:0 @@ -278,7 +280,7 @@ msgstr "Otkazani" #, python-format msgid "" "You have to configure account base code and account tax code on the '%s' tax!" -msgstr "" +msgstr "Morate podesiti konto osnovice i poreza na '%s' porezu!" #. module: account_voucher #: model:ir.actions.act_window,help:account_voucher.action_sale_receipt @@ -408,6 +410,8 @@ msgid "" "settings, to manage automatically the booking of accounting entries related " "to differences between exchange rates." msgstr "" +"Trebali bi podesiti 'Konto pozitivne tečajne razlike' u postavkama " +"računovodstva, za automatsko knjiženje tečajnih razlika." #. module: account_voucher #: view:account.voucher:0 @@ -673,6 +677,8 @@ msgid "" "Fields with internal purpose only that depicts if the voucher is a multi " "currency one or not" msgstr "" +"Polja sa internom svrhom koja samo opisuje ako je vaučer u višestrukoj " +"valuti ili ne." #. module: account_voucher #: view:account.invoice:0 @@ -739,7 +745,7 @@ msgstr "Vaučer je plaćen u potpunosti" #. module: account_voucher #: selection:account.voucher,payment_option:0 msgid "Reconcile Payment Balance" -msgstr "" +msgstr "Zatvori saldo plaćanja" #. module: account_voucher #: view:account.voucher:0 @@ -825,7 +831,7 @@ msgstr "Lipanj" #. module: account_voucher #: field:account.voucher,payment_rate_currency_id:0 msgid "Payment Rate Currency" -msgstr "" +msgstr "Tečaj plaćanja" #. module: account_voucher #: field:account.voucher,paid:0 @@ -895,7 +901,7 @@ msgstr "Predhodna plaćanja ?" #: code:addons/account_voucher/account_voucher.py:1208 #, python-format msgid "The invoice you are willing to pay is not valid anymore." -msgstr "" +msgstr "Račun koji želite platiti nije više važeći." #. module: account_voucher #: selection:sale.receipt.report,month:0 @@ -941,7 +947,7 @@ msgstr "Plaćanja kupaca" #: model:ir.ui.menu,name:account_voucher.menu_action_sale_receipt_report_all #: view:sale.receipt.report:0 msgid "Sales Receipts Analysis" -msgstr "" +msgstr "Analiza potvrda" #. module: account_voucher #: view:sale.receipt.report:0 @@ -961,7 +967,7 @@ msgstr "Računi i otvorene stavke" #. module: account_voucher #: field:account.voucher,currency_help_label:0 msgid "Helping Sentence" -msgstr "" +msgstr "Pomoć" #. module: account_voucher #: view:sale.receipt.report:0 @@ -1003,7 +1009,7 @@ msgstr "Izvod banke" #. module: account_voucher #: view:account.bank.statement:0 msgid "onchange_amount(amount)" -msgstr "" +msgstr "onchange_amount(amount)" #. module: account_voucher #: selection:sale.receipt.report,month:0 @@ -1216,7 +1222,7 @@ msgstr "Godina" #: field:account.config.settings,income_currency_exchange_account_id:0 #: field:res.company,income_currency_exchange_account_id:0 msgid "Gain Exchange Rate Account" -msgstr "" +msgstr "Konto pozitivne tečajne razlike" #. module: account_voucher #: selection:account.voucher,type:0 diff --git a/addons/analytic/i18n/hr.po b/addons/analytic/i18n/hr.po index d9c677860b4..acf6195e3db 100644 --- a/addons/analytic/i18n/hr.po +++ b/addons/analytic/i18n/hr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2013-10-18 14:57+0000\n" +"Last-Translator: Krešimir Jeđud \n" "Language-Team: Croatian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-07-11 05:50+0000\n" -"X-Generator: Launchpad (build 16696)\n" +"X-Launchpad-Export-Date: 2013-10-19 05:27+0000\n" +"X-Generator: Launchpad (build 16807)\n" #. module: analytic #: field:account.analytic.account,child_ids:0 @@ -25,18 +25,18 @@ msgstr "Podređena konta" #. module: analytic #: selection:account.analytic.account,state:0 msgid "In Progress" -msgstr "" +msgstr "U tijeku" #. module: analytic #: code:addons/analytic/analytic.py:229 #, python-format msgid "Contract: " -msgstr "" +msgstr "Ugovor: " #. module: analytic #: model:mail.message.subtype,description:analytic.mt_account_pending msgid "Contract pending" -msgstr "" +msgstr "Ugovor u tijeku" #. module: analytic #: selection:account.analytic.account,state:0 @@ -47,7 +47,7 @@ msgstr "Predložak" #: view:account.analytic.account:0 #: field:account.analytic.account,date:0 msgid "End Date" -msgstr "" +msgstr "Datum završetka" #. module: analytic #: help:account.analytic.line,unit_amount:0 @@ -76,12 +76,12 @@ msgstr "" #. module: analytic #: selection:account.analytic.account,type:0 msgid "Contract or Project" -msgstr "" +msgstr "Ugovor ili projekt" #. module: analytic #: field:account.analytic.account,name:0 msgid "Account/Contract Name" -msgstr "" +msgstr "Naziv ugovora" #. module: analytic #: field:account.analytic.account,manager_id:0 @@ -91,7 +91,7 @@ msgstr "Voditelj računovodstva" #. module: analytic #: field:account.analytic.account,message_follower_ids:0 msgid "Followers" -msgstr "" +msgstr "Pratitelji" #. module: analytic #: selection:account.analytic.account,state:0 @@ -101,7 +101,7 @@ msgstr "Zatvoren" #. module: analytic #: model:mail.message.subtype,name:analytic.mt_account_pending msgid "Contract to Renew" -msgstr "" +msgstr "Ugovor za obnovu" #. module: analytic #: selection:account.analytic.account,state:0 @@ -111,18 +111,18 @@ msgstr "Novi" #. module: analytic #: field:account.analytic.account,user_id:0 msgid "Project Manager" -msgstr "" +msgstr "Voditelj projekta" #. module: analytic #: field:account.analytic.account,state:0 msgid "Status" -msgstr "" +msgstr "Status" #. module: analytic #: code:addons/analytic/analytic.py:271 #, python-format msgid "%s (copy)" -msgstr "" +msgstr "%s (kopija)" #. module: analytic #: model:ir.model,name:analytic.model_account_analytic_line @@ -144,12 +144,12 @@ msgstr "" #. module: analytic #: field:account.analytic.account,message_unread:0 msgid "Unread Messages" -msgstr "" +msgstr "Nepročitane poruke" #. module: analytic #: constraint:account.analytic.account:0 msgid "Error! You cannot create recursive analytic accounts." -msgstr "" +msgstr "Greška ! Ne možete kreirati rekurzivna analitička konta." #. module: analytic #: field:account.analytic.account,company_id:0 @@ -160,7 +160,7 @@ msgstr "Organizacija" #. module: analytic #: view:account.analytic.account:0 msgid "Renewal" -msgstr "" +msgstr "Obnova" #. module: analytic #: help:account.analytic.account,message_summary:0 @@ -168,11 +168,13 @@ msgid "" "Holds the Chatter summary (number of messages, ...). This summary is " "directly in html format in order to be inserted in kanban views." msgstr "" +"Sadrži sažetak konverzacije (broj poruka,..). Ovaj sažetak je u html formatu " +"da bi mogao biti ubačen u kanban pogled." #. module: analytic #: help:account.analytic.account,message_unread:0 msgid "If checked new messages require your attention." -msgstr "" +msgstr "Ako je odabrano, nove poruke zahtijevaju Vašu pažnju." #. module: analytic #: help:account.analytic.account,quantity_max:0 @@ -196,7 +198,7 @@ msgstr "" #. module: analytic #: field:account.analytic.account,message_is_follower:0 msgid "Is a Follower" -msgstr "" +msgstr "Je pratitelj" #. module: analytic #: field:account.analytic.line,user_id:0 @@ -216,12 +218,12 @@ msgstr "Datum" #. module: analytic #: model:mail.message.subtype,name:analytic.mt_account_closed msgid "Contract Finished" -msgstr "" +msgstr "Ugovor završen" #. module: analytic #: view:account.analytic.account:0 msgid "Terms and Conditions" -msgstr "" +msgstr "Opći uvjeti" #. module: analytic #: help:account.analytic.line,amount:0 @@ -235,7 +237,7 @@ msgstr "" #. module: analytic #: field:account.analytic.account,partner_id:0 msgid "Customer" -msgstr "" +msgstr "Partner" #. module: analytic #: field:account.analytic.account,child_complete_ids:0 @@ -245,12 +247,12 @@ msgstr "Hijerarhija konta" #. module: analytic #: field:account.analytic.account,message_ids:0 msgid "Messages" -msgstr "" +msgstr "Poruke" #. module: analytic #: help:account.analytic.account,message_ids:0 msgid "Messages and communication history" -msgstr "" +msgstr "Poruke i povijest komunikacije" #. module: analytic #: constraint:account.analytic.line:0 @@ -260,23 +262,23 @@ msgstr "" #. module: analytic #: view:account.analytic.account:0 msgid "Contract Information" -msgstr "" +msgstr "Informacije o ugovoru" #. module: analytic #: field:account.analytic.account,template_id:0 #: selection:account.analytic.account,type:0 msgid "Template of Contract" -msgstr "" +msgstr "Predložak ugovora" #. module: analytic #: field:account.analytic.account,message_summary:0 msgid "Summary" -msgstr "" +msgstr "Sažetak" #. module: analytic #: field:account.analytic.account,quantity_max:0 msgid "Prepaid Service Units" -msgstr "" +msgstr "Jedinica unaprijed plaćene usluge" #. module: analytic #: field:account.analytic.account,credit:0 @@ -286,7 +288,7 @@ msgstr "Potražuje" #. module: analytic #: model:mail.message.subtype,name:analytic.mt_account_opened msgid "Contract Opened" -msgstr "" +msgstr "Ugovor je otvoren" #. module: analytic #: help:account.analytic.account,type:0 @@ -309,7 +311,7 @@ msgstr "Otkazano" #. module: analytic #: selection:account.analytic.account,type:0 msgid "Analytic View" -msgstr "" +msgstr "Analitički pogled" #. module: analytic #: field:account.analytic.account,balance:0 @@ -319,12 +321,12 @@ msgstr "Saldo" #. module: analytic #: field:account.analytic.account,complete_name:0 msgid "Full Name" -msgstr "" +msgstr "Puno ime" #. module: analytic #: selection:account.analytic.account,state:0 msgid "To Renew" -msgstr "" +msgstr "Za obnovu" #. module: analytic #: field:account.analytic.account,quantity:0 @@ -335,18 +337,18 @@ msgstr "Količina" #. module: analytic #: field:account.analytic.account,code:0 msgid "Reference" -msgstr "" +msgstr "Veza" #. module: analytic #: code:addons/analytic/analytic.py:160 #, python-format msgid "Error!" -msgstr "" +msgstr "Greška!" #. module: analytic #: model:mail.message.subtype,description:analytic.mt_account_closed msgid "Contract closed" -msgstr "" +msgstr "Ugovor zatvoren" #. module: analytic #: model:res.groups,name:analytic.group_analytic_accounting @@ -374,13 +376,13 @@ msgstr "Valuta" #. module: analytic #: model:mail.message.subtype,description:analytic.mt_account_opened msgid "Contract opened" -msgstr "" +msgstr "Ugovor otvoren" #. module: analytic #: code:addons/analytic/analytic.py:262 #, python-format msgid "Warning" -msgstr "" +msgstr "Upozoranje" #. module: analytic #: field:account.analytic.account,type:0 @@ -390,7 +392,7 @@ msgstr "" #. module: analytic #: field:account.analytic.account,date_start:0 msgid "Start Date" -msgstr "" +msgstr "Datum početka" #. module: analytic #: field:account.analytic.account,line_ids:0 diff --git a/addons/crm/i18n/hr.po b/addons/crm/i18n/hr.po index 08c2e6b2622..a2d61018510 100644 --- a/addons/crm/i18n/hr.po +++ b/addons/crm/i18n/hr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-09-24 11:36+0000\n" -"Last-Translator: Krešimir Jeđud \n" +"PO-Revision-Date: 2013-10-18 14:26+0000\n" +"Last-Translator: Drazen Bosak \n" "Language-Team: Croatian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-09-25 05:48+0000\n" -"X-Generator: Launchpad (build 16771)\n" +"X-Launchpad-Export-Date: 2013-10-19 05:27+0000\n" +"X-Generator: Launchpad (build 16807)\n" #. module: crm #: view:crm.lead.report:0 @@ -283,7 +283,7 @@ msgstr "Kampanje" #: view:crm.lead:0 #: field:crm.lead,state_id:0 msgid "State" -msgstr "Stanje" +msgstr "Država" #. module: crm #: view:crm.lead:0 @@ -496,6 +496,15 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Pritisnite za kreiranje novog prodajnog tima.\n" +"

\n" +" Prodajne timove koristite za organizaciju različitih " +"referenata ili\n" +" odjela u zasebne timove. Svaki će tim raditi sa svojom\n" +" listom prilika.\n" +"

\n" +" " #. module: crm #: model:process.transition,note:crm.process_transition_opportunitymeeting0 @@ -668,6 +677,14 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Pritisnite za kreiranje nove kategorije.\n" +"

\n" +" Kreirajte specifične kategorije telefonskih poziva kako biste " +"kvalitetnije definirali vrstu\n" +" poziva koja se prati u sustavu.\n" +"

\n" +" " #. module: crm #: help:crm.case.section,reply_to:0 @@ -847,7 +864,7 @@ msgstr "ili" #: field:crm.lead.report,create_date:0 #: field:crm.phonecall.report,create_date:0 msgid "Create Date" -msgstr "Kreiraj datum" +msgstr "Datum kreiranja" #. module: crm #: field:crm.lead,ref2:0 @@ -2701,6 +2718,18 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Pritisnite za kreiranje nove oznake prodaje.\n" +"

\n" +" Kreirajte specifičnih oznaka (tag-ova) koje odgovaraju " +"aktivnostima vaše tvrtke\n" +" kako biste bolje klasificirali i analizirali svoje " +"potencijale i prilike.\n" +" Takve bi se kategorije, na primjer, mogle reflektirati na " +"strukturu vaših proizvoda\n" +" ili različitu strukturu vaše prodaje.\n" +"

\n" +" " #. module: crm #: selection:crm.lead.report,creation_month:0 @@ -3206,6 +3235,14 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Pritisnite za kreiranje nove faze za potencijale/prilike.\n" +"

\n" +" Faze omogućuju prodajnom osoblju lakše praćenje " +"pozicioniranja \n" +" određenih potencijala ili prilika unutar prodajnog ciklusa.\n" +"

\n" +" " #~ msgid "Send Mail" #~ msgstr "Pošalji mail" diff --git a/addons/crm/i18n/nl.po b/addons/crm/i18n/nl.po index 4abea0917d9..c6577109f8c 100644 --- a/addons/crm/i18n/nl.po +++ b/addons/crm/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-06-08 11:18+0000\n" -"Last-Translator: Erwin van der Ploeg (Endian Solutions) \n" +"PO-Revision-Date: 2013-10-18 13:15+0000\n" +"Last-Translator: Erwin van der Ploeg (BAS Solutions) \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-07-11 05:53+0000\n" -"X-Generator: Launchpad (build 16696)\n" +"X-Launchpad-Export-Date: 2013-10-19 05:27+0000\n" +"X-Generator: Launchpad (build 16807)\n" #. module: crm #: view:crm.lead.report:0 @@ -235,7 +235,7 @@ msgstr "Telefoongesprek" #. module: crm #: field:crm.lead,opt_out:0 msgid "Opt-Out" -msgstr "Uitschrijven" +msgstr "Opt-Out" #. module: crm #: view:crm.lead:0 diff --git a/addons/event/i18n/nl.po b/addons/event/i18n/nl.po index c1360fdfd91..ada67514d52 100644 --- a/addons/event/i18n/nl.po +++ b/addons/event/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-08-02 12:54+0000\n" -"Last-Translator: Erwin van der Ploeg (Endian Solutions) \n" +"PO-Revision-Date: 2013-10-18 12:28+0000\n" +"Last-Translator: Erwin van der Ploeg (BAS Solutions) \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-08-03 06:13+0000\n" -"X-Generator: Launchpad (build 16718)\n" +"X-Launchpad-Export-Date: 2013-10-19 05:27+0000\n" +"X-Generator: Launchpad (build 16807)\n" #. module: event #: view:event.event:0 @@ -530,7 +530,7 @@ msgstr "" #. module: event #: field:report.event.registration,draft_state:0 msgid " # No of Draft Registrations" -msgstr " # aantal voorlopige inschrijvingen" +msgstr " # Aantal voorlopige inschrijvingen" #. module: event #: field:event.event,email_registration_id:0 @@ -742,6 +742,10 @@ msgid "" "emails sent automatically at event or registrations confirmation. You can " "also put your email address of your mail gateway if you use one." msgstr "" +"Het e-mail adres van de organisator wat wordt ingesteld als 'antwoord aan' " +"van alle e-mails welke automatisch worden verstuurt bij een evenement en " +"registratie bevestiging. Het is ook mogelijk een e-mail adres van uw e-mail " +"gateway in te stellen, indien u deze gebruikt." #. module: event #: help:event.event,message_ids:0 @@ -847,6 +851,8 @@ msgid "" "You have already set a registration for this event as 'Attended'. Please " "reset it to draft if you want to cancel this event." msgstr "" +"U heeft de registratie van dit evenement al gezet op \"aanwezig\". Zet deze " +"status terug naar concept als u het evenement wilt annuleren." #. module: event #: view:res.partner:0 @@ -1148,6 +1154,14 @@ msgid "" "

Thank you for your participation!

\n" "

Best regards

" msgstr "" +"\n" +"

Hallo ${object.name},

\n" +"

Hierbij bevestigen wij uw registratie voor het evenement " +"${object.event_id.name}.\n" +" U ontvangt automatisch een e-mail met meer praktische informatie, " +"zoals agenda en tijden, zodra het evenement definitief is bevestigd.

\n" +"

Onze dank voor uw deelname!

\n" +"

Best regards

" #. module: event #: help:event.event,reply_to:0 @@ -1157,6 +1171,10 @@ msgid "" "registrations confirmation. You can also put the email address of your mail " "gateway if you use one." msgstr "" +"Het e-mail adres van de organisator wat wordt ingesteld als 'antwoord aan' " +"van alle e-mails welke automatisch worden verstuurt bij een evenement en " +"registratie bevestiging. Het is ook mogelijk een e-mail adres van uw e-mail " +"gateway in te stellen, indien u deze gebruikt." #. module: event #: view:event.event:0 diff --git a/addons/mail/i18n/hr.po b/addons/mail/i18n/hr.po index 69d31181214..07f9f82a0e0 100644 --- a/addons/mail/i18n/hr.po +++ b/addons/mail/i18n/hr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-10-04 10:42+0000\n" -"Last-Translator: Krešimir Jeđud \n" +"PO-Revision-Date: 2013-10-18 13:09+0000\n" +"Last-Translator: Marko Carevic \n" "Language-Team: Croatian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-10-05 06:16+0000\n" -"X-Generator: Launchpad (build 16791)\n" +"X-Launchpad-Export-Date: 2013-10-19 05:27+0000\n" +"X-Generator: Launchpad (build 16807)\n" #. module: mail #: view:mail.followers:0 @@ -195,6 +195,8 @@ msgid "" "Members of those groups will automatically added as followers. Note that " "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 diff --git a/addons/mail/i18n/ja.po b/addons/mail/i18n/ja.po index 60e06c2ffcc..e7af52d95cd 100644 --- a/addons/mail/i18n/ja.po +++ b/addons/mail/i18n/ja.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-10-17 09:12+0000\n" +"PO-Revision-Date: 2013-10-19 05:47+0000\n" "Last-Translator: Yoshi Tashiro \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-10-18 06:11+0000\n" -"X-Generator: Launchpad (build 16799)\n" +"X-Launchpad-Export-Date: 2013-10-20 05:04+0000\n" +"X-Generator: Launchpad (build 16807)\n" #. module: mail #: view:mail.followers:0 @@ -1168,7 +1168,7 @@ msgstr "" #. module: mail #: model:mail.group,name:mail.group_best_sales_practices msgid "Best Sales Practices" -msgstr "" +msgstr "最適な販売プラクティス" #. module: mail #: selection:mail.group,public:0 @@ -1693,7 +1693,7 @@ msgstr "" #: model:ir.ui.menu,name:mail.mail_feeds #: model:ir.ui.menu,name:mail.mail_feeds_main msgid "Messaging" -msgstr "" +msgstr "メッセージング" #. module: mail #: view:mail.alias:0 diff --git a/addons/mrp/i18n/zh_CN.po b/addons/mrp/i18n/zh_CN.po index 7e71020da03..14bef1a5d23 100644 --- a/addons/mrp/i18n/zh_CN.po +++ b/addons/mrp/i18n/zh_CN.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-08-04 07:37+0000\n" -"Last-Translator: Joshua Jan(SHINEIT) \n" +"PO-Revision-Date: 2013-10-19 00:42+0000\n" +"Last-Translator: 盈通 ccdos \n" "Language-Team: Chinese (Simplified) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-08-05 06:30+0000\n" -"X-Generator: Launchpad (build 16718)\n" +"X-Launchpad-Export-Date: 2013-10-20 05:05+0000\n" +"X-Generator: Launchpad (build 16807)\n" #. module: mrp #: help:mrp.config.settings,module_mrp_repair:0 @@ -81,7 +81,7 @@ msgstr "小时成本" #. module: mrp #: view:mrp.production:0 msgid "Scrap Products" -msgstr "报废原料" +msgstr "损耗产品" #. module: mrp #: view:mrp.workcenter:0 @@ -2218,7 +2218,7 @@ msgstr "产品类型是可库存或消耗品" #. module: mrp #: selection:mrp.production,state:0 msgid "Production Started" -msgstr "生产开始了" +msgstr "已开始生产" #. module: mrp #: model:process.node,name:mrp.process_node_procureproducts0 diff --git a/addons/mrp_operations/i18n/zh_CN.po b/addons/mrp_operations/i18n/zh_CN.po index 2e5703ecf18..1978c98a82f 100644 --- a/addons/mrp_operations/i18n/zh_CN.po +++ b/addons/mrp_operations/i18n/zh_CN.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2013-10-19 00:09+0000\n" +"Last-Translator: openerp-china.black-jack \n" "Language-Team: Chinese (Simplified) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-07-11 06:11+0000\n" -"X-Generator: Launchpad (build 16696)\n" +"X-Launchpad-Export-Date: 2013-10-20 05:05+0000\n" +"X-Generator: Launchpad (build 16807)\n" #. module: mrp_operations #: model:ir.actions.act_window,name:mrp_operations.mrp_production_wc_action_form @@ -77,7 +77,7 @@ msgstr "重新开始" #. module: mrp_operations #: view:mrp.production.workcenter.line:0 msgid "Product to Produce" -msgstr "产品到产品" +msgstr "待生产的产品" #. module: mrp_operations #: view:mrp_operations.operation:0 @@ -489,7 +489,7 @@ msgstr "总加工次数" #. module: mrp_operations #: selection:mrp.production.workcenter.line,production_state:0 msgid "Ready to Produce" -msgstr "生产准备就绪" +msgstr "准备生产" #. module: mrp_operations #: field:stock.move,move_dest_id_lines:0 diff --git a/addons/mrp_repair/i18n/zh_CN.po b/addons/mrp_repair/i18n/zh_CN.po index 93e9aed9f38..cfe10772932 100644 --- a/addons/mrp_repair/i18n/zh_CN.po +++ b/addons/mrp_repair/i18n/zh_CN.po @@ -8,19 +8,19 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2013-10-19 01:00+0000\n" +"Last-Translator: 盈通 ccdos \n" "Language-Team: Chinese (Simplified) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-07-11 06:11+0000\n" -"X-Generator: Launchpad (build 16696)\n" +"X-Launchpad-Export-Date: 2013-10-20 05:05+0000\n" +"X-Generator: Launchpad (build 16807)\n" #. module: mrp_repair #: field:mrp.repair.line,move_id:0 msgid "Inventory Move" -msgstr "库存调拨" +msgstr "存货调拨" #. module: mrp_repair #: view:mrp.repair:0 @@ -30,7 +30,7 @@ msgstr "分组..." #. module: mrp_repair #: view:mrp.repair:0 msgid "Recreate Invoice" -msgstr "再创建发票" +msgstr "重新生成发票" #. module: mrp_repair #: code:addons/mrp_repair/mrp_repair.py:371 @@ -48,12 +48,12 @@ msgstr "作废维修单" #: field:mrp.repair.fee,to_invoice:0 #: field:mrp.repair.line,to_invoice:0 msgid "To Invoice" -msgstr "开票" +msgstr "开发票" #. module: mrp_repair #: view:mrp.repair:0 msgid "Unit of Measure" -msgstr "" +msgstr "计量单位" #. module: mrp_repair #: report:repair.order:0 @@ -68,7 +68,7 @@ msgstr "业务伙伴发票地址组" #. module: mrp_repair #: field:mrp.repair,message_unread:0 msgid "Unread Messages" -msgstr "" +msgstr "未读消息" #. module: mrp_repair #: code:addons/mrp_repair/mrp_repair.py:435 @@ -95,7 +95,7 @@ msgstr "发票异常" #. module: mrp_repair #: view:mrp.repair:0 msgid "Serial Number" -msgstr "" +msgstr "序列号：" #. module: mrp_repair #: field:mrp.repair,address_id:0 @@ -121,7 +121,7 @@ msgstr "发票地址:" #. module: mrp_repair #: help:mrp.repair,partner_id:0 msgid "Choose partner for whom the order will be invoiced and delivered." -msgstr "" +msgstr "为将要开票或者发运的订单选择业务伙伴" #. module: mrp_repair #: view:mrp.repair:0 @@ -136,7 +136,7 @@ msgstr "备注" #. module: mrp_repair #: field:mrp.repair,message_ids:0 msgid "Messages" -msgstr "" +msgstr "信息" #. module: mrp_repair #: field:mrp.repair,amount_tax:0 @@ -151,7 +151,7 @@ msgstr "税" #: code:addons/mrp_repair/mrp_repair.py:442 #, python-format msgid "Error!" -msgstr "" +msgstr "错误！" #. module: mrp_repair #: report:repair.order:0 @@ -162,12 +162,12 @@ msgstr "净合计:" #: selection:mrp.repair,state:0 #: selection:mrp.repair.line,state:0 msgid "Cancelled" -msgstr "" +msgstr "取消" #. module: mrp_repair #: help:mrp.repair,message_unread:0 msgid "If checked new messages require your attention." -msgstr "" +msgstr "如果要求你关注新消息，勾选此项" #. module: mrp_repair #: view:mrp.repair:0 @@ -194,6 +194,12 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" 创建维修单 \n" +"

\n" +" 在维修单中,你能详细描述零部件的移除, 替换并且记录在不同操作上面花费的时间。\n" +"

\n" +" " #. module: mrp_repair #: help:mrp.repair.line,state:0 diff --git a/addons/portal_crm/i18n/nl.po b/addons/portal_crm/i18n/nl.po index 54cfed25d8d..b62ac0e13b1 100644 --- a/addons/portal_crm/i18n/nl.po +++ b/addons/portal_crm/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-06-08 12:19+0000\n" -"Last-Translator: Erwin van der Ploeg (Endian Solutions) \n" +"PO-Revision-Date: 2013-10-18 13:16+0000\n" +"Last-Translator: Erwin van der Ploeg (BAS Solutions) \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-07-11 06:14+0000\n" -"X-Generator: Launchpad (build 16696)\n" +"X-Launchpad-Export-Date: 2013-10-19 05:27+0000\n" +"X-Generator: Launchpad (build 16807)\n" #. module: portal_crm #: selection:portal_crm.crm_contact_us,type:0 @@ -161,7 +161,7 @@ msgstr "Onderwerp" #. module: portal_crm #: field:portal_crm.crm_contact_us,opt_out:0 msgid "Opt-Out" -msgstr "Uitschrijven" +msgstr "Opt-Out" #. module: portal_crm #: field:portal_crm.crm_contact_us,priority:0 diff --git a/addons/procurement/i18n/zh_CN.po b/addons/procurement/i18n/zh_CN.po index 8c9da383f4a..c9ed51a3df7 100644 --- a/addons/procurement/i18n/zh_CN.po +++ b/addons/procurement/i18n/zh_CN.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-06-10 18:22+0000\n" -"Last-Translator: Olivier Dony (OpenERP) \n" +"PO-Revision-Date: 2013-10-19 01:05+0000\n" +"Last-Translator: 盈通 ccdos \n" "Language-Team: Chinese (Simplified) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-07-11 06:15+0000\n" -"X-Generator: Launchpad (build 16696)\n" +"X-Launchpad-Export-Date: 2013-10-20 05:05+0000\n" +"X-Generator: Launchpad (build 16807)\n" #. module: procurement #: model:ir.ui.menu,name:procurement.menu_stock_sched @@ -118,7 +118,7 @@ msgstr "销售单位数量" #. module: procurement #: view:procurement.order:0 msgid "Reason" -msgstr "理由" +msgstr "原因" #. module: procurement #: model:ir.actions.act_window,help:procurement.action_orderpoint_form @@ -133,6 +133,12 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" 你能定义最小库存规则，这样Openerp 将能自动根据最小库存规则创建生产单或者采购报价单\n" +" 一旦产品的虚拟库存(= 在手库存 ,所有已经确定的订单和预定)小于最小数量, OpenERP 将产生补货请求, " +"增加库存到最大数量。\n" +"

\n" +" " #. module: procurement #: view:procurement.order.compute:0 @@ -187,7 +193,7 @@ msgstr "永久性生产需求异常" #. module: procurement #: help:procurement.order,message_unread:0 msgid "If checked new messages require your attention." -msgstr "如果要求你关注新消息，勾选此项" +msgstr "如果勾选此项，有新消息会提醒你" #. module: procurement #: view:procurement.order.compute.all:0 @@ -202,7 +208,7 @@ msgstr "库存调拨" #. module: procurement #: view:product.product:0 msgid "Stockable products" -msgstr "可库存的产品" +msgstr "可储存的产品" #. module: procurement #: code:addons/procurement/procurement.py:138 diff --git a/addons/project_issue_sheet/i18n/sl.po b/addons/project_issue_sheet/i18n/sl.po new file mode 100644 index 00000000000..610a32ddcdf --- /dev/null +++ b/addons/project_issue_sheet/i18n/sl.po @@ -0,0 +1,72 @@ +# Slovenian translation for openobject-addons +# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2013-06-07 19:37+0000\n" +"PO-Revision-Date: 2013-10-20 08:52+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Slovenian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2013-10-21 04:57+0000\n" +"X-Generator: Launchpad (build 16807)\n" + +#. module: project_issue_sheet +#: code:addons/project_issue_sheet/project_issue_sheet.py:57 +#, python-format +msgid "The Analytic Account is pending !" +msgstr "" + +#. module: project_issue_sheet +#: model:ir.model,name:project_issue_sheet.model_account_analytic_line +msgid "Analytic Line" +msgstr "" + +#. module: project_issue_sheet +#: model:ir.model,name:project_issue_sheet.model_project_issue +msgid "Project Issue" +msgstr "" + +#. module: project_issue_sheet +#: model:ir.model,name:project_issue_sheet.model_hr_analytic_timesheet +msgid "Timesheet Line" +msgstr "" + +#. module: project_issue_sheet +#: view:project.issue:0 +msgid "on_change_project(project_id)" +msgstr "" + +#. module: project_issue_sheet +#: code:addons/project_issue_sheet/project_issue_sheet.py:57 +#: field:project.issue,analytic_account_id:0 +#, python-format +msgid "Analytic Account" +msgstr "" + +#. module: project_issue_sheet +#: view:project.issue:0 +msgid "Worklogs" +msgstr "" + +#. module: project_issue_sheet +#: field:account.analytic.line,create_date:0 +msgid "Create Date" +msgstr "" + +#. module: project_issue_sheet +#: view:project.issue:0 +#: field:project.issue,timesheet_ids:0 +msgid "Timesheets" +msgstr "" + +#. module: project_issue_sheet +#: field:hr.analytic.timesheet,issue_id:0 +msgid "Issue" +msgstr "" diff --git a/addons/sale/i18n/ja.po b/addons/sale/i18n/ja.po index 2e09f12dade..daa8195504d 100644 --- a/addons/sale/i18n/ja.po +++ b/addons/sale/i18n/ja.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-08-30 04:29+0000\n" +"PO-Revision-Date: 2013-10-19 05:51+0000\n" "Last-Translator: Yoshi Tashiro \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-08-31 05:28+0000\n" -"X-Generator: Launchpad (build 16750)\n" +"X-Launchpad-Export-Date: 2013-10-20 05:05+0000\n" +"X-Generator: Launchpad (build 16807)\n" #. module: sale #: model:ir.model,name:sale.model_account_config_settings @@ -41,7 +41,7 @@ msgstr "営業担当者" #. module: sale #: help:sale.order,pricelist_id:0 msgid "Pricelist for current sales order." -msgstr "現在の受注オーダーのための価格リスト" +msgstr "現在の受注の価格リスト" #. module: sale #: view:sale.report:0 @@ -141,7 +141,7 @@ msgstr "" #. module: sale #: selection:sale.advance.payment.inv,advance_payment_method:0 msgid "Invoice the whole sales order" -msgstr "販売オーダ全体を請求" +msgstr "受注全体を請求" #. module: sale #: field:sale.shop,payment_default_id:0 @@ -178,7 +178,7 @@ msgstr "合計価格" #. module: sale #: field:sale.config.settings,group_invoice_so_lines:0 msgid "Generate invoices based on the sales order lines" -msgstr "販売オーダ明細に基づき顧客請求書を生成" +msgstr "受注明細に基づき顧客請求書を生成" #. module: sale #: help:sale.make.invoice,grouped:0 @@ -227,7 +227,7 @@ msgstr "" #. module: sale #: view:sale.order:0 msgid "Sales Order done" -msgstr "販売オーダ完了" +msgstr "受注完了" #. module: sale #: model:ir.actions.act_window,name:sale.act_res_partner_2_sale_order @@ -282,7 +282,7 @@ msgstr "店名" #: code:addons/sale/sale.py:598 #, python-format msgid "You cannot confirm a sales order which has no line." -msgstr "明細のない販売オーダは確定できません。" +msgstr "明細のない受注は確定できません。" #. module: sale #: model:ir.actions.act_window,help:sale.action_order_line_tree2 @@ -337,17 +337,17 @@ msgstr "8月" #. module: sale #: field:sale.config.settings,module_sale_stock:0 msgid "Trigger delivery orders automatically from sales orders" -msgstr "販売オーダより自動で出荷オーダを生成" +msgstr "受注より自動で出荷を生成" #. module: sale #: model:ir.model,name:sale.model_sale_report msgid "Sales Orders Statistics" -msgstr "販売オーダ統計" +msgstr "受注統計" #. module: sale #: help:sale.order,project_id:0 msgid "The analytic account related to a sales order." -msgstr "販売オーダに紐づく分析アカウント" +msgstr "受注に紐づく分析アカウント" #. module: sale #: selection:sale.report,month:0 @@ -413,7 +413,7 @@ msgstr "数量" #. module: sale #: help:sale.order,partner_shipping_id:0 msgid "Delivery address for current sales order." -msgstr "" +msgstr "現在の受注の出荷先" #. module: sale #: report:sale.order:0 @@ -423,7 +423,7 @@ msgstr "" #. module: sale #: model:res.groups,name:sale.group_invoice_so_lines msgid "Enable Invoicing Sales order lines" -msgstr "" +msgstr "受注明細単位の請求を有効化" #. module: sale #: selection:sale.report,month:0 @@ -460,7 +460,7 @@ msgstr "販売員は見積を確認します。受注オーダーの状態は進 #. module: sale #: view:sale.order.line:0 msgid "Sales Order Lines ready to be invoiced" -msgstr "" +msgstr "請求可能な受注明細" #. module: sale #: code:addons/sale/sale.py:308 @@ -478,7 +478,7 @@ msgstr "TEL：" #. module: sale #: help:sale.order,partner_invoice_id:0 msgid "Invoice address for current sales order." -msgstr "現在の受注オーダーのための請求書住所" +msgstr "現在の受注の請求先アドレス" #. module: sale #: model:ir.model,name:sale.model_sale_config_settings @@ -506,7 +506,7 @@ msgstr "" #. module: sale #: view:sale.report:0 msgid "Ordered month of the sales order" -msgstr "受注オーダーのオーダー月" +msgstr "受注月" #. module: sale #: code:addons/sale/sale.py:505 @@ -619,7 +619,7 @@ msgstr "" #. module: sale #: model:ir.model,name:sale.model_sale_order_line msgid "Sales Order Line" -msgstr "販売オーダ明細" +msgstr "受注明細" #. module: sale #: field:sale.config.settings,module_analytic_user_function:0 @@ -640,7 +640,7 @@ msgstr "オーダー番号" #: view:sale.order:0 #: field:sale.order,order_line:0 msgid "Order Lines" -msgstr "オーダー行" +msgstr "受注明細" #. module: sale #: field:account.config.settings,module_sale_analytic_plans:0 @@ -664,7 +664,7 @@ msgstr "作成日" #. module: sale #: model:res.groups,name:sale.group_delivery_invoice_address msgid "Addresses in Sales Orders" -msgstr "販売オーダ内のアドレス" +msgstr "受注内のアドレス" #. module: sale #: model:ir.actions.act_window,name:sale.action_order_line_tree3 @@ -719,7 +719,7 @@ msgstr "" #. module: sale #: help:sale.order,invoice_exists:0 msgid "It indicates that sales order has at least one invoice." -msgstr "" +msgstr "受注に紐づく請求が少なくとも1件存在することを示します。" #. module: sale #: view:sale.order:0 @@ -777,7 +777,7 @@ msgstr "製品分類" #: code:addons/sale/sale.py:564 #, python-format msgid "Cannot cancel this sales order!" -msgstr "" +msgstr "この受注は取消できません。" #. module: sale #: view:sale.order:0 @@ -815,7 +815,7 @@ msgstr "" #: model:ir.ui.menu,name:sale.menu_sale_order #: view:sale.order:0 msgid "Sales Orders" -msgstr "販売オーダ" +msgstr "受注" #. module: sale #: selection:sale.order,order_policy:0 @@ -888,7 +888,7 @@ msgstr "適切な価格リスト行が見つかりません：" #. module: sale #: field:sale.config.settings,module_sale_margin:0 msgid "Display margins on sales orders" -msgstr "販売オーダにマージンを表示" +msgstr "受注にマージンを表示" #. module: sale #: help:sale.order,invoice_ids:0 @@ -911,7 +911,7 @@ msgstr "数量" #. module: sale #: view:sale.order.line:0 msgid "My Sales Order Lines" -msgstr "私の受注オーダー行" +msgstr "自分の受注明細" #. module: sale #: model:process.transition.action,name:sale.process_transition_action_cancel0 @@ -1007,7 +1007,7 @@ msgstr "送付先住所：" #. module: sale #: model:process.node,note:sale.process_node_quotation0 msgid "Draft state of sales order" -msgstr "受注オーダーのドラフト状態" +msgstr "受注のドラフト状態" #. module: sale #: help:sale.order,message_ids:0 @@ -1028,7 +1028,7 @@ msgstr "" #: code:addons/sale/sale.py:983 #, python-format msgid "Cannot delete a sales order line which is in state '%s'." -msgstr "" +msgstr "'%s'状態の受注明細は削除できません。" #. module: sale #: model:res.groups,name:sale.group_mrp_properties @@ -1041,7 +1041,7 @@ msgstr "" msgid "" "Before choosing a product,\n" " select a customer in the sales form." -msgstr "" +msgstr "品目を選択する前に受注フォームで顧客を選択してください。" #. module: sale #: view:sale.order:0 @@ -1057,7 +1057,7 @@ msgstr "" #. module: sale #: view:sale.report:0 msgid "Ordered date of the sales order" -msgstr "販売オーダの注文日" +msgstr "受注日" #. module: sale #: model:process.transition,name:sale.process_transition_confirmquotation0 @@ -1068,7 +1068,7 @@ msgstr "見積の確認" #: model:ir.actions.act_window,name:sale.action_order_line_tree2 #: model:ir.ui.menu,name:sale.menu_invoicing_sales_order_lines msgid "Order Lines to Invoice" -msgstr "" +msgstr "請求対象受注明細" #. module: sale #: view:sale.order:0 @@ -1124,7 +1124,7 @@ msgstr "税金" #. module: sale #: view:sale.order:0 msgid "Sales Order ready to be invoiced" -msgstr "請求可能な販売オーダ" +msgstr "請求可能な受注" #. module: sale #: help:sale.config.settings,module_analytic_user_function:0 @@ -1141,7 +1141,7 @@ msgstr "" #. module: sale #: help:sale.order,create_date:0 msgid "Date on which sales order is created." -msgstr "受注オーダーの作成日" +msgstr "受注作成日" #. module: sale #: view:sale.order:0 @@ -1180,7 +1180,7 @@ msgstr "出荷数量" #. module: sale #: view:sale.order:0 msgid "Sales Order that haven't yet been confirmed" -msgstr "未確認状態の受注オーダー" +msgstr "未確認状態の受注" #. module: sale #: help:sale.order,invoice_quantity:0 @@ -1199,7 +1199,7 @@ msgstr "請求書作成" #. module: sale #: help:account.config.settings,group_analytic_account_for_sales:0 msgid "Allows you to specify an analytic account on sales orders." -msgstr "" +msgstr "受注での分析勘定の選択を可能にします。" #. module: sale #: view:sale.order:0 @@ -1210,7 +1210,7 @@ msgstr "請求対象" #. module: sale #: view:sale.report:0 msgid "Ordered Year of the sales order" -msgstr "受注オーダーのオーダー年" +msgstr "受注年" #. module: sale #: selection:sale.report,month:0 @@ -1259,7 +1259,7 @@ msgstr "会計士によってレビューされます。" #. module: sale #: view:sale.order:0 msgid "My Sales Orders" -msgstr "マイ販売オーダ" +msgstr "自分の受注" #. module: sale #: view:sale.make.invoice:0 @@ -1308,7 +1308,7 @@ msgstr "" #. module: sale #: field:sale.config.settings,group_discount_per_so_line:0 msgid "Allow setting a discount on the sales order lines" -msgstr "販売オーダ行での値引入力を可能にする" +msgstr "受注明細での値引き入力を可能にする" #. module: sale #: field:sale.order,paypal_url:0 @@ -1331,7 +1331,7 @@ msgstr "" #, python-format msgid "" "In order to delete a confirmed sales order, you must cancel it before !" -msgstr "確定した販売オーダを削除するには、はじめに取り消してください。" +msgstr "確定済の受注を削除するには、始めに取消が必要です。" #. module: sale #: model:ir.actions.act_window,name:sale.open_board_sales @@ -1389,7 +1389,7 @@ msgstr "ToDo" #. module: sale #: view:sale.advance.payment.inv:0 msgid "Invoice Sales Order" -msgstr "販売オーダを請求登録" +msgstr "受注を請求登録" #. module: sale #: help:sale.order,amount_untaxed:0 @@ -1554,7 +1554,7 @@ msgstr "" #. module: sale #: model:process.transition,name:sale.process_transition_saleinvoice0 msgid "From a sales order" -msgstr "販売オーダより" +msgstr "受注より" #. module: sale #: view:sale.order:0 @@ -1614,7 +1614,7 @@ msgstr "販売ダッシュボード" #. module: sale #: view:sale.order.line:0 msgid "Sales Order Lines that are in 'done' state" -msgstr "" +msgstr "未完了受注明細" #. module: sale #: help:sale.config.settings,module_account_analytic_analysis:0 @@ -1639,13 +1639,13 @@ msgstr "" #. module: sale #: help:sale.order,date_confirm:0 msgid "Date on which sales order is confirmed." -msgstr "販売オーダ確定日" +msgstr "受注確定日" #. module: sale #: code:addons/sale/sale.py:565 #, python-format msgid "First cancel all invoices attached to this sales order." -msgstr "始めにこの販売オーダに紐づく全ての請求書を取り消してください。" +msgstr "始めにこの受注に紐づく全ての請求書を取り消してください。" #. module: sale #: field:sale.order,company_id:0 @@ -1790,7 +1790,7 @@ msgstr "" #: selection:sale.order,state:0 #, python-format msgid "Sales Order" -msgstr "販売オーダ" +msgstr "受注" #. module: sale #: field:sale.order.line,product_uos_qty:0 @@ -1816,7 +1816,7 @@ msgstr "確認" #: code:addons/sale/sale.py:820 #, python-format msgid "You cannot cancel a sales order line that has already been invoiced." -msgstr "" +msgstr "請求済の受注明細は取り消せません。" #. module: sale #: field:sale.order,message_follower_ids:0 @@ -1833,7 +1833,7 @@ msgstr "請求書行" #: view:sale.order:0 #: view:sale.order.line:0 msgid "Sales Order Lines" -msgstr "販売オーダ明細" +msgstr "受注明細" #. module: sale #: view:sale.config.settings:0 @@ -1869,7 +1869,7 @@ msgstr "" #. module: sale #: view:sale.order.line:0 msgid "Sales order lines done" -msgstr "" +msgstr "完了済受注明細" #. module: sale #: code:addons/sale/wizard/sale_line_invoice.py:107 @@ -1880,9 +1880,9 @@ msgid "" "1.The state of this sales order line is either \"draft\" or \"cancel\"!\n" "2.The Sales Order Line is Invoiced!" msgstr "" -"請求書は次の何れかの理由により、この販売オーダ行のために作成されません。\n" -"1. この販売オーダ明細の状態は「ドラフト」または「取消済」の何れかである。\n" -"2. 販売オーダ明細は請求されている。" +"請求書は次の何れかの理由により、この受注明細のために作成されません。\n" +"1. 受注明細の状態が「ドラフト」もしくは「取消済」である。\n" +"2. 受注明細は既に請求済み。" #. module: sale #: field:sale.order.line,th_weight:0 @@ -1993,7 +1993,7 @@ msgstr "1月" #. module: sale #: model:ir.actions.act_window,name:sale.action_orders_in_progress msgid "Sales Order in Progress" -msgstr "進行中の受注オーダー" +msgstr "進行中の受注" #. module: sale #: field:sale.config.settings,timesheet:0 @@ -2003,7 +2003,7 @@ msgstr "" #. module: sale #: help:sale.order,origin:0 msgid "Reference of the document that generated this sales order request." -msgstr "この受注オーダー要求を生成したドキュメントへの参照" +msgstr "この受注の生成の基となったドキュメント" #. module: sale #: view:sale.report:0 @@ -2029,12 +2029,12 @@ msgstr "日付順" #. module: sale #: model:process.node,note:sale.process_node_order0 msgid "Confirmed sales order to invoice." -msgstr "請求する確認済受注オーダー" +msgstr "請求対象の確定受注" #. module: sale #: model:mail.message.subtype,name:sale.mt_order_confirmed msgid "Sales Order Confirmed" -msgstr "" +msgstr "確定受注" #. module: sale #: selection:sale.order.line,type:0 @@ -2050,7 +2050,7 @@ msgstr "価格リストがありません： " #. module: sale #: view:sale.order:0 msgid "Sales Order " -msgstr "" +msgstr "受注 " #. module: sale #: field:sale.config.settings,module_account_analytic_analysis:0 @@ -2118,7 +2118,7 @@ msgstr "" #: view:sale.order:0 #: view:sale.order.line:0 msgid "Search Sales Order" -msgstr "受注オーダーの検索" +msgstr "受注検索" #. module: sale #: field:sale.advance.payment.inv,advance_payment_method:0 @@ -2128,7 +2128,7 @@ msgstr "" #. module: sale #: view:sale.order.line:0 msgid "Confirmed sales order lines, not yet delivered" -msgstr "" +msgstr "確定済・未出荷の受注明細" #. module: sale #: field:sale.order.line,sequence:0 diff --git a/addons/sale/i18n/nl.po b/addons/sale/i18n/nl.po index bae6c28c39d..42956e96e74 100644 --- a/addons/sale/i18n/nl.po +++ b/addons/sale/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-09-02 10:40+0000\n" -"Last-Translator: Erwin van der Ploeg (Endian Solutions) \n" +"PO-Revision-Date: 2013-10-20 07:02+0000\n" +"Last-Translator: Erwin van der Ploeg (BAS Solutions) \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-09-03 06:08+0000\n" -"X-Generator: Launchpad (build 16753)\n" +"X-Launchpad-Export-Date: 2013-10-21 04:57+0000\n" +"X-Generator: Launchpad (build 16807)\n" #. module: sale #: model:ir.model,name:sale.model_account_config_settings @@ -1863,9 +1863,9 @@ msgid "" " will create a draft invoice that can be modified\n" " before validation." msgstr "" -"Selecteer hoe u deze order wilt factureren. Hiermee\n" -" maakt u een concept factuur gemaakt, die\n" -" kan worden gewijzigd voor validatie." +"Selecteer hoe u deze order wilt factureren. Dit resulteert\n" +" in een concept factuur, die u voordat u deze\n" +" definitief bevestigd nog kunt wijzigen." #. module: sale #: view:board.board:0 diff --git a/addons/sale_stock/i18n/ja.po b/addons/sale_stock/i18n/ja.po index b4111c186da..3137b01cee9 100644 --- a/addons/sale_stock/i18n/ja.po +++ b/addons/sale_stock/i18n/ja.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2012-12-21 23:00+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2013-10-19 06:08+0000\n" +"Last-Translator: Yoshi Tashiro \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-07-11 06:22+0000\n" -"X-Generator: Launchpad (build 16696)\n" +"X-Launchpad-Export-Date: 2013-10-20 05:05+0000\n" +"X-Generator: Launchpad (build 16807)\n" #. module: sale_stock #: help:sale.config.settings,group_invoice_deli_orders:0 @@ -27,24 +27,24 @@ msgstr "" #. module: sale_stock #: model:process.node,name:sale_stock.process_node_deliveryorder0 msgid "Delivery Order" -msgstr "配達オーダー" +msgstr "出荷" #. module: sale_stock #: model:ir.actions.act_window,name:sale_stock.outgoing_picking_list_to_invoice #: model:ir.ui.menu,name:sale_stock.menu_action_picking_list_to_invoice msgid "Deliveries to Invoice" -msgstr "" +msgstr "請求対象出荷" #. module: sale_stock #: code:addons/sale_stock/sale_stock.py:570 #, python-format msgid "Picking Information ! : " -msgstr "集荷情報： " +msgstr "ピッキング情報： " #. module: sale_stock #: model:process.node,name:sale_stock.process_node_packinglist0 msgid "Pick List" -msgstr "集荷リスト" +msgstr "ピックリスト" #. module: sale_stock #: code:addons/sale_stock/sale_stock.py:565 @@ -68,24 +68,24 @@ msgstr "製造品へのあるいは顧客への移動のドキュメント" #. module: sale_stock #: field:sale.config.settings,group_multiple_shops:0 msgid "Manage multiple shops" -msgstr "" +msgstr "複数店舗を管理" #. module: sale_stock #: model:process.transition.action,name:sale_stock.process_transition_action_validate0 msgid "Validate" -msgstr "検証" +msgstr "確認" #. module: sale_stock #: view:sale.order:0 msgid "Cancel Order" -msgstr "" +msgstr "オーダ取消" #. module: sale_stock #: code:addons/sale_stock/sale_stock.py:209 #, python-format msgid "" "You must first cancel all delivery order(s) attached to this sales order." -msgstr "" +msgstr "始めにこの受注に紐づく出荷を取り消してください。" #. module: sale_stock #: model:process.transition,name:sale_stock.process_transition_saleprocurement0 @@ -95,7 +95,7 @@ msgstr "調達オーダーの作成" #. module: sale_stock #: field:stock.picking.out,sale_id:0 msgid "Sale Order" -msgstr "" +msgstr "受注" #. module: sale_stock #: model:process.transition,note:sale_stock.process_transition_saleorderprocurement0 @@ -107,12 +107,12 @@ msgstr "全ての受注オーダー行について、調達オーダーは販売 #. module: sale_stock #: field:sale.order,picking_policy:0 msgid "Shipping Policy" -msgstr "" +msgstr "出荷方針" #. module: sale_stock #: model:ir.ui.menu,name:sale_stock.menu_action_shop_form msgid "Shop" -msgstr "店" +msgstr "店舗" #. module: sale_stock #: model:process.node,note:sale_stock.process_node_saleorderprocurement0 @@ -128,12 +128,12 @@ msgstr "在庫移動" #: code:addons/sale_stock/sale_stock.py:163 #, python-format msgid "Invalid Action!" -msgstr "" +msgstr "操作は無効です。" #. module: sale_stock #: field:sale.config.settings,module_project_timesheet:0 msgid "Project Timesheet" -msgstr "" +msgstr "プロジェクトタイムシート" #. module: sale_stock #: field:sale.config.settings,group_sale_delivery_address:0 @@ -145,7 +145,7 @@ msgstr "" #: code:addons/sale_stock/sale_stock.py:623 #, python-format msgid "Configuration Error!" -msgstr "" +msgstr "設定エラー" #. module: sale_stock #: model:process.node,name:sale_stock.process_node_saleprocurement0 @@ -155,7 +155,7 @@ msgstr "調達オーダー" #. module: sale_stock #: model:ir.actions.act_window,name:sale_stock.res_partner_rule_children msgid "Contact Details" -msgstr "" +msgstr "コンタクトの詳細" #. module: sale_stock #: selection:sale.config.settings,default_order_policy:0 @@ -166,7 +166,7 @@ msgstr "配達基準の請求書" #: model:ir.model,name:sale_stock.model_sale_order #: field:stock.picking,sale_id:0 msgid "Sales Order" -msgstr "受注オーダー" +msgstr "受注" #. module: sale_stock #: model:ir.model,name:sale_stock.model_stock_picking_out @@ -177,7 +177,7 @@ msgstr "" #: model:ir.model,name:sale_stock.model_sale_order_line #: field:stock.move,sale_line_id:0 msgid "Sales Order Line" -msgstr "受注オーダー行" +msgstr "受注明細" #. module: sale_stock #: model:process.transition,note:sale_stock.process_transition_packing0 @@ -193,7 +193,7 @@ msgstr "" #. module: sale_stock #: model:ir.model,name:sale_stock.model_stock_picking msgid "Picking List" -msgstr "集荷リスト" +msgstr "ピッキングリスト" #. module: sale_stock #: field:sale.shop,warehouse_id:0 @@ -208,7 +208,7 @@ msgstr "強制割当" #. module: sale_stock #: field:sale.config.settings,default_order_policy:0 msgid "The default invoicing method is" -msgstr "" +msgstr "デフォルト請求方法は" #. module: sale_stock #: field:sale.order.line,delay:0 @@ -233,12 +233,12 @@ msgstr "在庫移動" #. module: sale_stock #: view:sale.config.settings:0 msgid "Default Options" -msgstr "" +msgstr "デフォルトオプション" #. module: sale_stock #: field:sale.config.settings,module_project_mrp:0 msgid "Project MRP" -msgstr "" +msgstr "プロジェクトMRP" #. module: sale_stock #: model:process.transition,note:sale_stock.process_transition_invoiceafterdelivery0 @@ -297,7 +297,7 @@ msgstr "" #. module: sale_stock #: view:sale.order:0 msgid "days" -msgstr "" +msgstr "日数" #. module: sale_stock #: field:sale.order.line,product_packaging:0 @@ -350,7 +350,7 @@ msgstr "" #: code:addons/sale_stock/sale_stock.py:208 #, python-format msgid "Cannot cancel sales order!" -msgstr "" +msgstr "受注を取り消せません。" #. module: sale_stock #: model:ir.model,name:sale_stock.model_sale_shop @@ -380,7 +380,7 @@ msgstr "" #. module: sale_stock #: field:sale.config.settings,group_mrp_properties:0 msgid "Product properties on order lines" -msgstr "" +msgstr "受注明細上の品目属性" #. module: sale_stock #: help:sale.config.settings,default_order_policy:0 @@ -391,7 +391,7 @@ msgstr "受注オーダー基準、または出荷基準の請求書を生成し #. module: sale_stock #: model:ir.model,name:sale_stock.model_sale_report msgid "Sales Orders Statistics" -msgstr "受注オーダーの統計値" +msgstr "受注統計" #. module: sale_stock #: model:ir.model,name:sale_stock.model_res_company diff --git a/addons/warning/i18n/hr.po b/addons/warning/i18n/hr.po index 90ddb5e77f4..bd51987f1ab 100644 --- a/addons/warning/i18n/hr.po +++ b/addons/warning/i18n/hr.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2013-06-07 19:37+0000\n" -"PO-Revision-Date: 2013-09-20 11:23+0000\n" -"Last-Translator: Tomislav Bosnjakovic \n" +"PO-Revision-Date: 2013-10-18 11:13+0000\n" +"Last-Translator: Marko Carevic \n" "Language-Team: Vinteh\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-09-21 05:59+0000\n" -"X-Generator: Launchpad (build 16765)\n" +"X-Launchpad-Export-Date: 2013-10-19 05:28+0000\n" +"X-Generator: Launchpad (build 16807)\n" "Language: hr\n" #. module: warning @@ -46,7 +46,7 @@ msgstr "Upozorenje kod kupnje ovog proizvoda" #. module: warning #: model:ir.model,name:warning.model_product_product msgid "Product" -msgstr "Proizvod" +msgstr "Artikl" #. module: warning #: view:product.product:0 From 6ba45e5cbf37a1fe762ea19950cddb353fd850ae Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Mon, 21 Oct 2013 11:57:35 +0200 Subject: [PATCH 3/4] [FIX] procurement: change SQL query to be compatible with both postgres 8.4 and 9.3 bzr revid: mat@openerp.com-20131021095735-yz9pb5pphfdgl44j --- addons/procurement/procurement.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py index f5d4761642b..66024256f9a 100644 --- a/addons/procurement/procurement.py +++ b/addons/procurement/procurement.py @@ -140,7 +140,7 @@ class procurement_order(osv.osv): if not proc.note or '_first_pass_done_' not in proc.note or proc.state not in ('confirmed', 'exception'): super(procurement_order, self).message_track(cr, uid, [proc.id], tracked_fields, initial_values, context=context) if proc.state == 'exception': - cr.execute("""UPDATE procurement_order set note = CONCAT(note, %s) WHERE id = %s""", ('_first_pass_done_',proc.id)) + cr.execute("""UPDATE procurement_order set note = TRIM(both E'\n' FROM COALESCE(note, '') || %s) WHERE id = %s""", ('\n\n_first_pass_done_',proc.id)) return True From 6a3683f116ef051a0f883fdc8ef3d10095d7ebd8 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Mon, 21 Oct 2013 14:47:48 +0200 Subject: [PATCH 4/4] [FIX] l10n_fr: 2014 tax update patch has removed obsolete templates, causing an error at module update Due to the relationship between fiscal position templates and tax templates, the removal of obsolete tax templates may crash if the corresponding fiscal positions are not deleted before. In a recent l10n_fr patch [1] a number of templates disappeared, which causes an error during subsequent updates on databases where the obsolete templates are still present. As a workaround, we can force a deletion of all fiscal position templates before loading them. This is relatively safe because the templates are not connected to live data, and will be re-created during the update (except for the obsolete ones which will be gone forever). [1] addons 7.0 rev 9515 rev-id: odo@openerp.com-20131010114424-atzr3bl9e9diir2g lp bug: https://launchpad.net/bugs/1240265 fixed bzr revid: odo@openerp.com-20131021124748-x4jnibwyab4gam23 --- addons/l10n_fr/fr_fiscal_templates.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/addons/l10n_fr/fr_fiscal_templates.xml b/addons/l10n_fr/fr_fiscal_templates.xml index b11f8d4f0dd..bf49d15e08c 100644 --- a/addons/l10n_fr/fr_fiscal_templates.xml +++ b/addons/l10n_fr/fr_fiscal_templates.xml @@ -2,6 +2,12 @@ + + + +