From 6fb32cc4d5c3e68d927c275da723ede4d3c10a2a Mon Sep 17 00:00:00 2001 From: Matthieu Dietrich Date: Tue, 3 Dec 2013 15:48:43 +0100 Subject: [PATCH 01/10] [FIX] lp:1257288 - fixed amount in foreign currency for opening entries bzr revid: matthieu.dietrich@camptocamp.com-20131203144843-kbtd3atkryq8ryec --- addons/account/wizard/account_fiscalyear_close.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/addons/account/wizard/account_fiscalyear_close.py b/addons/account/wizard/account_fiscalyear_close.py index c2acfb75f22..28ddf39cd7f 100644 --- a/addons/account/wizard/account_fiscalyear_close.py +++ b/addons/account/wizard/account_fiscalyear_close.py @@ -224,14 +224,6 @@ class account_fiscalyear_close(osv.osv_memory): query_2nd_part = "" query_2nd_part_args = [] for account in obj_acc_account.browse(cr, uid, account_ids, context={'fiscalyear': fy_id}): - balance_in_currency = 0.0 - if account.currency_id: - cr.execute('SELECT sum(COALESCE(amount_currency,0.0)) as balance_in_currency FROM account_move_line ' \ - 'WHERE account_id = %s ' \ - 'AND ' + query_line + ' ' \ - 'AND currency_id = %s', (account.id, account.currency_id.id)) - balance_in_currency = cr.dictfetchone()['balance_in_currency'] - company_currency_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id if not currency_obj.is_zero(cr, uid, company_currency_id, abs(account.balance)): if query_2nd_part: @@ -246,7 +238,7 @@ class account_fiscalyear_close(osv.osv_memory): period.id, account.id, account.currency_id and account.currency_id.id or None, - balance_in_currency, + account.foreign_balance if account.currency_id else 0.0, account.company_id.id, 'draft') if query_2nd_part: From 9a456ac078ea59ae10fa68ecb65ed1eb2736758f Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Fri, 13 Dec 2013 16:52:12 +0100 Subject: [PATCH 02/10] [FIX] ir.module.module: install_from_urls is restricted to administrators and only accept urls from apps server [FIX] ir.module.module: download() method is now a no-op. This method was in fact already a no-op as the "url" field is never set explicitly in the code. lp bug: https://launchpad.net/bugs/1260747 fixed bzr revid: chs@openerp.com-20131213155212-9m1pnbpz97upyz3i --- openerp/addons/base/module/module.py | 49 +++++++---------------- openerp/addons/base/static/src/js/apps.js | 4 +- 2 files changed, 17 insertions(+), 36 deletions(-) diff --git a/openerp/addons/base/module/module.py b/openerp/addons/base/module/module.py index 5dcb1693c67..6b2ef46f68d 100644 --- a/openerp/addons/base/module/module.py +++ b/openerp/addons/base/module/module.py @@ -30,6 +30,7 @@ import shutil import tempfile import urllib import urllib2 +import urlparse import zipfile import zipimport @@ -39,6 +40,7 @@ except ImportError: from StringIO import StringIO # NOQA import openerp +import openerp.exceptions from openerp import modules, pooler, tools, addons from openerp.modules.db import create_categories from openerp.tools.parse_version import parse_version @@ -619,40 +621,14 @@ class module(osv.osv): return res def download(self, cr, uid, ids, download=True, context=None): - res = [] - default_version = modules.adapt_version('1.0') - for mod in self.browse(cr, uid, ids, context=context): - if not mod.url: - continue - match = re.search('-([a-zA-Z0-9\._-]+)(\.zip)', mod.url, re.I) - version = default_version - if match: - version = match.group(1) - if parse_version(mod.installed_version) >= parse_version(version): - continue - res.append(mod.url) - if not download: - continue - zip_content = urllib.urlopen(mod.url).read() - fname = modules.get_module_path(str(mod.name) + '.zip', downloaded=True) - try: - with open(fname, 'wb') as fp: - fp.write(zip_content) - except Exception: - _logger.exception('Error when trying to create module ' - 'file %s', fname) - raise orm.except_orm(_('Error'), _('Can not create the module file:\n %s') % (fname,)) - terp = self.get_module_info(mod.name) - self.write(cr, uid, mod.id, self.get_values_from_terp(terp)) - cr.execute('DELETE FROM ir_module_module_dependency WHERE module_id = %s', (mod.id,)) - self._update_dependencies(cr, uid, mod, terp.get('depends', [])) - self._update_category(cr, uid, mod, terp.get('category', 'Uncategorized')) - # Import module - zimp = zipimport.zipimporter(fname) - zimp.load_module(mod.name) - return res + return [] def install_from_urls(self, cr, uid, urls, context=None): + if not self.pool['res.users'].has_group(cr, uid, 'base.group_system'): + raise openerp.exceptions.AccessDenied() + + apps_server = urlparse.urlparse(self.get_apps_server(cr, uid, context=context)) + OPENERP = 'openerp' tmp = tempfile.mkdtemp() _logger.debug('Install from url: %r', urls) @@ -661,6 +637,11 @@ class module(osv.osv): for module_name, url in urls.items(): if not url: continue # nothing to download, local version is already the last one + + up = urlparse.urlparse(url) + if up.scheme != apps_server.scheme or up.netloc != apps_server.netloc: + raise openerp.exceptions.AccessDenied() + try: _logger.info('Downloading module `%s` from OpenERP Apps', module_name) content = urllib2.urlopen(url).read() @@ -725,8 +706,8 @@ class module(osv.osv): finally: shutil.rmtree(tmp) - def install_by_names(self, cr, uid, names, context=None): - raise NotImplementedError('# TODO') + def get_apps_server(self, cr, uid, context=None): + return tools.config.get('apps_server', 'https://apps.openerp.com/apps') def _update_dependencies(self, cr, uid, mod_browse, depends=None): if depends is None: diff --git a/openerp/addons/base/static/src/js/apps.js b/openerp/addons/base/static/src/js/apps.js index eaaca6b13c3..13a9c2637b3 100644 --- a/openerp/addons/base/static/src/js/apps.js +++ b/openerp/addons/base/static/src/js/apps.js @@ -63,8 +63,8 @@ openerp.base = function(instance) { if (instance.base.apps_client) { return check_client_available(instance.base.apps_client); } else { - var ICP = new instance.web.Model('ir.config_parameter'); - return ICP.call('get_param', ['apps.server', 'https://apps.openerp.com/apps']).then(function(u) { + var Mod = new instance.web.Model('ir.module.module'); + return Mod.call('get_apps_server').then(function(u) { var link = $(_.str.sprintf('', u))[0]; var host = _.str.sprintf('%s//%s', link.protocol, link.host); var dbname = link.pathname; From c2794d0e85a4b459a0d902701908bb2585b9c747 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Mon, 13 Jan 2014 05:59:13 +0000 Subject: [PATCH 03/10] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20140111062610-ld24q55cbxo6di5q bzr revid: launchpad_translations_on_behalf_of_openerp-20140112054746-j34qg10ipyb6kj8g bzr revid: launchpad_translations_on_behalf_of_openerp-20140113055853-5oqpffj3szw1yrpl bzr revid: launchpad_translations_on_behalf_of_openerp-20140111062637-m0t50cu2cr5d6yw7 bzr revid: launchpad_translations_on_behalf_of_openerp-20140112054824-hm7ylgrauivbj7h2 bzr revid: launchpad_translations_on_behalf_of_openerp-20140113055913-wo2i3sd1rnblragc --- addons/account/i18n/ja.po | 96 +++- addons/account/i18n/mn.po | 14 +- addons/account_analytic_analysis/i18n/fr.po | 22 +- addons/account_payment/i18n/es_MX.po | 545 ++++++++------------ addons/account_sequence/i18n/mn.po | 28 +- addons/account_test/i18n/fr.po | 19 +- addons/account_voucher/i18n/ja.po | 33 +- addons/anonymization/i18n/fr.po | 23 +- addons/anonymization/i18n/mn.po | 20 +- addons/base_action_rule/i18n/fr.po | 22 +- addons/base_setup/i18n/fr.po | 14 +- addons/claim_from_delivery/i18n/mn.po | 12 +- addons/crm/i18n/ja.po | 10 +- addons/delivery/i18n/mn.po | 9 +- addons/document_page/i18n/mn.po | 26 +- addons/email_template/i18n/fr.po | 6 +- addons/email_template/i18n/ja.po | 28 +- addons/fleet/i18n/mn.po | 10 +- addons/google_base_account/i18n/mn.po | 10 +- addons/google_docs/i18n/mn.po | 10 +- addons/hr_expense/i18n/mn.po | 10 +- addons/hr_holidays/i18n/fr.po | 8 +- addons/hr_payroll/i18n/fr.po | 9 +- addons/hr_payroll/i18n/hr.po | 36 +- addons/mail/i18n/ja.po | 31 +- addons/portal/i18n/ja.po | 10 +- addons/stock/i18n/ja.po | 10 +- addons/stock/i18n/zh_TW.po | 103 ++-- openerp/addons/base/i18n/af.po | 39 +- openerp/addons/base/i18n/fr.po | 10 +- openerp/addons/base/i18n/ja.po | 32 +- 31 files changed, 639 insertions(+), 616 deletions(-) diff --git a/addons/account/i18n/ja.po b/addons/account/i18n/ja.po index 841ce5762a3..1e176fe2389 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: 2014-01-08 08:27+0000\n" +"PO-Revision-Date: 2014-01-12 07:50+0000\n" "Last-Translator: hiro TAKADA \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: 2014-01-09 05:38+0000\n" -"X-Generator: Launchpad (build 16884)\n" +"X-Launchpad-Export-Date: 2014-01-13 05:59+0000\n" +"X-Generator: Launchpad (build 16890)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -964,7 +964,7 @@ msgstr "J.C. / Move 名前" #. module: account #: view:account.account:0 msgid "Account Code and Name" -msgstr "" +msgstr "勘定コードと名前" #. module: account #: selection:account.entries.report,month:0 @@ -1001,6 +1001,10 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" 仕訳項目は見つかりません。\n" +"

\n" +" " #. module: account #: code:addons/account/account.py:1677 @@ -1202,7 +1206,7 @@ msgstr "アカウント名" #. module: account #: field:account.journal,with_last_closing_balance:0 msgid "Opening With Last Closing Balance" -msgstr "" +msgstr "前回の期末残高で開始" #. module: account #: help:account.tax.code,notprintable:0 @@ -1569,7 +1573,7 @@ msgstr "請求書ステータス" #: model:ir.actions.act_window,name:account.action_account_open_closed_fiscalyear #: model:ir.ui.menu,name:account.menu_wizard_account_open_closed_fiscalyear msgid "Cancel Closing Entries" -msgstr "" +msgstr "決算仕訳の取り消し" #. module: account #: view:account.bank.statement:0 @@ -1896,7 +1900,7 @@ msgstr "勘定タイプ別売上" #: model:account.payment.term,name:account.account_payment_term_15days #: model:account.payment.term,note:account.account_payment_term_15days msgid "15 Days" -msgstr "" +msgstr "15日以内" #. module: account #: model:ir.ui.menu,name:account.periodical_processing_invoicing @@ -1984,7 +1988,7 @@ msgstr "" #: view:account.bank.statement:0 #: field:account.bank.statement,last_closing_balance:0 msgid "Last Closing Balance" -msgstr "" +msgstr "前回の期末残高" #. module: account #: model:ir.model,name:account.model_account_common_journal_report @@ -2059,6 +2063,11 @@ msgid "" "useful because it enables you to preview at any time the tax that you owe at " "the start and end of the month or quarter." msgstr "" +"このメニューでは請求書や支払いに基づいた税申告書を印刷します。\r\n" +"会計年度のひとつ、または複数の期間を選択します。\r\n" +"税申告に必要な情報はOpenERPが請求書(国によっては支払い)から自動的に生成します。\r\n" +"このデータはリアルタイムで更新されます。\r\n" +"月または四半期の開始と終了に支払い義務のある税金をいつでもプレビューできるため非常に役立ちます。" #. module: account #: code:addons/account/account.py:409 @@ -2187,6 +2196,15 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" クリックして銀行取引明細書を登録してください。\n" +"

\n" +" " +"銀行取引明細書は一定の期間に渡って銀行口座に発生するすべての金融取引の要約です。あなたは、これを銀行から定期的に受け取るべきです。\n" +"

\n" +" OpenERPは関連する販売または購買の請求書と取引明細書を直接に擦り合わせることができます。\n" +"

\n" +" " #. module: account #: field:account.config.settings,currency_id:0 @@ -3180,7 +3198,7 @@ msgstr "8月" #. module: account #: field:accounting.report,debit_credit:0 msgid "Display Debit/Credit Columns" -msgstr "" +msgstr "借方/貸方欄を表示" #. module: account #: report:account.journal.period.print:0 @@ -3699,7 +3717,7 @@ msgstr "会計アプリケーションの設定" #. module: account #: model:ir.actions.act_window,name:account.action_account_vat_declaration msgid "Account Tax Declaration" -msgstr "" +msgstr "税申告を報告" #. module: account #: help:account.bank.statement,name:0 @@ -3744,7 +3762,7 @@ msgstr "期間を閉じる" #: view:account.bank.statement:0 #: field:account.cashbox.line,subtotal_opening:0 msgid "Opening Subtotal" -msgstr "" +msgstr "期首小計" #. module: account #: constraint:account.move.line:0 @@ -4575,6 +4593,14 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" クリックして新しい銀行口座を開設します。\n" +"

\n" +" 報告書のフッタに表示されるあなたの会社の銀行口座の設定と選択を行います。\n" +"

\n" +" OpenERPの会計アプリを使用する場合、これらのデータに基づいた勘定科目と仕訳は自動的に作成されます。\n" +"

\n" +" " #. module: account #: model:ir.model,name:account.model_account_invoice_cancel @@ -4860,7 +4886,7 @@ msgstr "クレジットノート" #: view:account.move.line:0 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile msgid "Journal Items to Reconcile" -msgstr "" +msgstr "調整する仕訳項目" #. module: account #: model:ir.model,name:account.model_account_tax_template @@ -5283,7 +5309,7 @@ msgstr "有効" #: view:account.bank.statement:0 #: field:account.journal,cash_control:0 msgid "Cash Control" -msgstr "" +msgstr "現金管理" #. module: account #: field:account.analytic.balance,date2:0 @@ -5448,7 +5474,7 @@ msgstr "" #: view:account.bank.statement:0 #: help:account.cashbox.line,number_opening:0 msgid "Opening Unit Numbers" -msgstr "" +msgstr "期首数量" #. module: account #: field:account.subscription,period_type:0 @@ -6310,7 +6336,7 @@ msgstr "期首残高と取引行を基本に計算された残高" #. module: account #: field:account.journal,loss_account_id:0 msgid "Loss Account" -msgstr "" +msgstr "損失勘定" #. module: account #: field:account.tax,account_collected_id:0 @@ -6478,7 +6504,7 @@ msgstr "分析行" #. module: account #: model:ir.ui.menu,name:account.menu_action_model_form msgid "Models" -msgstr "" +msgstr "モデル" #. module: account #: code:addons/account/account_invoice.py:1124 @@ -6701,7 +6727,7 @@ msgstr "株式" #. module: account #: field:account.journal,internal_account_id:0 msgid "Internal Transfers Account" -msgstr "" +msgstr "内部振替勘定" #. module: account #: code:addons/account/wizard/pos_box.py:32 @@ -6827,7 +6853,7 @@ msgstr "" #. module: account #: view:account.open.closed.fiscalyear:0 msgid "Discard" -msgstr "" +msgstr "破棄" #. module: account #: selection:account.account,type:0 @@ -7131,7 +7157,7 @@ msgstr "エントリー作成" #. module: account #: view:account.open.closed.fiscalyear:0 msgid "Cancel Fiscal Year Closing Entries" -msgstr "" +msgstr "会計年度の決算仕訳を取り消し" #. module: account #: selection:account.account.type,report_type:0 @@ -7143,7 +7169,7 @@ msgstr "損益計算書（費用勘定）" #. module: account #: field:account.bank.statement,total_entry_encoding:0 msgid "Total Transactions" -msgstr "" +msgstr "総取引" #. module: account #: code:addons/account/account.py:636 @@ -8432,7 +8458,7 @@ msgstr "残差合計" #. module: account #: view:account.bank.statement:0 msgid "Opening Cash Control" -msgstr "" +msgstr "現在の現金管理" #. module: account #: model:process.node,note:account.process_node_invoiceinvoice0 @@ -8622,7 +8648,7 @@ msgstr "課税基準金額" msgid "" "This wizard will remove the end of year journal entries of selected fiscal " "year. Note that you can run this wizard many times for the same fiscal year." -msgstr "" +msgstr "このウィザードは選択した会計年度の最後の仕訳項目を削除します。同じ会計年度ではこのウィザードを何度も実行できることに注意してください。" #. module: account #: report:account.invoice:0 @@ -8902,7 +8928,7 @@ msgstr "許可勘定科目タイプ（制御なしは空）" #. module: account #: view:account.payment.term:0 msgid "Payment term explanation for the customer..." -msgstr "" +msgstr "顧客の支払条件を説明…" #. module: account #: help:account.move.line,amount_residual:0 @@ -9007,6 +9033,14 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" クリックして新しい定期項目を定義します。\n" +"

\n" +" " +"定期項目は特定の日付から定期的に発生、つまり契約の署名や顧客または仕入先との取り決めに対応します。システムでの転記を自動化するため、このような項目を作成で" +"きます。\n" +"

\n" +" " #. module: account #: view:account.journal:0 @@ -9296,7 +9330,7 @@ msgstr "期間の開始日" #. module: account #: field:account.cashbox.line,pieces:0 msgid "Unit of Currency" -msgstr "" +msgstr "通貨単位" #. module: account #: code:addons/account/account.py:3195 @@ -9601,7 +9635,7 @@ msgstr "支払対象" #. module: account #: view:account.account:0 msgid "Account name" -msgstr "" +msgstr "勘定科目名" #. module: account #: view:board.board:0 @@ -9664,7 +9698,7 @@ msgstr "" #. module: account #: view:account.bank.statement:0 msgid "Date / Period" -msgstr "" +msgstr "日付 / 期間" #. module: account #: report:account.central.journal:0 @@ -9839,7 +9873,7 @@ msgstr "期日" #: model:account.payment.term,name:account.account_payment_term_immediate #: model:account.payment.term,note:account.account_payment_term_immediate msgid "Immediate Payment" -msgstr "" +msgstr "即時払い" #. module: account #: code:addons/account/account.py:1502 @@ -10844,6 +10878,14 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" 記入したい期間と仕訳帳を選択します。\n" +"

\n" +" " +"このビューは会計担当者が受注の際にOpenERPの項目に素早く記録するため使用できます。仕入先請求書を記録したい場合、費用勘定の記録から始めます。Open" +"ERPはこの勘定に関連する税と「買掛金勘定」を自動で提案します。\n" +"

\n" +" " #. module: account #: help:account.invoice.line,account_id:0 diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po index 6941ef34822..b2cd1655a78 100644 --- a/addons/account/i18n/mn.po +++ b/addons/account/i18n/mn.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-07-24 07:32+0000\n" -"Last-Translator: wsubuntu \n" +"PO-Revision-Date: 2014-01-11 13:59+0000\n" +"Last-Translator: gobi \n" "Language-Team: Mongolian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 05:52+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-01-12 05:48+0000\n" +"X-Generator: Launchpad (build 16890)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -1029,7 +1029,7 @@ msgstr "9 сар" #: code:addons/account/static/src/xml/account_move_reconciliation.xml:24 #, python-format msgid "Latest Manual Reconciliation Processed:" -msgstr "" +msgstr "Хамгийн сүүлийн гар тулгасан боловсруулагдсан:" #. module: account #: selection:account.subscription,period_type:0 @@ -4581,7 +4581,7 @@ msgstr "Татварын олонлогуудыг гүйцээнэ үү" #. module: account #: field:res.partner,last_reconciliation_date:0 msgid "Latest Full Reconciliation Date" -msgstr "" +msgstr "Хамгийн сүүлийн бүрэн тулгалтын огноо" #. module: account #: field:account.account,name:0 @@ -6584,7 +6584,7 @@ msgstr "3 сар" #: code:addons/account/account.py:1031 #, python-format msgid "You can not re-open a period which belongs to closed fiscal year" -msgstr "" +msgstr "Хаагдсан санхүүгийн жилд харъяалагдах мөчлөгийг нээх боломжгүй" #. module: account #: report:account.analytic.account.journal:0 diff --git a/addons/account_analytic_analysis/i18n/fr.po b/addons/account_analytic_analysis/i18n/fr.po index f81aa40184f..b0a1d267f38 100644 --- a/addons/account_analytic_analysis/i18n/fr.po +++ b/addons/account_analytic_analysis/i18n/fr.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-05 08:06+0000\n" -"Last-Translator: Numérigraphe \n" +"PO-Revision-Date: 2014-01-11 07:34+0000\n" +"Last-Translator: Florian Hatat \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 05:56+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-01-12 05:48+0000\n" +"X-Generator: Launchpad (build 16890)\n" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -298,11 +298,13 @@ msgid "" "{'required': [('type','=','contract'),'|',('fix_price_invoices','=',True), " "('invoice_on_timesheets', '=', True)]}" msgstr "" +"{'required': [('type','=','contract'),'|',('fix_price_invoices','=',True), " +"('invoice_on_timesheets', '=', True)]}" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Contracts assigned to a customer." -msgstr "" +msgstr "Contrats attribués à un client." #. module: account_analytic_analysis #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month @@ -312,7 +314,7 @@ msgstr "Résumé des heures par mois" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Pending contracts" -msgstr "" +msgstr "Contrats en attente" #. module: account_analytic_analysis #: help:account.analytic.account,real_margin_rate:0 @@ -332,7 +334,7 @@ msgstr "Parent" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Units Consumed" -msgstr "" +msgstr "Unités consommées" #. module: account_analytic_analysis #: field:account.analytic.account,month_ids:0 @@ -354,7 +356,7 @@ msgstr "Date de début" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Expiring soon" -msgstr "" +msgstr "Expire bientôt" #. module: account_analytic_analysis #: view:account.analytic.account:0 @@ -510,7 +512,7 @@ msgstr "Utilisateur" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Cancelled contracts" -msgstr "" +msgstr "Contrats annulés" #. module: account_analytic_analysis #: model:ir.actions.act_window,help:account_analytic_analysis.template_of_contract_action @@ -572,7 +574,7 @@ msgstr "Revenu par unité de temps (réel)" #. module: account_analytic_analysis #: view:account.analytic.account:0 msgid "Expired or consumed" -msgstr "" +msgstr "Expiré ou consommé" #. module: account_analytic_analysis #: model:ir.actions.act_window,help:account_analytic_analysis.action_account_analytic_overdue_all diff --git a/addons/account_payment/i18n/es_MX.po b/addons/account_payment/i18n/es_MX.po index f7f051ca3da..74aa3ba494b 100644 --- a/addons/account_payment/i18n/es_MX.po +++ b/addons/account_payment/i18n/es_MX.po @@ -1,193 +1,170 @@ -# Translation of OpenERP Server. -# This file contains the translation of the following modules: -# * account_payment +# Spanish (Mexico) translation for openobject-addons +# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2014. # msgid "" msgstr "" -"Project-Id-Version: OpenERP Server 6.0dev\n" -"Report-Msgid-Bugs-To: support@openerp.com\n" -"POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-12 13:13+0000\n" -"Last-Translator: Borja López Soilán (NeoPolus) \n" -"Language-Team: \n" +"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: 2014-01-10 21:52+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Spanish (Mexico) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-09-05 05:26+0000\n" -"X-Generator: Launchpad (build 13830)\n" +"X-Launchpad-Export-Date: 2014-01-11 06:26+0000\n" +"X-Generator: Launchpad (build 16890)\n" #. module: account_payment -#: field:payment.order,date_scheduled:0 -msgid "Scheduled date if fixed" -msgstr "Fecha planificada si es fija" +#: model:ir.actions.act_window,help:account_payment.action_payment_order_tree +msgid "" +"

\n" +" Click to create a payment order.\n" +"

\n" +" A payment order is a payment request from your company to " +"pay a\n" +" supplier invoice or a customer refund.\n" +"

\n" +" " +msgstr "" #. module: account_payment #: field:payment.line,currency:0 msgid "Partner Currency" -msgstr "Moneda de la empresa" +msgstr "" #. module: account_payment #: view:payment.order:0 msgid "Set to draft" -msgstr "Cambiar a borrador" +msgstr "" #. module: account_payment #: help:payment.order,mode:0 msgid "Select the Payment Mode to be applied." -msgstr "Seleccione el modo de pago a aplicar." +msgstr "" #. module: account_payment #: view:payment.mode:0 #: view:payment.order:0 msgid "Group By..." -msgstr "Agrupar por..." - -#. module: account_payment -#: model:ir.module.module,description:account_payment.module_meta_information -msgid "" -"\n" -"This module provides :\n" -"* a more efficient way to manage invoice payment.\n" -"* a basic mechanism to easily plug various automated payment.\n" -" " msgstr "" -"\n" -"Este módulo proporciona:\n" -"* Una forma más eficiente para gestionar el pago de las facturas.\n" -"* Un mecanismo básico para conectar fácilmente varios pagos automatizados.\n" -" " #. module: account_payment #: field:payment.order,line_ids:0 msgid "Payment lines" -msgstr "Líneas de pago" +msgstr "" #. module: account_payment #: view:payment.line:0 #: field:payment.line,info_owner:0 #: view:payment.order:0 msgid "Owner Account" -msgstr "Cuenta propietario" - -#. module: account_payment -#: help:payment.order,state:0 -msgid "" -"When an order is placed the state is 'Draft'.\n" -" Once the bank is confirmed the state is set to 'Confirmed'.\n" -" Then the order is paid the state is 'Done'." msgstr "" -"Cuando se hace una orden, el estado es 'Borrador'.\n" -" Una vez se confirma el banco, el estado es \"Confirmada\".\n" -" Cuando la orden se paga, el estado es 'Realizada'." - -#. module: account_payment -#: help:account.invoice,amount_to_pay:0 -msgid "" -"The amount which should be paid at the current date\n" -"minus the amount which is already in payment order" -msgstr "" -"El importe que se debería haber pagado en la fecha actual\n" -"menos el importe que ya está en la orden de pago" #. module: account_payment +#: field:payment.line,company_id:0 #: field:payment.mode,company_id:0 +#: field:payment.order,company_id:0 msgid "Company" -msgstr "Compañía" +msgstr "" #. module: account_payment -#: field:payment.order,date_prefered:0 -msgid "Preferred date" -msgstr "Fecha preferida" +#: model:res.groups,name:account_payment.group_account_payment +msgid "Accounting / Payments" +msgstr "" #. module: account_payment #: selection:payment.line,state:0 msgid "Free" -msgstr "Libre" +msgstr "" #. module: account_payment +#: view:payment.order.create:0 #: field:payment.order.create,entries:0 msgid "Entries" -msgstr "Asientos" +msgstr "" #. module: account_payment #: report:payment.order:0 msgid "Used Account" -msgstr "Cuenta utilizada" +msgstr "" #. module: account_payment #: field:payment.line,ml_maturity_date:0 #: field:payment.order.create,duedate:0 msgid "Due Date" -msgstr "Fecha de vencimiento" - -#. module: account_payment -#: constraint:account.move.line:0 -msgid "You can not create move line on closed account." -msgstr "No puede crear una línea de movimiento en una cuenta cerrada." - -#. module: account_payment -#: view:account.move.line:0 -msgid "Account Entry Line" -msgstr "Línea del asiento contable" +msgstr "" #. module: account_payment #: view:payment.order.create:0 msgid "_Add to payment order" -msgstr "_Añadir a la orden de pago" +msgstr "" #. module: account_payment #: model:ir.actions.act_window,name:account_payment.action_account_payment_populate_statement #: model:ir.actions.act_window,name:account_payment.action_account_populate_statement_confirm msgid "Payment Populate statement" -msgstr "Extracto generar pago" +msgstr "" + +#. module: account_payment +#: code:addons/account_payment/account_invoice.py:43 +#, python-format +msgid "" +"You cannot cancel an invoice which has already been imported in a payment " +"order. Remove it from the following payment order : %s." +msgstr "" + +#. module: account_payment +#: code:addons/account_payment/account_invoice.py:43 +#: code:addons/account_payment/account_move_line.py:110 +#, python-format +msgid "Error!" +msgstr "" #. module: account_payment #: report:payment.order:0 #: view:payment.order:0 msgid "Amount" -msgstr "Importe" - -#. module: account_payment -#: sql_constraint:account.move.line:0 -msgid "Wrong credit or debit value in accounting entry !" -msgstr "¡Valor haber o debe erróneo en el asiento contable!" +msgstr "" #. module: account_payment #: view:payment.order:0 msgid "Total in Company Currency" -msgstr "Total en moneda de la compañía" +msgstr "" #. module: account_payment #: selection:payment.order,state:0 msgid "Cancelled" -msgstr "Cancelado" +msgstr "" #. module: account_payment #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree_new msgid "New Payment Order" -msgstr "Nueva orden de pago" +msgstr "" #. module: account_payment #: report:payment.order:0 #: field:payment.order,reference:0 msgid "Reference" -msgstr "Referencia" +msgstr "" #. module: account_payment #: sql_constraint:payment.line:0 msgid "The payment line name must be unique!" -msgstr "¡El nombre de la línea de pago debe ser única!" +msgstr "" #. module: account_payment #: model:ir.actions.act_window,name:account_payment.action_payment_order_tree #: model:ir.ui.menu,name:account_payment.menu_action_payment_order_form msgid "Payment Orders" -msgstr "Órdenes de pago" +msgstr "" #. module: account_payment #: selection:payment.order,date_prefered:0 msgid "Directly" -msgstr "Directamente" +msgstr "" #. module: account_payment #: model:ir.actions.act_window,name:account_payment.action_payment_line_form @@ -195,45 +172,52 @@ msgstr "Directamente" #: view:payment.line:0 #: view:payment.order:0 msgid "Payment Line" -msgstr "Línea de pago" +msgstr "" #. module: account_payment #: view:payment.line:0 msgid "Amount Total" -msgstr "Importe total" +msgstr "" + +#. module: account_payment +#: help:payment.order,state:0 +msgid "" +"When an order is placed the status is 'Draft'.\n" +" Once the bank is confirmed the status is set to 'Confirmed'.\n" +" Then the order is paid the status is 'Done'." +msgstr "" #. module: account_payment #: view:payment.order:0 #: selection:payment.order,state:0 msgid "Confirmed" -msgstr "Confirmada" +msgstr "" #. module: account_payment #: help:payment.line,ml_date_created:0 msgid "Invoice Effective Date" -msgstr "Fecha vencimiento factura" +msgstr "" #. module: account_payment #: report:payment.order:0 msgid "Execution Type" -msgstr "Tipo ejecución" +msgstr "" #. module: account_payment #: selection:payment.line,state:0 msgid "Structured" -msgstr "Estructurado" +msgstr "" #. module: account_payment -#: view:payment.order:0 -#: field:payment.order,state:0 -msgid "State" -msgstr "Estado" +#: view:account.bank.statement:0 +msgid "Import Payment Lines" +msgstr "" #. module: account_payment #: view:payment.line:0 #: view:payment.order:0 msgid "Transaction Information" -msgstr "Información de transacción" +msgstr "" #. module: account_payment #: model:ir.actions.act_window,name:account_payment.action_payment_mode_form @@ -241,18 +225,19 @@ msgstr "Información de transacción" #: model:ir.ui.menu,name:account_payment.menu_action_payment_mode_form #: view:payment.mode:0 #: view:payment.order:0 +#: field:payment.order,mode:0 msgid "Payment Mode" -msgstr "Modo de pago" +msgstr "" #. module: account_payment #: field:payment.line,ml_date_created:0 msgid "Effective Date" -msgstr "Fecha vencimiento" +msgstr "" #. module: account_payment #: field:payment.line,ml_inv_ref:0 msgid "Invoice Ref." -msgstr "Ref. factura" +msgstr "" #. module: account_payment #: help:payment.order,date_prefered:0 @@ -261,119 +246,99 @@ msgid "" "by you.'Directly' stands for the direct execution.'Due date' stands for the " "scheduled date of execution." msgstr "" -"Seleccione una opción para la orden de pago: 'Fecha fija' para una fecha " -"especificada por usted. 'Directamente' para la ejecución directa. 'Fecha " -"vencimiento' para la fecha programada de ejecución." #. module: account_payment -#: code:addons/account_payment/account_move_line.py:110 -#, python-format -msgid "Error !" -msgstr "¡Error!" - -#. module: account_payment -#: view:account.move.line:0 -msgid "Total debit" -msgstr "Total debe" - -#. module: account_payment -#: field:payment.order,date_done:0 -msgid "Execution date" -msgstr "Fecha ejecución" +#: field:payment.order,date_created:0 +msgid "Creation Date" +msgstr "" #. module: account_payment #: help:payment.mode,journal:0 msgid "Bank or Cash Journal for the Payment Mode" -msgstr "Diario de banco o caja para el modo de pago." +msgstr "" #. module: account_payment #: selection:payment.order,date_prefered:0 msgid "Fixed date" -msgstr "Fecha fija" +msgstr "" #. module: account_payment #: field:payment.line,info_partner:0 #: view:payment.order:0 msgid "Destination Account" -msgstr "Cuenta de destino" +msgstr "" #. module: account_payment #: view:payment.line:0 msgid "Desitination Account" -msgstr "Cuenta de destino" +msgstr "" #. module: account_payment #: view:payment.order:0 msgid "Search Payment Orders" -msgstr "Buscar órdenes de pago" - -#. module: account_payment -#: constraint:account.move.line:0 -msgid "" -"You can not create move line on receivable/payable account without partner" msgstr "" -"No puede crear una línea de movimiento en una cuenta a cobrar/a pagar sin " -"una empresa." #. module: account_payment #: field:payment.line,create_date:0 msgid "Created" -msgstr "Creado" +msgstr "" #. module: account_payment #: view:payment.order:0 msgid "Select Invoices to Pay" -msgstr "Seleccionar facturas a pagar" +msgstr "" #. module: account_payment #: view:payment.line:0 msgid "Currency Amount Total" -msgstr "Importe total monetario" +msgstr "" #. module: account_payment #: view:payment.order:0 msgid "Make Payments" -msgstr "Realizar pagos" +msgstr "" #. module: account_payment #: field:payment.line,state:0 msgid "Communication Type" -msgstr "Tipo de comunicación" +msgstr "" #. module: account_payment -#: model:ir.module.module,shortdesc:account_payment.module_meta_information -msgid "Payment Management" -msgstr "Gestión de pagos" +#: field:payment.line,partner_id:0 +#: field:payment.mode,partner_id:0 +#: report:payment.order:0 +msgid "Partner" +msgstr "" #. module: account_payment #: field:payment.line,bank_statement_line_id:0 msgid "Bank statement line" -msgstr "Línea extracto bancario" +msgstr "" #. module: account_payment #: selection:payment.order,date_prefered:0 msgid "Due date" -msgstr "Fecha vencimiento" +msgstr "" #. module: account_payment #: field:account.invoice,amount_to_pay:0 msgid "Amount to be paid" -msgstr "Importe a pagar" +msgstr "" #. module: account_payment #: report:payment.order:0 msgid "Currency" -msgstr "Moneda" +msgstr "" #. module: account_payment #: view:account.payment.make.payment:0 msgid "Yes" -msgstr "Sí" +msgstr "" #. module: account_payment #: help:payment.line,info_owner:0 msgid "Address of the Main Partner" -msgstr "Dirección de la empresa principal" +msgstr "" #. module: account_payment #: help:payment.line,date:0 @@ -381,92 +346,79 @@ msgid "" "If no payment date is specified, the bank will treat this payment line " "directly" msgstr "" -"Si no se indica fecha de pago, el banco procesará esta línea de pago " -"directamente" #. module: account_payment #: model:ir.model,name:account_payment.model_account_payment_populate_statement msgid "Account Payment Populate Statement" -msgstr "Contabilidad extracto generar pago" +msgstr "" + +#. module: account_payment +#: code:addons/account_payment/account_move_line.py:110 +#, python-format +msgid "There is no partner defined on the entry line." +msgstr "" #. module: account_payment #: help:payment.mode,name:0 msgid "Mode of Payment" -msgstr "Modo de pago" +msgstr "" #. module: account_payment #: report:payment.order:0 msgid "Value Date" -msgstr "Fecha valor" +msgstr "" #. module: account_payment #: report:payment.order:0 msgid "Payment Type" -msgstr "Tipo de Pago" +msgstr "" #. module: account_payment #: help:payment.line,amount_currency:0 msgid "Payment amount in the partner currency" -msgstr "Importe pagado en la moneda de la empresa" +msgstr "" #. module: account_payment #: view:payment.order:0 #: selection:payment.order,state:0 msgid "Draft" -msgstr "Borrador" +msgstr "" + +#. module: account_payment +#: view:payment.order:0 +#: field:payment.order,state:0 +msgid "Status" +msgstr "" #. module: account_payment #: help:payment.line,communication2:0 msgid "The successor message of Communication." -msgstr "El mensaje de pago realizado a comunicar." - -#. module: account_payment -#: code:addons/account_payment/account_move_line.py:110 -#, python-format -msgid "No partner defined on entry line" -msgstr "No se ha definido la empresa en la línea de entrada" +msgstr "" #. module: account_payment #: help:payment.line,info_partner:0 msgid "Address of the Ordering Customer." -msgstr "Dirección del cliente que ordena." +msgstr "" #. module: account_payment #: view:account.payment.populate.statement:0 msgid "Populate Statement:" -msgstr "Generar extracto:" - -#. module: account_payment -#: view:account.move.line:0 -msgid "Total credit" -msgstr "Total haber" +msgstr "" #. module: account_payment #: help:payment.order,date_scheduled:0 msgid "Select a date if you have chosen Preferred Date to be fixed." msgstr "" -"Seleccione una fecha si ha seleccionado que la fecha preferida sea fija." - -#. module: account_payment -#: field:payment.order,user_id:0 -msgid "User" -msgstr "Usuario" #. module: account_payment #: field:account.payment.populate.statement,lines:0 -#: model:ir.actions.act_window,name:account_payment.act_account_invoice_2_payment_line msgid "Payment Lines" -msgstr "Líneas de pago" +msgstr "" #. module: account_payment #: model:ir.model,name:account_payment.model_account_move_line msgid "Journal Items" -msgstr "Apuntes contables" - -#. module: account_payment -#: constraint:account.move.line:0 -msgid "Company must be same for its related account and period." -msgstr "La compañía debe ser la misma para la cuenta y periodo relacionados." +msgstr "" #. module: account_payment #: help:payment.line,move_line_id:0 @@ -474,202 +426,192 @@ msgid "" "This Entry Line will be referred for the information of the ordering " "customer." msgstr "" -"Esta línea se usará como referencia para la información del cliente que " -"ordena." #. module: account_payment #: view:payment.order.create:0 msgid "Search" -msgstr "Buscar" +msgstr "" #. module: account_payment -#: model:ir.actions.report.xml,name:account_payment.payment_order1 -#: model:ir.model,name:account_payment.model_payment_order -msgid "Payment Order" -msgstr "Orden de pago" +#: field:payment.order,user_id:0 +msgid "Responsible" +msgstr "" #. module: account_payment #: field:payment.line,date:0 msgid "Payment Date" -msgstr "Fecha de pago" +msgstr "" #. module: account_payment #: report:payment.order:0 msgid "Total:" -msgstr "Total:" +msgstr "" #. module: account_payment -#: field:payment.order,date_created:0 -msgid "Creation date" -msgstr "Fecha de creación" +#: field:payment.order,date_done:0 +msgid "Execution Date" +msgstr "" #. module: account_payment #: view:account.payment.populate.statement:0 msgid "ADD" -msgstr "Añadir" +msgstr "" #. module: account_payment -#: view:account.bank.statement:0 -msgid "Import payment lines" -msgstr "Importar líneas de pago" +#: model:ir.actions.act_window,name:account_payment.action_create_payment_order +msgid "Populate Payment" +msgstr "" #. module: account_payment #: field:account.move.line,amount_to_pay:0 msgid "Amount to pay" -msgstr "Importe a pagar" +msgstr "" #. module: account_payment #: field:payment.line,amount:0 msgid "Amount in Company Currency" -msgstr "Importe en la moneda de la compañía" +msgstr "" #. module: account_payment #: help:payment.line,partner_id:0 msgid "The Ordering Customer" -msgstr "El cliente que ordena" +msgstr "" #. module: account_payment #: model:ir.model,name:account_payment.model_account_payment_make_payment msgid "Account make payment" -msgstr "Contabilidad realizar pago" +msgstr "" #. module: account_payment #: report:payment.order:0 msgid "Invoice Ref" -msgstr "Ref. factura" +msgstr "" #. module: account_payment #: field:payment.line,name:0 msgid "Your Reference" -msgstr "Su referencia" - -#. module: account_payment -#: field:payment.order,mode:0 -msgid "Payment mode" -msgstr "Modo de pago" +msgstr "" #. module: account_payment #: view:payment.order:0 msgid "Payment order" -msgstr "Órdenes de pago" +msgstr "" #. module: account_payment #: view:payment.line:0 #: view:payment.order:0 msgid "General Information" -msgstr "Información General" +msgstr "" #. module: account_payment #: view:payment.order:0 #: selection:payment.order,state:0 msgid "Done" -msgstr "Realizado" +msgstr "" #. module: account_payment #: model:ir.model,name:account_payment.model_account_invoice msgid "Invoice" -msgstr "Factura" +msgstr "" #. module: account_payment #: field:payment.line,communication:0 msgid "Communication" -msgstr "Comunicación" +msgstr "" #. module: account_payment #: view:account.payment.make.payment:0 #: view:account.payment.populate.statement:0 -#: view:payment.order:0 #: view:payment.order.create:0 msgid "Cancel" -msgstr "Cancelar" +msgstr "" + +#. module: account_payment +#: field:payment.line,bank_id:0 +msgid "Destination Bank Account" +msgstr "" #. module: account_payment #: view:payment.line:0 #: view:payment.order:0 msgid "Information" -msgstr "Información" +msgstr "" #. module: account_payment -#: model:ir.actions.act_window,help:account_payment.action_payment_order_tree -msgid "" -"A payment order is a payment request from your company to pay a supplier " -"invoice or a customer credit note. Here you can register all payment orders " -"that should be done, keep track of all payment orders and mention the " -"invoice reference and the partner the payment should be done for." +#: model:ir.actions.report.xml,name:account_payment.payment_order1 +#: model:ir.model,name:account_payment.model_payment_order +#: view:payment.order:0 +msgid "Payment Order" msgstr "" -"Una órden de pago es una petición de pago que realiza su compañía para pagar " -"una factura de proveedor o un apunte de crédito de un cliente. Aquí puede " -"registrar todas las órdenes de pago pendientes y hacer seguimiento de las " -"órdenes e indicar la referencia de factura y la entidad a la cual pagar." #. module: account_payment #: help:payment.line,amount:0 msgid "Payment amount in the company currency" -msgstr "Importe pagado en la moneda de la compañía" +msgstr "" #. module: account_payment #: view:payment.order.create:0 msgid "Search Payment lines" -msgstr "Buscar líneas de pago" +msgstr "" #. module: account_payment #: field:payment.line,amount_currency:0 msgid "Amount in Partner Currency" -msgstr "Importe en la moneda de la empresa" +msgstr "" #. module: account_payment #: field:payment.line,communication2:0 msgid "Communication 2" -msgstr "Comunicación 2" +msgstr "" #. module: account_payment -#: field:payment.line,bank_id:0 -msgid "Destination Bank account" -msgstr "Cuenta bancaria destino" +#: field:payment.order,date_scheduled:0 +msgid "Scheduled Date" +msgstr "" #. module: account_payment #: view:account.payment.make.payment:0 msgid "Are you sure you want to make payment?" -msgstr "¿Está seguro que quiere realizar el pago?" +msgstr "" #. module: account_payment #: view:payment.mode:0 #: field:payment.mode,journal:0 msgid "Journal" -msgstr "Diario" +msgstr "" #. module: account_payment #: field:payment.mode,bank_id:0 msgid "Bank account" -msgstr "Cuenta bancaria" +msgstr "" #. module: account_payment #: view:payment.order:0 msgid "Confirm Payments" -msgstr "Confirmar pagos" +msgstr "" #. module: account_payment #: field:payment.line,company_currency:0 #: report:payment.order:0 msgid "Company Currency" -msgstr "Moneda de la compañía" +msgstr "" #. module: account_payment #: model:ir.ui.menu,name:account_payment.menu_main_payment #: view:payment.line:0 #: view:payment.order:0 msgid "Payment" -msgstr "Pago" +msgstr "" #. module: account_payment #: report:payment.order:0 msgid "Payment Order / Payment" -msgstr "Orden de pago / Pago" +msgstr "" #. module: account_payment #: field:payment.line,move_line_id:0 msgid "Entry line" -msgstr "Línea del asiento" +msgstr "" #. module: account_payment #: help:payment.line,communication:0 @@ -677,134 +619,73 @@ msgid "" "Used as the message between ordering customer and current company. Depicts " "'What do you want to say to the recipient about this order ?'" msgstr "" -"Se utiliza como mensaje entre el cliente que hace el pedido y la compañía " -"actual. Describe '¿Qué quiere decir al receptor sobre este pedido?'" #. module: account_payment #: field:payment.mode,name:0 msgid "Name" -msgstr "Nombre" +msgstr "" #. module: account_payment #: report:payment.order:0 msgid "Bank Account" -msgstr "Cuenta bancaria" +msgstr "" #. module: account_payment #: view:payment.line:0 #: view:payment.order:0 msgid "Entry Information" -msgstr "Información del asiento" +msgstr "" #. module: account_payment #: model:ir.model,name:account_payment.model_payment_order_create msgid "payment.order.create" -msgstr "pago.orden.crear" +msgstr "" #. module: account_payment #: field:payment.line,order_id:0 msgid "Order" -msgstr "Orden" +msgstr "" + +#. module: account_payment +#: view:payment.order:0 +msgid "Cancel Payments" +msgstr "" #. module: account_payment #: field:payment.order,total:0 msgid "Total" -msgstr "Total" +msgstr "" + +#. module: account_payment +#: code:addons/account_payment/wizard/account_payment_order.py:112 +#, python-format +msgid "Entry Lines" +msgstr "" #. module: account_payment #: view:account.payment.make.payment:0 #: model:ir.actions.act_window,name:account_payment.action_account_payment_make_payment msgid "Make Payment" -msgstr "Realizar pago" +msgstr "" #. module: account_payment -#: field:payment.line,partner_id:0 -#: report:payment.order:0 -msgid "Partner" -msgstr "Empresa" +#: help:account.invoice,amount_to_pay:0 +msgid "The amount which should be paid at the current date. " +msgstr "" #. module: account_payment -#: model:ir.actions.act_window,name:account_payment.action_create_payment_order -msgid "Populate Payment" -msgstr "Generar pago" +#: field:payment.order,date_prefered:0 +msgid "Preferred Date" +msgstr "" + +#. module: account_payment +#: view:account.payment.make.payment:0 +#: view:account.payment.populate.statement:0 +#: view:payment.order.create:0 +msgid "or" +msgstr "" #. module: account_payment #: help:payment.mode,bank_id:0 msgid "Bank Account for the Payment Mode" -msgstr "Cuenta bancaria para el modo de pago" - -#. module: account_payment -#: constraint:account.move.line:0 -msgid "You can not create move line on view account." -msgstr "No puede crear una línea de movimiento en una cuenta de tipo vista." - -#~ msgid "Execution date:" -#~ msgstr "Fecha de ejecución:" - -#~ msgid "Suitable bank types" -#~ msgstr "Tipos de banco adecuados" - -#~ msgid "Invalid XML for View Architecture!" -#~ msgstr "¡XML inválido para la definición de la vista!" - -#~ msgid "_Cancel" -#~ msgstr "_Cancelar" - -#~ msgid "Date" -#~ msgstr "Fecha" - -#~ msgid "Reference:" -#~ msgstr "Referencia:" - -#~ msgid "Maturity Date" -#~ msgstr "Fecha vencimiento" - -#~ msgid "Specify the Code for Payment Type" -#~ msgstr "Indique el código para el tipo de pago" - -#~ msgid "Code" -#~ msgstr "Código" - -#~ msgid "" -#~ "The Object name must start with x_ and not contain any special character !" -#~ msgstr "" -#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter " -#~ "especial!" - -#~ msgid "Pay" -#~ msgstr "Pagar" - -#~ msgid "Draft Payment Order" -#~ msgstr "Orden de pago borrador" - -#~ msgid "Cash Journal for the Payment Mode" -#~ msgstr "Diario de caja para el modo de pago" - -#~ msgid "_Search" -#~ msgstr "_Buscar" - -#, python-format -#~ msgid "Partner '+ line.partner_id.name+ ' has no bank account defined" -#~ msgstr "" -#~ "Empresa '+ line.partner_id.name+ ' no tiene una cuenta bancaria definida" - -#~ msgid "Payment Orders to Validate" -#~ msgstr "Órdenes de pago a validar" - -#~ msgid "Payment type" -#~ msgstr "Tipo de pago" - -#~ msgid "_Add" -#~ msgstr "_Añadir" - -#~ msgid "Select the Payment Type for the Payment Mode." -#~ msgstr "Seleccione el tipo de pago para el modo de pago." - -#~ msgid "Invalid model name in the action definition." -#~ msgstr "Nombre de modelo no válido en la definición de acción." - -#~ msgid "Populate payment" -#~ msgstr "Rellenar la orden" - -#~ msgid "Populate Statement with Payment lines" -#~ msgstr "Llenar un extracto con líneas de pago" +msgstr "" diff --git a/addons/account_sequence/i18n/mn.po b/addons/account_sequence/i18n/mn.po index 6ea31c74042..092d9c0b837 100644 --- a/addons/account_sequence/i18n/mn.po +++ b/addons/account_sequence/i18n/mn.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-07-06 05:32+0000\n" -"Last-Translator: erdenebold \n" +"PO-Revision-Date: 2014-01-11 14:04+0000\n" +"Last-Translator: gobi \n" "Language-Team: Mongolian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 05:59+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-01-12 05:48+0000\n" +"X-Generator: Launchpad (build 16890)\n" #. module: account_sequence #: view:account.sequence.installer:0 @@ -32,7 +32,7 @@ msgstr "Дотоод Дарааллын Дугаар" #. module: account_sequence #: help:account.sequence.installer,number_next:0 msgid "Next number of this sequence" -msgstr "" +msgstr "Энэ дарааллын дараагийн дугаар" #. module: account_sequence #: field:account.sequence.installer,number_next:0 @@ -47,7 +47,7 @@ msgstr "Өсөх тоон утга" #. module: account_sequence #: help:account.sequence.installer,number_increment:0 msgid "The next number of the sequence will be incremented by this number" -msgstr "" +msgstr "Дараагийн дугаарлалт нь энэ утгаар нэмэгдэнэ" #. module: account_sequence #: view:account.sequence.installer:0 @@ -57,17 +57,17 @@ msgstr "" #. module: account_sequence #: view:account.sequence.installer:0 msgid "Configure" -msgstr "" +msgstr "Тохируулга" #. module: account_sequence #: help:account.sequence.installer,suffix:0 msgid "Suffix value of the record for the sequence" -msgstr "" +msgstr "Дарааллын дугаарт тавигдах дагавар утга" #. module: account_sequence #: field:account.sequence.installer,company_id:0 msgid "Company" -msgstr "" +msgstr "Компани" #. module: account_sequence #: field:account.sequence.installer,padding:0 @@ -77,7 +77,7 @@ msgstr "" #. module: account_sequence #: model:ir.model,name:account_sequence.model_account_move_line msgid "Journal Items" -msgstr "" +msgstr "Журналын бичилт" #. module: account_sequence #: field:account.move,internal_sequence_number:0 @@ -95,7 +95,7 @@ msgstr "" #. module: account_sequence #: field:account.sequence.installer,name:0 msgid "Name" -msgstr "" +msgstr "Нэр" #. module: account_sequence #: field:account.journal,internal_sequence_id:0 @@ -105,7 +105,7 @@ msgstr "Дотоод дараалал" #. module: account_sequence #: help:account.sequence.installer,prefix:0 msgid "Prefix value of the record for the sequence" -msgstr "" +msgstr "Дараалалын дугаарт тавигдах угтвар утга" #. module: account_sequence #: model:ir.model,name:account_sequence.model_account_move @@ -125,7 +125,7 @@ msgstr "" #. module: account_sequence #: field:account.sequence.installer,prefix:0 msgid "Prefix" -msgstr "" +msgstr "Угтвар" #. module: account_sequence #: help:account.journal,internal_sequence_id:0 @@ -142,7 +142,7 @@ msgstr "" #. module: account_sequence #: model:ir.model,name:account_sequence.model_account_journal msgid "Journal" -msgstr "" +msgstr "Журнал" #. module: account_sequence #: view:account.sequence.installer:0 diff --git a/addons/account_test/i18n/fr.po b/addons/account_test/i18n/fr.po index c91f4e9a681..812078df63b 100644 --- a/addons/account_test/i18n/fr.po +++ b/addons/account_test/i18n/fr.po @@ -8,15 +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-03-21 01:46+0000\n" -"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) " -"\n" +"PO-Revision-Date: 2014-01-11 07:30+0000\n" +"Last-Translator: Philippe Latouche - Savoir-faire Linux \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 05:59+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-01-12 05:48+0000\n" +"X-Generator: Launchpad (build 16890)\n" #. module: account_test #: view:accounting.assert.test:0 @@ -143,7 +142,7 @@ msgstr "" #. module: account_test #: model:accounting.assert.test,name:account_test.account_test_08 msgid "Test 9 : Accounts and partners on account moves" -msgstr "" +msgstr "Test 9 : Comptes et partenaires dans les mouvements de compte" #. module: account_test #: model:ir.actions.act_window,name:account_test.action_accounting_assert @@ -166,12 +165,12 @@ msgstr "" #. module: account_test #: model:accounting.assert.test,name:account_test.account_test_06 msgid "Test 6 : Invoices status" -msgstr "" +msgstr "Test 6 : Statut des factures" #. module: account_test #: model:ir.model,name:account_test.model_accounting_assert_test msgid "accounting.assert.test" -msgstr "" +msgstr "accounting.assert.test" #. module: account_test #: model:accounting.assert.test,name:account_test.account_test_05 @@ -190,11 +189,13 @@ msgid "" "Check on bank statement that the Closing Balance = Starting Balance + sum of " "statement lines" msgstr "" +"Vérifie sur le relevé bancaire que le solde de fermeture = solde d'ouverture " +"+ somme des lignes de transaction" #. module: account_test #: model:accounting.assert.test,name:account_test.account_test_07 msgid "Test 8 : Closing balance on bank statements" -msgstr "" +msgstr "Test 8 : Solde de fermeture des relevés bancaires" #. module: account_test #: model:accounting.assert.test,name:account_test.account_test_03 diff --git a/addons/account_voucher/i18n/ja.po b/addons/account_voucher/i18n/ja.po index 000709673e8..6d6b2544395 100644 --- a/addons/account_voucher/i18n/ja.po +++ b/addons/account_voucher/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-11-21 02:43+0000\n" -"Last-Translator: Yoshi Tashiro \n" +"PO-Revision-Date: 2014-01-11 12:38+0000\n" +"Last-Translator: hiro TAKADA \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-11-22 06:02+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-01-12 05:48+0000\n" +"X-Generator: Launchpad (build 16890)\n" #. module: account_voucher #: field:account.bank.statement.line,voucher_id:0 @@ -171,6 +171,12 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" クリックして購入領収書を登録します。\n" +"

\n" +" 購入領収書が確認されると、これに関連する仕入先支払を記録できます。\n" +"

\n" +" " #. module: account_voucher #: view:account.voucher:0 @@ -285,6 +291,12 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" クリックして販売領収書を作成します。\n" +"

\n" +" 販売領収書が確認されると、これに関連する顧客入金を記録できます。\n" +"

\n" +" " #. module: account_voucher #: help:account.voucher,message_unread:0 @@ -474,6 +486,12 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" クリックして新しい仕入先への支払いを作成してください。\n" +"

\n" +" OpenERPは仕入先への支払いと残高の追跡を簡単にします。\n" +"

\n" +" " #. module: account_voucher #: view:account.voucher:0 @@ -581,6 +599,13 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" クリックして新しい入金を登録します。\n" +"

\n" +" " +"顧客と支払い方法を入力した後に手動で入金記録を作成するか、OpenERPが自動で請求書や領収書と入金の調整を提案します。\n" +"

\n" +" " #. module: account_voucher #: field:account.config.settings,expense_currency_exchange_account_id:0 diff --git a/addons/anonymization/i18n/fr.po b/addons/anonymization/i18n/fr.po index ae73a3ba6b9..e2b6afffe00 100644 --- a/addons/anonymization/i18n/fr.po +++ b/addons/anonymization/i18n/fr.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: 2014-01-11 07:38+0000\n" +"Last-Translator: Philippe Latouche - Savoir-faire Linux \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:00+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-01-12 05:48+0000\n" +"X-Generator: Launchpad (build 16890)\n" #. module: anonymization #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard @@ -35,7 +35,7 @@ msgstr "ir.model.fields.anonymization.migration.fix" #. module: anonymization #: field:ir.model.fields.anonymization.migration.fix,target_version:0 msgid "Target Version" -msgstr "" +msgstr "Version visée" #. module: anonymization #: selection:ir.model.fields.anonymization.migration.fix,query_type:0 @@ -50,6 +50,10 @@ msgid "" "are anonymized, while some fields are not anonymized. You should try to " "solve this problem before trying to create, write or delete fields." msgstr "" +"L'anonymisation de la base de données est présentement dans un état " +"instable. Certains champs sont anonymes, alors que d'autres ne le sont pas. " +"Vous devriez essayez de résoudre le problème avant de créer, écrire ou " +"supprimer des champs." #. module: anonymization #: field:ir.model.fields.anonymization,field_name:0 @@ -84,6 +88,8 @@ msgid "" "Before executing the anonymization process, you should make a backup of your " "database." msgstr "" +"Avant d'exécuter le processus d'anonymisation, vous devriez faire une copie " +"de sauvegarde de la base de données." #. module: anonymization #: field:ir.model.fields.anonymization.history,state:0 @@ -141,6 +147,8 @@ msgid "" "This is the file created by the anonymization process. It should have the " "'.pickle' extention." msgstr "" +"Ceci est le fichier créé par le processus d'anonymisation. Il devrait avoir " +"l'extension \".pickle\"." #. module: anonymization #: field:ir.model.fields.anonymization.history,date:0 @@ -199,6 +207,8 @@ msgid "" "It is not possible to reverse the anonymization process without supplying " "the anonymization export file." msgstr "" +"Il n'est pas possible de renverser le processus d'anonymisation sans fournir " +"le fichier d'export d'anonymisation." #. module: anonymization #: field:ir.model.fields.anonymize.wizard,summary:0 @@ -219,6 +229,9 @@ msgid "" "are anonymized, while some fields are not anonymized. You should try to " "solve this problem before trying to do anything." msgstr "" +"L'anonymisation de la base de données est présentement dans un état " +"instable. Certains champs sont anonymes, alors que d'autres ne le sont pas. " +"Vous devriez essayez de résoudre le problème avant de faire quoi que ce soit." #. module: anonymization #: selection:ir.model.fields.anonymize.wizard,state:0 diff --git a/addons/anonymization/i18n/mn.po b/addons/anonymization/i18n/mn.po index 42285e476ab..fd375fa651c 100644 --- a/addons/anonymization/i18n/mn.po +++ b/addons/anonymization/i18n/mn.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-02-23 12:07+0000\n" -"Last-Translator: Мөнхөө \n" +"PO-Revision-Date: 2014-01-11 14:04+0000\n" +"Last-Translator: gobi \n" "Language-Team: Mongolian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:00+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-01-12 05:48+0000\n" +"X-Generator: Launchpad (build 16890)\n" #. module: anonymization #: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard @@ -89,7 +89,7 @@ msgstr "" #: field:ir.model.fields.anonymization.history,state:0 #: field:ir.model.fields.anonymize.wizard,state:0 msgid "Status" -msgstr "" +msgstr "Төлөв" #. module: anonymization #: field:ir.model.fields.anonymization.history,direction:0 @@ -122,7 +122,7 @@ msgstr "" #. module: anonymization #: field:ir.model.fields.anonymization,state:0 msgid "unknown" -msgstr "" +msgstr "үл мэдэгдэх" #. module: anonymization #: code:addons/anonymization/anonymization.py:448 @@ -150,7 +150,7 @@ msgstr "Огноо" #. module: anonymization #: field:ir.model.fields.anonymize.wizard,file_export:0 msgid "Export" -msgstr "" +msgstr "Экспорт" #. module: anonymization #: view:ir.model.fields.anonymize.wizard:0 @@ -203,7 +203,7 @@ msgstr "" #. module: anonymization #: field:ir.model.fields.anonymize.wizard,summary:0 msgid "Summary" -msgstr "" +msgstr "Хураангуй" #. module: anonymization #: view:ir.model.fields.anonymization:0 @@ -250,7 +250,7 @@ msgstr "Нэр мэдэгдэхгүй болгосон түүх" #. module: anonymization #: field:ir.model.fields.anonymization.migration.fix,model_name:0 msgid "Model" -msgstr "" +msgstr "Модел" #. module: anonymization #: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_history @@ -287,7 +287,7 @@ msgstr "Файлын нэр" #. module: anonymization #: field:ir.model.fields.anonymization.migration.fix,sequence:0 msgid "Sequence" -msgstr "" +msgstr "Дараалал" #. module: anonymization #: selection:ir.model.fields.anonymization.history,direction:0 diff --git a/addons/base_action_rule/i18n/fr.po b/addons/base_action_rule/i18n/fr.po index 60baf32bbf1..ee0520a2a45 100644 --- a/addons/base_action_rule/i18n/fr.po +++ b/addons/base_action_rule/i18n/fr.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-07-28 18:37+0000\n" -"Last-Translator: Dewinne Julien \n" +"PO-Revision-Date: 2014-01-11 07:44+0000\n" +"Last-Translator: Philippe Latouche - Savoir-faire Linux \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:01+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-01-12 05:48+0000\n" +"X-Generator: Launchpad (build 16890)\n" #. module: base_action_rule #: selection:base.action.rule.lead.test,state:0 @@ -125,6 +125,8 @@ msgstr "Règle d'action" msgid "" "If present, this condition must be satisfied after the update of the record." msgstr "" +"Si présent, la condition devra être satisfaite après la mise à jour de " +"l'enregistrement." #. module: base_action_rule #: view:base.action.rule:0 @@ -134,7 +136,7 @@ msgstr "Champs à modifier" #. module: base_action_rule #: view:base.action.rule:0 msgid "The filter must therefore be available in this page." -msgstr "" +msgstr "Le filtre doit par conséquent être disponible dans cette page." #. module: base_action_rule #: field:base.action.rule,filter_id:0 @@ -149,7 +151,7 @@ msgstr "Heures" #. module: base_action_rule #: view:base.action.rule:0 msgid "To create a new filter:" -msgstr "" +msgstr "Pour créer un nouveau filtre :" #. module: base_action_rule #: field:base.action.rule,active:0 @@ -224,12 +226,12 @@ msgstr "Type de délai" #. module: base_action_rule #: view:base.action.rule:0 msgid "Server actions to run" -msgstr "" +msgstr "Actions du serveur à exécuter" #. module: base_action_rule #: help:base.action.rule,active:0 msgid "When unchecked, the rule is hidden and will not be executed." -msgstr "" +msgstr "Lorsque décoché, la règle est cachée et ne sera pas exécutée." #. module: base_action_rule #: selection:base.action.rule.lead.test,state:0 @@ -254,13 +256,15 @@ msgstr "Minutes" #. module: base_action_rule #: field:base.action.rule,model_id:0 msgid "Related Document Model" -msgstr "" +msgstr "Modèle de document connexe" #. module: base_action_rule #: help:base.action.rule,filter_pre_id:0 msgid "" "If present, this condition must be satisfied before the update of the record." msgstr "" +"Si présent, la condition doit être satisfaite avant la mise à jour de " +"l'enregistrement." #. module: base_action_rule #: field:base.action.rule,sequence:0 diff --git a/addons/base_setup/i18n/fr.po b/addons/base_setup/i18n/fr.po index 8e181b53d74..f16862d9d5b 100644 --- a/addons/base_setup/i18n/fr.po +++ b/addons/base_setup/i18n/fr.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-12-31 08:41+0000\n" -"Last-Translator: WANTELLET Sylvain \n" +"PO-Revision-Date: 2014-01-11 07:43+0000\n" +"Last-Translator: Florian Hatat \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-01 05:43+0000\n" -"X-Generator: Launchpad (build 16877)\n" +"X-Launchpad-Export-Date: 2014-01-12 05:48+0000\n" +"X-Generator: Launchpad (build 16890)\n" #. module: base_setup #: view:sale.config.settings:0 @@ -222,6 +222,9 @@ msgid "" "You can\n" " launch the OpenERP Server with the option" msgstr "" +"Le portail public n'est accessible qu'en mode base de données unique. Vous " +"pouvez\n" +" lancer le serveur OpenERP avec l'option" #. module: base_setup #: view:base.config.settings:0 @@ -347,6 +350,9 @@ msgid "" " Once activated, the login page will be " "replaced by the public website." msgstr "" +"pour cela.\n" +" Une fois activée, la page " +"d'authentification sera remplacée par la page Web publique." #. module: base_setup #: field:base.config.settings,module_share:0 diff --git a/addons/claim_from_delivery/i18n/mn.po b/addons/claim_from_delivery/i18n/mn.po index 9f93c79ac3a..3e548a303fc 100644 --- a/addons/claim_from_delivery/i18n/mn.po +++ b/addons/claim_from_delivery/i18n/mn.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-02-06 09:15+0000\n" -"Last-Translator: Мөнхөө \n" +"PO-Revision-Date: 2014-01-11 14:05+0000\n" +"Last-Translator: gobi \n" "Language-Team: Mongolian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:03+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-01-12 05:48+0000\n" +"X-Generator: Launchpad (build 16890)\n" #. module: claim_from_delivery #: view:stock.picking.out:0 @@ -25,9 +25,9 @@ msgstr "Нэхэмжлэл" #. module: claim_from_delivery #: model:res.request.link,name:claim_from_delivery.request_link_claim_from_delivery msgid "Delivery Order" -msgstr "" +msgstr "Хүргэлтийн захиалга" #. module: claim_from_delivery #: model:ir.actions.act_window,name:claim_from_delivery.action_claim_from_delivery msgid "Claim From Delivery" -msgstr "" +msgstr "Хүргэлтээс үүссэн гомдол" diff --git a/addons/crm/i18n/ja.po b/addons/crm/i18n/ja.po index 6b83b823d62..b47ba631e8d 100644 --- a/addons/crm/i18n/ja.po +++ b/addons/crm/i18n/ja.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2014-01-07 16:56+0000\n" -"PO-Revision-Date: 2013-11-10 09:52+0000\n" -"Last-Translator: Yoshi Tashiro \n" +"PO-Revision-Date: 2014-01-12 14:31+0000\n" +"Last-Translator: hiro TAKADA \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: 2014-01-08 05:39+0000\n" -"X-Generator: Launchpad (build 16877)\n" +"X-Launchpad-Export-Date: 2014-01-13 05:59+0000\n" +"X-Generator: Launchpad (build 16890)\n" #. module: crm #: view:crm.lead.report:0 @@ -2325,7 +2325,7 @@ msgstr "キャンセル済" #. module: crm #: view:crm.lead:0 msgid "Street..." -msgstr "" +msgstr "番地…" #. module: crm #: field:crm.lead.report,date_closed:0 diff --git a/addons/delivery/i18n/mn.po b/addons/delivery/i18n/mn.po index be43b248585..c2e1b668fca 100644 --- a/addons/delivery/i18n/mn.po +++ b/addons/delivery/i18n/mn.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-02-18 08:01+0000\n" -"Last-Translator: Dulguun \n" +"PO-Revision-Date: 2014-01-11 14:06+0000\n" +"Last-Translator: gobi \n" "Language-Team: Mongolian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:07+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-01-12 05:48+0000\n" +"X-Generator: Launchpad (build 16890)\n" #. module: delivery #: report:sale.shipping:0 @@ -108,6 +108,7 @@ msgstr "Дэлгэрэнгүй үнэлэлт" #: help:delivery.grid,sequence:0 msgid "Gives the sequence order when displaying a list of delivery grid." msgstr "" +"Хүргэлтийн хүснэгтийн харуулахад хэрэглэгдэх дарааллын эрэмбийг өгнө." #. module: delivery #: view:delivery.grid:0 diff --git a/addons/document_page/i18n/mn.po b/addons/document_page/i18n/mn.po index 628746e7b60..3da236d8efd 100644 --- a/addons/document_page/i18n/mn.po +++ b/addons/document_page/i18n/mn.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-02-20 07:53+0000\n" -"Last-Translator: Мөнхөө \n" +"PO-Revision-Date: 2014-01-11 14:09+0000\n" +"Last-Translator: gobi \n" "Language-Team: Mongolian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:07+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-01-12 05:48+0000\n" +"X-Generator: Launchpad (build 16890)\n" #. module: document_page #: view:document.page:0 @@ -29,7 +29,7 @@ msgstr "Ангилал" #: view:document.page:0 #: field:document.page,write_uid:0 msgid "Last Contributor" -msgstr "" +msgstr "Сүүлийн Хувь Нэмэр оруулагч" #. module: document_page #: view:document.page:0 @@ -51,7 +51,7 @@ msgstr "Баримтын Хуудас" #. module: document_page #: model:ir.actions.act_window,name:document_page.action_related_page_history msgid "Page History" -msgstr "" +msgstr "Хуудасны Түүх" #. module: document_page #: view:document.page:0 @@ -64,7 +64,7 @@ msgstr "Агуулга" #. module: document_page #: view:document.page:0 msgid "Group By..." -msgstr "" +msgstr "Бүлэглэх..." #. module: document_page #: view:document.page:0 @@ -85,12 +85,12 @@ msgstr "Гарчиг" #. module: document_page #: model:ir.model,name:document_page.model_document_page_create_menu msgid "Wizard Create Menu" -msgstr "" +msgstr "Меню үүсгэх харилцах цонх" #. module: document_page #: field:document.page,type:0 msgid "Type" -msgstr "" +msgstr "Төрөл" #. module: document_page #: model:ir.model,name:document_page.model_wizard_document_page_history_show_diff @@ -105,7 +105,7 @@ msgstr "" #. module: document_page #: view:document.page.create.menu:0 msgid "or" -msgstr "" +msgstr "эсвэл" #. module: document_page #: help:document.page,type:0 @@ -144,7 +144,7 @@ msgstr "Огноо" #: model:ir.actions.act_window,name:document_page.action_view_wiki_show_diff_values #: view:wizard.document.page.history.show_diff:0 msgid "Difference" -msgstr "" +msgstr "Зөрүү" #. module: document_page #: model:ir.actions.act_window,name:document_page.action_page @@ -156,12 +156,12 @@ msgstr "Хуудсууд" #. module: document_page #: model:ir.ui.menu,name:document_page.menu_category msgid "Categories" -msgstr "" +msgstr "Ангилалууд" #. module: document_page #: view:document.page:0 msgid "Name" -msgstr "" +msgstr "Нэр" #. module: document_page #: field:document.page.create.menu,menu_parent_id:0 diff --git a/addons/email_template/i18n/fr.po b/addons/email_template/i18n/fr.po index 2611ed4f14b..43850ba6e78 100644 --- a/addons/email_template/i18n/fr.po +++ b/addons/email_template/i18n/fr.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-22 07:36+0000\n" +"PO-Revision-Date: 2014-01-11 07:46+0000\n" "Last-Translator: Florian Hatat \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:08+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-01-12 05:48+0000\n" +"X-Generator: Launchpad (build 16890)\n" #. module: email_template #: field:email.template,email_from:0 diff --git a/addons/email_template/i18n/ja.po b/addons/email_template/i18n/ja.po index ad2180fb126..c082dff84e8 100644 --- a/addons/email_template/i18n/ja.po +++ b/addons/email_template/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: 2014-01-12 14:11+0000\n" +"Last-Translator: hiro TAKADA \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-11-21 06:08+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-01-13 05:59+0000\n" +"X-Generator: Launchpad (build 16890)\n" #. module: email_template #: field:email.template,email_from:0 @@ -43,7 +43,7 @@ msgstr "オプトアウト" #. module: email_template #: view:email.template:0 msgid "Email contents (in raw HTML format)" -msgstr "" +msgstr "Eメールの内容(未加工のHTML形式)" #. module: email_template #: help:email.template,email_from:0 @@ -88,7 +88,7 @@ msgstr "報告書ファイル名" #: field:email.template,email_to:0 #: field:email_template.preview,email_to:0 msgid "To (Emails)" -msgstr "" +msgstr "宛先(Eメール)" #. module: email_template #: view:email.template:0 @@ -212,7 +212,7 @@ msgstr "" #. module: email_template #: view:email.template:0 msgid "Dynamic Value Builder" -msgstr "" +msgstr "動的値ビルダ" #. module: email_template #: model:ir.actions.act_window,name:email_template.wizard_email_template_preview @@ -283,7 +283,7 @@ msgstr "氏名" #: field:email.template,lang:0 #: field:email_template.preview,lang:0 msgid "Language" -msgstr "" +msgstr "言語" #. module: email_template #: model:ir.model,name:email_template.model_email_template_preview @@ -305,7 +305,7 @@ msgstr "" #: field:email.template,copyvalue:0 #: field:email_template.preview,copyvalue:0 msgid "Placeholder Expression" -msgstr "" +msgstr "プレースホルダ表現" #. module: email_template #: field:email.template,sub_object:0 @@ -368,7 +368,7 @@ msgstr "" #: field:email.template,email_recipients:0 #: field:email_template.preview,email_recipients:0 msgid "To (Partners)" -msgstr "" +msgstr "宛先(取引先)" #. module: email_template #: field:email.template,auto_delete:0 @@ -393,7 +393,7 @@ msgstr "関連する文書モデル" #. module: email_template #: view:email.template:0 msgid "Addressing" -msgstr "" +msgstr "住所" #. module: email_template #: help:email.template,email_recipients:0 @@ -424,7 +424,7 @@ msgstr "写し(CC)" #: field:email.template,model_id:0 #: field:email_template.preview,model_id:0 msgid "Applies to" -msgstr "" +msgstr "適用" #. module: email_template #: field:email.template,sub_model_object_field:0 @@ -490,7 +490,7 @@ msgstr "取引先" #: field:email.template,null_value:0 #: field:email_template.preview,null_value:0 msgid "Default Value" -msgstr "" +msgstr "デフォルト値" #. module: email_template #: help:email.template,attachment_ids:0 @@ -509,7 +509,7 @@ msgstr "メッセージのリッチテキスト / HTML 版" #. module: email_template #: view:email.template:0 msgid "Contents" -msgstr "" +msgstr "内容" #. module: email_template #: field:email.template,subject:0 diff --git a/addons/fleet/i18n/mn.po b/addons/fleet/i18n/mn.po index 242b88eaee4..7441832c2ea 100644 --- a/addons/fleet/i18n/mn.po +++ b/addons/fleet/i18n/mn.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-03-13 09:07+0000\n" -"Last-Translator: wsubuntu \n" +"PO-Revision-Date: 2014-01-11 14:08+0000\n" +"Last-Translator: gobi \n" "Language-Team: Mongolian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:09+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-01-12 05:48+0000\n" +"X-Generator: Launchpad (build 16890)\n" #. module: fleet #: selection:fleet.vehicle,fuel_type:0 @@ -450,7 +450,7 @@ msgstr "" #. module: fleet #: model:ir.model,name:fleet.model_fleet_service_type msgid "Type of services available on a vehicle" -msgstr "" +msgstr "Тээврийн хэрэгслийн боломжит үйлчилгээний төрөл" #. module: fleet #: model:ir.actions.act_window,name:fleet.fleet_vehicle_service_types_act diff --git a/addons/google_base_account/i18n/mn.po b/addons/google_base_account/i18n/mn.po index a9d1ffe286b..4d37ee85424 100644 --- a/addons/google_base_account/i18n/mn.po +++ b/addons/google_base_account/i18n/mn.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-02-07 07:17+0000\n" -"Last-Translator: Tenuun Khangaitan \n" +"PO-Revision-Date: 2014-01-11 14:08+0000\n" +"Last-Translator: gobi \n" "Language-Team: Mongolian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:09+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-01-12 05:48+0000\n" +"X-Generator: Launchpad (build 16890)\n" #. module: google_base_account #: field:res.users,gmail_user:0 @@ -78,7 +78,7 @@ msgstr "Нэвтрэлтэд алдаа гарлаа. Нэвтрэх нэр бо #. module: google_base_account #: view:google.login:0 msgid "e.g. user@gmail.com" -msgstr "" +msgstr "e.g. user@gmail.com" #. module: google_base_account #: code:addons/google_base_account/wizard/google_login.py:29 diff --git a/addons/google_docs/i18n/mn.po b/addons/google_docs/i18n/mn.po index 03467e5cf7a..9c37f030ab2 100644 --- a/addons/google_docs/i18n/mn.po +++ b/addons/google_docs/i18n/mn.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-02-19 02:49+0000\n" -"Last-Translator: Amar Zayasaikhan \n" +"PO-Revision-Date: 2014-01-11 14:08+0000\n" +"Last-Translator: gobi \n" "Language-Team: Mongolian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:09+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-01-12 05:48+0000\n" +"X-Generator: Launchpad (build 16890)\n" #. module: google_docs #: code:addons/google_docs/google_docs.py:167 @@ -57,7 +57,7 @@ msgstr "" #: code:addons/google_docs/static/src/xml/gdocs.xml:6 #, python-format msgid "Add Google Doc..." -msgstr "" +msgstr "Google Баримт Нэмэх..." #. module: google_docs #: view:google.docs.config:0 diff --git a/addons/hr_expense/i18n/mn.po b/addons/hr_expense/i18n/mn.po index 6e565349548..0b3594fbdcc 100644 --- a/addons/hr_expense/i18n/mn.po +++ b/addons/hr_expense/i18n/mn.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-04-05 11:43+0000\n" -"Last-Translator: wsubuntu \n" +"PO-Revision-Date: 2014-01-11 14:09+0000\n" +"Last-Translator: gobi \n" "Language-Team: Mongolian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:11+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-01-12 05:48+0000\n" +"X-Generator: Launchpad (build 16890)\n" #. module: hr_expense #: view:hr.expense.expense:0 @@ -100,7 +100,7 @@ msgstr "Уншаагүй зурвасууд" #. module: hr_expense #: selection:hr.expense.expense,state:0 msgid "Waiting Payment" -msgstr "" +msgstr "Төлбөрийг Хүлээж Буй" #. module: hr_expense #: field:hr.expense.expense,company_id:0 diff --git a/addons/hr_holidays/i18n/fr.po b/addons/hr_holidays/i18n/fr.po index 5353e24a278..40f2c7b0bba 100644 --- a/addons/hr_holidays/i18n/fr.po +++ b/addons/hr_holidays/i18n/fr.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-04-23 12:12+0000\n" -"Last-Translator: Bertrand Rétif \n" +"PO-Revision-Date: 2014-01-11 07:46+0000\n" +"Last-Translator: Florian Hatat \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:12+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-01-12 05:48+0000\n" +"X-Generator: Launchpad (build 16890)\n" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 diff --git a/addons/hr_payroll/i18n/fr.po b/addons/hr_payroll/i18n/fr.po index d6eb0be91e2..fd0ca09c3b2 100644 --- a/addons/hr_payroll/i18n/fr.po +++ b/addons/hr_payroll/i18n/fr.po @@ -8,15 +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-07-13 22:15+0000\n" -"Last-Translator: Maxime Chambreuil (http://www.savoirfairelinux.com) " -"\n" +"PO-Revision-Date: 2014-01-11 07:47+0000\n" +"Last-Translator: Florian Hatat \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:12+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-01-12 05:48+0000\n" +"X-Generator: Launchpad (build 16890)\n" #. module: hr_payroll #: field:hr.payslip.line,condition_select:0 diff --git a/addons/hr_payroll/i18n/hr.po b/addons/hr_payroll/i18n/hr.po index 3f069ed23e8..40a0a4a2c60 100644 --- a/addons/hr_payroll/i18n/hr.po +++ b/addons/hr_payroll/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: 2014-01-10 12:36+0000\n" +"Last-Translator: Davor Bojkić \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-11-21 06:12+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-01-11 06:26+0000\n" +"X-Generator: Launchpad (build 16890)\n" #. module: hr_payroll #: field:hr.payslip.line,condition_select:0 @@ -31,14 +31,14 @@ msgstr "Mjesečno" #. module: hr_payroll #: field:hr.payslip.line,rate:0 msgid "Rate (%)" -msgstr "" +msgstr "Stopa (%)" #. module: hr_payroll #: view:hr.payslip.line:0 #: model:ir.model,name:hr_payroll.model_hr_salary_rule_category #: report:paylip.details:0 msgid "Salary Rule Category" -msgstr "" +msgstr "Kategorije pravila obračuna" #. module: hr_payroll #: field:hr.payslip.worked_days,number_of_days:0 @@ -75,7 +75,7 @@ msgstr "Ulazi" #: field:hr.payslip.line,parent_rule_id:0 #: field:hr.salary.rule,parent_rule_id:0 msgid "Parent Salary Rule" -msgstr "" +msgstr "Nadređeno pravilo obračuna" #. module: hr_payroll #: view:hr.employee:0 @@ -85,7 +85,7 @@ msgstr "" #: field:hr.payslip.run,slip_ids:0 #: model:ir.actions.act_window,name:hr_payroll.act_hr_employee_payslip_list msgid "Payslips" -msgstr "" +msgstr "Isplatni listići" #. module: hr_payroll #: field:hr.payroll.structure,parent_id:0 @@ -130,7 +130,7 @@ msgstr "do" #: view:hr.payslip.run:0 #: model:ir.model,name:hr_payroll.model_hr_payslip_run msgid "Payslip Batches" -msgstr "" +msgstr "Obračuni plaća" #. module: hr_payroll #: view:hr.payslip.employees:0 @@ -179,7 +179,7 @@ msgstr "Ukupno:" #. module: hr_payroll #: model:ir.actions.act_window,name:hr_payroll.act_children_salary_rules msgid "All Children Rules" -msgstr "" +msgstr "Sva podređena pravila" #. module: hr_payroll #: view:hr.payslip:0 @@ -272,7 +272,7 @@ msgstr "Veza" #. module: hr_payroll #: view:hr.payslip:0 msgid "Draft Slip" -msgstr "" +msgstr "Nacrt listića" #. module: hr_payroll #: code:addons/hr_payroll/hr_payroll.py:432 @@ -373,7 +373,7 @@ msgstr "" #. module: hr_payroll #: view:hr.payslip.employees:0 msgid "Payslips by Employees" -msgstr "" +msgstr "Isplate po djelatnicima" #. module: hr_payroll #: selection:hr.contract,schedule_pay:0 @@ -396,7 +396,7 @@ msgstr "" #. module: hr_payroll #: view:hr.salary.rule:0 msgid "Search Salary Rule" -msgstr "" +msgstr "Pretraži praila obračuna" #. module: hr_payroll #: field:hr.payslip,employee_id:0 @@ -473,7 +473,7 @@ msgstr "Odbijeno" #: model:ir.actions.act_window,name:hr_payroll.action_salary_rule_form #: model:ir.ui.menu,name:hr_payroll.menu_action_hr_salary_rule_form msgid "Salary Rules" -msgstr "" +msgstr "Pravila izračuna plaće" #. module: hr_payroll #: code:addons/hr_payroll/hr_payroll.py:341 @@ -556,13 +556,13 @@ msgstr "Broj sati" #. module: hr_payroll #: view:hr.payslip:0 msgid "PaySlip Batch" -msgstr "" +msgstr "Obračun plaća" #. module: hr_payroll #: field:hr.payslip.line,condition_range_min:0 #: field:hr.salary.rule,condition_range_min:0 msgid "Minimum Range" -msgstr "" +msgstr "Minimalni raspon" #. module: hr_payroll #: field:hr.payslip.line,child_ids:0 @@ -612,7 +612,7 @@ msgstr "Knjižno odobrenje" #: view:hr.payslip:0 #: model:ir.actions.act_window,name:hr_payroll.act_payslip_lines msgid "Payslip Computation Details" -msgstr "" +msgstr "Detalji obračuna" #. module: hr_payroll #: help:hr.payslip.line,appears_on_payslip:0 @@ -630,7 +630,7 @@ msgstr "" #: model:ir.actions.act_window,name:hr_payroll.action_hr_salary_rule_category #: model:ir.ui.menu,name:hr_payroll.menu_hr_salary_rule_category msgid "Salary Rule Categories" -msgstr "" +msgstr "Kategorije pravila obračuna" #. module: hr_payroll #: view:hr.payslip:0 diff --git a/addons/mail/i18n/ja.po b/addons/mail/i18n/ja.po index a1671ee4245..6b6f81ea5d0 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-11-22 06:15+0000\n" -"Last-Translator: Yoshi Tashiro \n" +"PO-Revision-Date: 2014-01-13 05:53+0000\n" +"Last-Translator: hiro TAKADA \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-11-23 06:26+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-01-13 05:59+0000\n" +"X-Generator: Launchpad (build 16890)\n" #. module: mail #: view:mail.followers:0 @@ -151,7 +151,7 @@ msgstr "フォロワー追加" #. module: mail #: field:mail.message.subtype,parent_id:0 msgid "Parent" -msgstr "" +msgstr "親" #. module: mail #: help:res.partner,notification_email_send:0 @@ -163,6 +163,11 @@ msgid "" "discussions\n" "- All Messages: for every notification you receive in your Inbox" msgstr "" +"あなたの受信トレイに新しいメッセージを受信するためのポリシー\n" +"- 通知なし：メールは送信されません\n" +"- 受信メールのみ：メールを介してシステムが受信したメッセージ\n" +"- 受信メールとディスカッション：内部の議論とともに受信したメール\n" +"- すべてのメッセージ：受信トレイに受信したすべての通知" #. module: mail #: field:mail.group,message_unread:0 @@ -480,7 +485,7 @@ msgstr "" #. module: mail #: field:mail.message.subtype,relation_field:0 msgid "Relation field" -msgstr "" +msgstr "関連フィールド" #. module: mail #: selection:mail.compose.message,type:0 @@ -870,7 +875,7 @@ msgstr "" #. module: mail #: model:ir.model,name:mail.model_mail_message_subtype msgid "Message subtypes" -msgstr "" +msgstr "メッセージのサブタイプ" #. module: mail #. openerp-web @@ -1159,6 +1164,8 @@ msgid "" "subtypes allow to precisely tune the notifications the user want to receive " "on its wall." msgstr "" +"メッセージのサブタイプはメッセージ、特にシステム通知に対してより正確なタイプを与えます。たとえば、新規レコード(新規)またはプロセスのステージ変更(ステー" +"ジ変更)に関連する通知ができます。メッセージのサブタイプはユーザが受信したい通知の壁を正確にチューンできます。" #. module: mail #: field:res.partner,notification_email_send:0 @@ -1243,7 +1250,7 @@ msgstr "" #. module: mail #: field:mail.message.subtype,default:0 msgid "Default" -msgstr "" +msgstr "デフォルト" #. module: mail #: model:ir.model,name:mail.model_res_users @@ -1512,7 +1519,7 @@ msgstr "メッセージ識別番号" #: field:mail.group,description:0 #: field:mail.message.subtype,description:0 msgid "Description" -msgstr "" +msgstr "説明" #. module: mail #: model:ir.model,name:mail.model_mail_followers @@ -1699,7 +1706,7 @@ msgstr "メッセージング" #: view:mail.alias:0 #: field:mail.message.subtype,res_model:0 msgid "Model" -msgstr "" +msgstr "モデル" #. module: mail #. openerp-web @@ -1736,7 +1743,7 @@ msgstr "" #: help:mail.message.subtype,res_model:0 msgid "" "Model the subtype applies to. If False, this subtype applies to all models." -msgstr "" +msgstr "サブタイプが適用されるモデルです。そうでない場合、このサブタイプはすべてのモデルに適用されます。" #. module: mail #. openerp-web @@ -1835,7 +1842,7 @@ msgstr "" #: model:ir.actions.act_window,name:mail.action_view_message_subtype #: model:ir.ui.menu,name:mail.menu_message_subtype msgid "Subtypes" -msgstr "" +msgstr "サブタイプ" #. module: mail #: model:ir.model,name:mail.model_mail_alias diff --git a/addons/portal/i18n/ja.po b/addons/portal/i18n/ja.po index 5c645e1b06e..8d32a0fe7e7 100644 --- a/addons/portal/i18n/ja.po +++ b/addons/portal/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: 2013-11-22 06:12+0000\n" -"Last-Translator: Yoshi Tashiro \n" +"PO-Revision-Date: 2014-01-12 15:54+0000\n" +"Last-Translator: hiro TAKADA \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-11-23 06:26+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-01-13 05:59+0000\n" +"X-Generator: Launchpad (build 16890)\n" #. module: portal #: view:portal.payment.acquirer:0 @@ -436,7 +436,7 @@ msgstr "掲示板" #. module: portal #: help:res.groups,is_portal:0 msgid "If checked, this group is usable as a portal." -msgstr "" +msgstr "チェックすると、このグループはポータルとして使用できます。" #. module: portal #: view:portal.payment.acquirer:0 diff --git a/addons/stock/i18n/ja.po b/addons/stock/i18n/ja.po index 888697ccd4c..249c2ade82b 100644 --- a/addons/stock/i18n/ja.po +++ b/addons/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:36+0000\n" -"PO-Revision-Date: 2014-01-10 03:13+0000\n" +"PO-Revision-Date: 2014-01-10 14:38+0000\n" "Last-Translator: hiro TAKADA \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: 2014-01-10 05:32+0000\n" -"X-Generator: Launchpad (build 16884)\n" +"X-Launchpad-Export-Date: 2014-01-11 06:26+0000\n" +"X-Generator: Launchpad (build 16890)\n" #. module: stock #: field:stock.inventory.line.split,line_exist_ids:0 @@ -835,6 +835,8 @@ msgid "" " For instance, you can sell pieces of meat that you invoice " "based on their weight." msgstr "" +"請求とは異なる単位で製品を販売できます。\n" +" たとえば、重量で請求する肉を小片で販売できます。" #. module: stock #: field:product.template,property_stock_procurement:0 @@ -1144,7 +1146,7 @@ msgstr "" #. module: stock #: field:stock.config.settings,group_uos:0 msgid "Invoice products in a different unit of measure than the sales order" -msgstr "" +msgstr "受注とは異なる単位で請求" #. module: stock #: help:stock.location,active:0 diff --git a/addons/stock/i18n/zh_TW.po b/addons/stock/i18n/zh_TW.po index a6f2e7c14fb..6403febaed0 100644 --- a/addons/stock/i18n/zh_TW.po +++ b/addons/stock/i18n/zh_TW.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: 2014-01-09 07:59+0000\n" +"PO-Revision-Date: 2014-01-10 09:09+0000\n" "Last-Translator: Andy Cheng \n" "Language-Team: Chinese (Traditional) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-01-10 05:32+0000\n" -"X-Generator: Launchpad (build 16884)\n" +"X-Launchpad-Export-Date: 2014-01-11 06:26+0000\n" +"X-Generator: Launchpad (build 16890)\n" #. module: stock #: field:stock.inventory.line.split,line_exist_ids:0 @@ -1385,6 +1385,11 @@ msgid "" "* Available: When products are reserved, it is set to 'Available'.\n" "* Done: When the shipment is processed, the state is 'Done'." msgstr "" +"* 新增：庫存調動尚未被確認。\n" +"* 等待另外的調動：此狀態出現於當一個調動正在等待另外一個調動時，例如連動式物流。\n" +"* 等待可用：此狀態代表貨物非直接可取得，可能需要執行排程器、生產一個零件等等。\n" +"* 可用：當產品已經被保留給此調動，該調動會被設為「可用」。\n" +"* 完成：當調動已處理完成時，狀態是「完成」。" #. module: stock #: model:stock.location,name:stock.stock_location_locations_partner @@ -1423,7 +1428,7 @@ msgstr "出貨單：" #. module: stock #: help:stock.location,chained_delay:0 msgid "Delay between original move and chained move in days" -msgstr "" +msgstr "原始調動和連動調動間延遲的天數" #. module: stock #: model:ir.actions.act_window,help:stock.action_stock_journal_form @@ -1441,6 +1446,14 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" 點擊建立一個新的日記帳簿。 \n" +"

\n" +" 庫存日記帳系統讓您根據要執行的作業類型，或執行的員工/團隊，\n" +" 指定每個庫存作業給一特定日記帳，例如：品質管理，提貨清單，\n" +" 包裝等等。\n" +"

\n" +" " #. module: stock #: help:stock.location,chained_auto_packing:0 @@ -1554,7 +1567,7 @@ msgstr "附加資訊" #: code:addons/stock/stock.py:2653 #, python-format msgid "Missing partial picking data for move #%s." -msgstr "" +msgstr "調動 #%s 缺少部分提貨資料。" #. module: stock #: field:stock.location.product,from_date:0 @@ -1564,13 +1577,13 @@ msgstr "自" #. module: stock #: view:stock.picking.in:0 msgid "Incoming Shipments already processed" -msgstr "" +msgstr "入庫貨物已處理" #. module: stock #: code:addons/stock/wizard/stock_return_picking.py:102 #, python-format msgid "You may only return pickings that are Confirmed, Available or Done!" -msgstr "" +msgstr "您只能退回狀態是「已確認」、「可用」或「已完成」的提貨單！" #. module: stock #: view:stock.location:0 @@ -1595,18 +1608,18 @@ msgstr "內部提貨清單" #: selection:report.stock.move,state:0 #: view:stock.picking:0 msgid "Waiting" -msgstr "" +msgstr "等待中" #. module: stock #: view:stock.move:0 #: view:stock.move.split:0 msgid "Split" -msgstr "" +msgstr "分拆" #. module: stock #: model:ir.actions.report.xml,name:stock.report_picking_list_out msgid "Delivery Slip" -msgstr "" +msgstr "送貨單" #. module: stock #: model:ir.actions.act_window,name:stock.open_board_warehouse @@ -1628,7 +1641,7 @@ msgstr "類型" #. module: stock #: model:stock.location,name:stock.stock_location_5 msgid "Generic IT Suppliers" -msgstr "" +msgstr "一般IT供應商" #. module: stock #: help:stock.location,valuation_out_account_id:0 @@ -1649,12 +1662,12 @@ msgstr "" #: field:stock.production.lot,date:0 #: field:stock.tracking,date:0 msgid "Creation Date" -msgstr "" +msgstr "建立日期" #. module: stock #: field:report.stock.lines.date,id:0 msgid "Inventory Line Id" -msgstr "" +msgstr "盤點細項ID" #. module: stock #: help:stock.location,partner_id:0 @@ -1671,23 +1684,23 @@ msgstr "客戶地點" #. module: stock #: model:ir.model,name:stock.model_stock_inventory_line_split_lines msgid "Inventory Split lines" -msgstr "" +msgstr "盤點細項分拆" #. module: stock #: model:ir.actions.report.xml,name:stock.report_location_overview #: report:lot.stock.overview:0 msgid "Location Inventory Overview" -msgstr "" +msgstr "倉位存貨總覽" #. module: stock #: view:report.stock.inventory:0 msgid "Analysis including future moves (similar to virtual stock)" -msgstr "" +msgstr "包含未來調動的調動分析（類似虛擬庫存）" #. module: stock #: model:ir.actions.act_window,name:stock.action3 msgid "Downstream traceability" -msgstr "" +msgstr "下游追溯" #. module: stock #: view:stock.picking.in:0 @@ -1709,6 +1722,14 @@ msgid "" "Thank you in advance for your cooperation.\n" "Best Regards," msgstr "" +"親愛的先生/女士,\n" +"\n" +"我們的記錄顯示您有到期帳款尚未支付，請看下列明細。\n" +"如果該金額已經支付，請忽略本次通知。若尚未支付，請依下列金額付款。\n" +"如果有任何關於您的帳務的疑問，請聯繫我們。\n" +"\n" +"感謝您的幫忙。\n" +"順頌商祺。" #. module: stock #: help:stock.incoterms,active:0 @@ -1720,40 +1741,40 @@ msgstr "" #: view:stock.picking:0 #: view:stock.picking.in:0 msgid "Order Date" -msgstr "" +msgstr "訂單日期" #. module: stock #: code:addons/stock/wizard/stock_change_product_qty.py:92 #, python-format msgid "INV: %s" -msgstr "" +msgstr "發票：%s" #. module: stock #: view:stock.location:0 #: field:stock.location,location_id:0 msgid "Parent Location" -msgstr "" +msgstr "上層倉位" #. module: stock #: code:addons/stock/product.py:168 #, python-format msgid "Please define stock output account for this product: \"%s\" (id: %d)." -msgstr "" +msgstr "請為此產品定義出貨科目：「%s」(id: %d)。" #. module: stock #: help:stock.location,company_id:0 msgid "Let this field empty if this location is shared between all companies" -msgstr "" +msgstr "假如此倉位是由所有公司共用，請保留此欄空白。" #. module: stock #: field:stock.location,chained_delay:0 msgid "Chaining Lead Time" -msgstr "" +msgstr "連動調動前導時間" #. module: stock #: field:stock.config.settings,group_uom:0 msgid "Manage different units of measure for products" -msgstr "" +msgstr "管理產品的不同度量單位" #. module: stock #: model:ir.model,name:stock.model_stock_invoice_onshipping @@ -1764,31 +1785,31 @@ msgstr "" #: code:addons/stock/stock.py:2473 #, python-format msgid "Please provide a positive quantity to scrap." -msgstr "" +msgstr "請輸入正的報廢數量。" #. module: stock #: model:stock.location,name:stock.stock_location_shop1 msgid "Your Company, Birmingham shop" -msgstr "" +msgstr "你的公司，伯明翰分店" #. module: stock #: view:product.product:0 #: view:product.template:0 msgid "Storage Location" -msgstr "" +msgstr "儲存倉位" #. module: stock #: help:stock.partial.move.line,currency:0 #: help:stock.partial.picking.line,currency:0 msgid "Currency in which Unit cost is expressed" -msgstr "" +msgstr "單位成本幣別" #. module: stock #: selection:stock.picking,move_type:0 #: selection:stock.picking.in,move_type:0 #: selection:stock.picking.out,move_type:0 msgid "Partial" -msgstr "" +msgstr "部份" #. module: stock #: selection:report.stock.inventory,month:0 @@ -1799,7 +1820,7 @@ msgstr "九月" #. module: stock #: view:product.product:0 msgid "days" -msgstr "" +msgstr "日" #. module: stock #: model:ir.model,name:stock.model_report_stock_inventory @@ -1816,23 +1837,23 @@ msgstr "" #: help:stock.picking.in,origin:0 #: help:stock.picking.out,origin:0 msgid "Reference of the document" -msgstr "" +msgstr "文件參照" #. module: stock #: view:stock.picking:0 #: view:stock.picking.in:0 msgid "Is a Back Order" -msgstr "" +msgstr "為延期交貨單" #. module: stock #: report:stock.picking.list:0 msgid "Incoming Shipment :" -msgstr "" +msgstr "入庫貨物：" #. module: stock #: field:stock.location,valuation_out_account_id:0 msgid "Stock Valuation Account (Outgoing)" -msgstr "" +msgstr "庫存估價科目（出庫）" #. module: stock #: view:stock.return.picking.memory:0 @@ -1854,7 +1875,7 @@ msgstr "庫存調動" msgid "" "Check this option to select existing serial numbers in the list below, " "otherwise you should enter new ones line by line." -msgstr "" +msgstr "勾選此項以從下方清單中選擇已有的序號，或自行逐行輸入新的序號。" #. module: stock #: selection:report.stock.move,type:0 @@ -1864,7 +1885,7 @@ msgstr "" #: selection:stock.picking.in,type:0 #: selection:stock.picking.out,type:0 msgid "Sending Goods" -msgstr "" +msgstr "送出貨物" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock @@ -1874,30 +1895,30 @@ msgstr "產品分類" #. module: stock #: view:stock.move:0 msgid "Cancel Availability" -msgstr "" +msgstr "取消可用" #. module: stock #: code:addons/stock/wizard/stock_location_product.py:49 #, python-format msgid "Current Inventory" -msgstr "" +msgstr "目前庫存" #. module: stock #: help:product.template,property_stock_production:0 msgid "" "This stock location will be used, instead of the default one, as the source " "location for stock moves generated by manufacturing orders." -msgstr "" +msgstr "此倉位將會替代預設倉位，用於生產單產生的調動的來源倉位。" #. module: stock #: help:stock.move,date_expected:0 msgid "Scheduled date for the processing of this move" -msgstr "" +msgstr "排定處理此調動的日期" #. module: stock #: field:stock.inventory,move_ids:0 msgid "Created Moves" -msgstr "" +msgstr "已建立的調動" #. module: stock #: field:stock.location,valuation_in_account_id:0 diff --git a/openerp/addons/base/i18n/af.po b/openerp/addons/base/i18n/af.po index 11131be4863..bfa9c43edd6 100644 --- a/openerp/addons/base/i18n/af.po +++ b/openerp/addons/base/i18n/af.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-server\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:35+0000\n" -"PO-Revision-Date: 2012-12-21 23:09+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2014-01-10 09:38+0000\n" +"Last-Translator: Jacobus Erasmus \n" "Language-Team: Afrikaans \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-08 06:09+0000\n" -"X-Generator: Launchpad (build 16799)\n" +"X-Launchpad-Export-Date: 2014-01-11 06:26+0000\n" +"X-Generator: Launchpad (build 16890)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing @@ -65,12 +65,12 @@ msgstr "Kyk na argitektuur" #. module: base #: model:ir.module.module,summary:base.module_sale_stock msgid "Quotation, Sale Orders, Delivery & Invoicing Control" -msgstr "" +msgstr "Kwotasie, Bestellins, Aflewerings en Faktuur beheer." #. module: base #: selection:ir.sequence,implementation:0 msgid "No gap" -msgstr "" +msgstr "Geep Spasie" #. module: base #: selection:base.language.install,lang:0 @@ -94,23 +94,24 @@ msgstr "" #. module: base #: model:ir.module.module,summary:base.module_point_of_sale msgid "Touchscreen Interface for Shops" -msgstr "" +msgstr "Tasskerm koppelvlak vir Winkels" #. module: base #: model:ir.module.module,shortdesc:base.module_l10n_in_hr_payroll msgid "Indian Payroll" -msgstr "" +msgstr "Indiese Betaalstaat" #. module: base #: help:ir.cron,model:0 msgid "" "Model name on which the method to be called is located, e.g. 'res.partner'." msgstr "" +"Model naam waarin die metode wat geroep word verskyn, bv. \"res.partner\"." #. module: base #: view:ir.module.module:0 msgid "Created Views" -msgstr "" +msgstr "Geskepte Afbeelding" #. module: base #: model:ir.module.module,description:base.module_product_manufacturer @@ -127,11 +128,24 @@ msgid "" " * Product Attributes\n" " " msgstr "" +"\n" +"'n Module wat die vervaardegiers en eienskappe van die produk op die vorm " +"byvoeg.\n" +"===================================================================\n" +"\n" +"Jy behoort nu die volgende vir produkte te kan definieer:\n" +"-----------------------------------------------------------------------------" +"--\n" +" * Vervaardiger\n" +" * Vervaardiger Produk Naame\n" +" * Vervaardiger Produk Kode\n" +" * Produk Eienskappe\n" +" " #. module: base #: field:ir.actions.client,params:0 msgid "Supplementary arguments" -msgstr "" +msgstr "Aanvullende argumente" #. module: base #: model:ir.module.module,description:base.module_google_base_account @@ -140,11 +154,14 @@ msgid "" "The module adds google user in res user.\n" "========================================\n" msgstr "" +"\n" +"Hierdie module voeg google user bu res.user.\n" +"=====================================\n" #. module: base #: help:res.partner,employee:0 msgid "Check this box if this contact is an Employee." -msgstr "" +msgstr "Selekteer hierdie block as die kontak 'n Verknemer is." #. module: base #: help:ir.model.fields,domain:0 diff --git a/openerp/addons/base/i18n/fr.po b/openerp/addons/base/i18n/fr.po index 56c4608c0d2..2ece6292327 100644 --- a/openerp/addons/base/i18n/fr.po +++ b/openerp/addons/base/i18n/fr.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-server\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:35+0000\n" -"PO-Revision-Date: 2013-12-30 09:19+0000\n" -"Last-Translator: WANTELLET Sylvain \n" +"PO-Revision-Date: 2014-01-11 07:59+0000\n" +"Last-Translator: Florian Hatat \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-12-31 05:26+0000\n" -"X-Generator: Launchpad (build 16877)\n" +"X-Launchpad-Export-Date: 2014-01-12 05:47+0000\n" +"X-Generator: Launchpad (build 16890)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing @@ -11519,7 +11519,7 @@ msgstr "Islande" #: model:ir.actions.act_window,name:base.ir_action_window #: model:ir.ui.menu,name:base.menu_ir_action_window msgid "Window Actions" -msgstr "Actions de fênetres" +msgstr "Actions de fenêtres" #. module: base #: model:ir.module.module,description:base.module_portal_project_issue diff --git a/openerp/addons/base/i18n/ja.po b/openerp/addons/base/i18n/ja.po index abe07be2cdf..891e4e939f8 100644 --- a/openerp/addons/base/i18n/ja.po +++ b/openerp/addons/base/i18n/ja.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-server\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:35+0000\n" -"PO-Revision-Date: 2013-11-28 03:33+0000\n" -"Last-Translator: Yoshi Tashiro \n" +"PO-Revision-Date: 2014-01-12 17:10+0000\n" +"Last-Translator: hiro TAKADA \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-11-29 05:29+0000\n" -"X-Generator: Launchpad (build 16847)\n" +"X-Launchpad-Export-Date: 2014-01-13 05:58+0000\n" +"X-Generator: Launchpad (build 16890)\n" #. module: base #: model:ir.module.module,description:base.module_account_check_writing @@ -1470,7 +1470,7 @@ msgstr "テスト" #. module: base #: field:ir.actions.report.xml,attachment:0 msgid "Save as Attachment Prefix" -msgstr "" +msgstr "添付ファイルのプリフィックスとして保存" #. module: base #: field:ir.ui.view_sc,res_id:0 @@ -2330,7 +2330,7 @@ msgstr "アイルランド" msgid "" "Appears by default on the top right corner of your printed documents (report " "header)." -msgstr "" +msgstr "印刷された文書(レポートヘッダ)の右上隅にデフォルトで表示されます。" #. module: base #: field:base.module.update,update:0 @@ -3374,7 +3374,7 @@ msgstr "スウェーデン" #. module: base #: field:ir.actions.report.xml,report_file:0 msgid "Report File" -msgstr "" +msgstr "レポートファイル" #. module: base #: selection:ir.actions.act_window.view,view_mode:0 @@ -3690,7 +3690,7 @@ msgstr "インポートする（.zipファイル）モジュールパッケー #. module: base #: field:base.language.export,modules:0 msgid "Modules To Export" -msgstr "" +msgstr "エクスポートするモジュール" #. module: base #: model:res.country,name:base.mt @@ -5810,7 +5810,7 @@ msgstr "リソース名" #. module: base #: model:ir.ui.menu,name:base.menu_ir_filters msgid "User-defined Filters" -msgstr "" +msgstr "ユーザ定義のフィルタ" #. module: base #: field:ir.actions.act_window_close,name:0 @@ -6395,7 +6395,7 @@ msgstr "" #. module: base #: field:ir.filters,is_default:0 msgid "Default filter" -msgstr "" +msgstr "デフォルトのフィルタ" #. module: base #: report:ir.module.reference:0 @@ -7721,6 +7721,8 @@ msgid "" "use the same timezone that is otherwise used to pick and render date and " "time values: your computer's timezone." msgstr "" +"取引先のタイムゾーン。印刷するレポート内に適切な日付と時刻を出力するために使用します。このフィールドに値を設定することは重要です。日付と時刻を選択して表示" +"するのでなければ、あなたのコンピュータと同じタイムゾーンを使用すべきです。" #. module: base #: model:ir.module.module,shortdesc:base.module_account_analytic_default @@ -8872,7 +8874,7 @@ msgstr "アクション結合" msgid "" "If the selected language is loaded in the system, all documents related to " "this contact will be printed in this language. If not, it will be English." -msgstr "" +msgstr "選択された言語がシステムにロードされている場合、この連絡先に関連するすべての文書はこの言語で印刷されます。そうでない場合は英語です。" #. module: base #: model:ir.module.module,description:base.module_hr_evaluation @@ -10696,7 +10698,7 @@ msgstr "ギニアビサウ" #. module: base #: field:ir.actions.report.xml,header:0 msgid "Add RML Header" -msgstr "" +msgstr "RMLヘッダを追加" #. module: base #: help:res.company,rml_footer:0 @@ -12365,7 +12367,7 @@ msgstr "見積書、販売注文書、請求書の処理に役立ちます。" #. module: base #: field:res.users,login_date:0 msgid "Latest connection" -msgstr "" +msgstr "最後の接続" #. module: base #: field:res.groups,implied_ids:0 @@ -13106,7 +13108,7 @@ msgstr "ニューカレドニア（フランス領）" #. module: base #: field:ir.model,osv_memory:0 msgid "Transient Model" -msgstr "" +msgstr "過度的なモデル" #. module: base #: model:res.country,name:base.cy @@ -13981,7 +13983,7 @@ msgstr "" msgid "" "Check this to define the report footer manually. Otherwise it will be " "filled in automatically." -msgstr "" +msgstr "レポートフッタをマニュアルで定義する場合はチェックしてください。それ以外は自動で入力されます。" #. module: base #: view:res.partner:0 From fb7aefa5c31369aad6ebd2b7f67f8cd9b3f6a188 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Mon, 13 Jan 2014 17:56:47 +0100 Subject: [PATCH 04/10] [FIX] hr_timesheet_invoice: on_change_partner_id, do nothing if partner_id is False bzr revid: dle@openerp.com-20140113165647-152dy1wqgc7m8cc8 --- addons/hr_timesheet_invoice/hr_timesheet_invoice.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py index 6393e4025c7..f67c129f863 100644 --- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py +++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py @@ -77,10 +77,11 @@ class account_analytic_account(osv.osv): def on_change_partner_id(self, cr, uid, ids, partner_id, name, context=None): res = super(account_analytic_account, self).on_change_partner_id(cr, uid, ids, partner_id, name, context=context) - part = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context) - pricelist = part.property_product_pricelist and part.property_product_pricelist.id or False - if pricelist: - res['value']['pricelist_id'] = pricelist + if partner_id: + part = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context) + pricelist = part.property_product_pricelist and part.property_product_pricelist.id or False + if pricelist: + res['value']['pricelist_id'] = pricelist return res def set_close(self, cr, uid, ids, context=None): From cc553cc507e3ce2356dbf46c0fe9656fc7289b89 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Mon, 13 Jan 2014 18:23:47 +0100 Subject: [PATCH 05/10] [FIX] format: trying to format an undefined value as the same effect as a value to false or infinity: return value_if_empty parameter bzr revid: mat@openerp.com-20140113172347-00anf6lh2jxin84w --- addons/web/static/src/js/formats.js | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js index 854c5f76218..998855c5bd4 100644 --- a/addons/web/static/src/js/formats.js +++ b/addons/web/static/src/js/formats.js @@ -142,6 +142,7 @@ instance.web.format_value = function (value, descriptor, value_if_empty) { } console.warn('Field', descriptor, 'had an empty string as value, treating as false...'); case false: + case undefined: case Infinity: case -Infinity: return value_if_empty === undefined ? '' : value_if_empty; From 2a5a05f49d139dc417b1570850d2df73e9d74f72 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Tue, 14 Jan 2014 06:49:36 +0000 Subject: [PATCH 06/10] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20140114064936-uengc20ppbqnn5ut --- addons/email_template/i18n/ja.po | 13 +++++---- addons/mail/i18n/ja.po | 42 ++++++++++++++------------- addons/project/i18n/ru.po | 26 ++++++++++------- addons/project_issue/i18n/ru.po | 50 ++++++++++++++++++++------------ 4 files changed, 75 insertions(+), 56 deletions(-) diff --git a/addons/email_template/i18n/ja.po b/addons/email_template/i18n/ja.po index c082dff84e8..06c4b3a4a98 100644 --- a/addons/email_template/i18n/ja.po +++ b/addons/email_template/i18n/ja.po @@ -8,13 +8,13 @@ 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: 2014-01-12 14:11+0000\n" +"PO-Revision-Date: 2014-01-13 08:21+0000\n" "Last-Translator: hiro TAKADA \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: 2014-01-13 05:59+0000\n" +"X-Launchpad-Export-Date: 2014-01-14 06:49+0000\n" "X-Generator: Launchpad (build 16890)\n" #. module: email_template @@ -52,6 +52,7 @@ 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 "" +"送信者アドレス(プレースホルダはここで使用します)。設定されない場合、デフォルト値は作成者の電子メールエイリアスまたはメールアドレスになります。" #. module: email_template #: field:email.template,mail_server_id:0 @@ -93,7 +94,7 @@ msgstr "宛先(Eメール)" #. module: email_template #: view:email.template:0 msgid "Preview" -msgstr "" +msgstr "プレビュー表示" #. module: email_template #: field:email.template,reply_to:0 @@ -356,13 +357,13 @@ msgstr "" #. module: email_template #: view:email.template:0 msgid "Add context action" -msgstr "" +msgstr "コンテキストアクションを追加" #. module: email_template #: help:email.template,model_id:0 #: help:email_template.preview,model_id:0 msgid "The kind of document with with this template can be used" -msgstr "" +msgstr "このテンプレートで使用できる文書の種類" #. module: email_template #: field:email.template,email_recipients:0 @@ -400,7 +401,7 @@ msgstr "住所" #: help:email_template.preview,email_recipients:0 msgid "" "Comma-separated ids of recipient partners (placeholders may be used here)" -msgstr "" +msgstr "カンマで区切られた取引先のID(プレースホルダはここで使用します)" #. module: email_template #: field:email.template,attachment_ids:0 diff --git a/addons/mail/i18n/ja.po b/addons/mail/i18n/ja.po index 6b6f81ea5d0..602362cdd91 100644 --- a/addons/mail/i18n/ja.po +++ b/addons/mail/i18n/ja.po @@ -8,13 +8,13 @@ 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: 2014-01-13 05:53+0000\n" +"PO-Revision-Date: 2014-01-13 09:06+0000\n" "Last-Translator: hiro TAKADA \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: 2014-01-13 05:59+0000\n" +"X-Launchpad-Export-Date: 2014-01-14 06:49+0000\n" "X-Generator: Launchpad (build 16890)\n" #. module: mail @@ -48,7 +48,7 @@ msgstr "メッセージの受取人" #. module: mail #: help:mail.message.subtype,default:0 msgid "Activated by default when subscribing." -msgstr "" +msgstr "購読するときはデフォルトで活性化されます。" #. module: mail #: view:mail.message:0 @@ -127,7 +127,7 @@ msgstr "" msgid "" "Email address of the sender. This field is set when no matching partner is " "found for incoming emails." -msgstr "" +msgstr "送信者のメールアドレス。このフィールドは受信メールに一致する取引先が見つからない場合に設定されます。" #. module: mail #: model:ir.model,name:mail.model_mail_compose_message @@ -320,7 +320,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 "メッセージの作成者。設定されない場合、email_fromはどの取引先とも一致しないメールアドレスを保持します。" #. module: mail #. openerp-web @@ -343,7 +343,7 @@ msgstr "" msgid "" "Message type: email for email message, notification for system message, " "comment for other messages such as user replies" -msgstr "" +msgstr "メッセージの種類：電子メールメッセージのメール、システムメッセージの通知、ユーザ返信など他のメッセージのコメント" #. module: mail #: help:mail.message.subtype,relation_field:0 @@ -352,6 +352,8 @@ msgid "" "automatic subscription on a related document. The field is used to compute " "getattr(related_document.relation_field)." msgstr "" +"関連文書を自動購読する場合、関連モデルをサブタイプのモデルにリンクするためのフィールド。このフィールドはgetattr(related_document." +"relation_field)の計算に使われます。" #. module: mail #: selection:mail.mail,state:0 @@ -801,7 +803,7 @@ msgstr "" #: help:mail.followers,res_model:0 #: help:mail.wizard.invite,res_model:0 msgid "Model of the followed resource" -msgstr "" +msgstr "追従するリソースのモデル" #. module: mail #. openerp-web @@ -833,7 +835,7 @@ msgstr "自分のフォロワーとシェア..." #. module: mail #: field:mail.notification,partner_id:0 msgid "Contact" -msgstr "" +msgstr "連絡先" #. module: mail #: view:mail.group:0 @@ -975,7 +977,7 @@ msgstr "子メッセージ" #. module: mail #: field:mail.alias,alias_user_id:0 msgid "Owner" -msgstr "" +msgstr "所有者" #. module: mail #: code:addons/mail/res_partner.py:52 @@ -996,7 +998,7 @@ msgstr "メッセージ" #: help:mail.followers,res_id:0 #: help:mail.wizard.invite,res_id:0 msgid "Id of the followed resource" -msgstr "" +msgstr "追従するリソースのID" #. module: mail #: field:mail.compose.message,body:0 @@ -1015,7 +1017,7 @@ msgstr "エイリアス" msgid "" "Description that will be added in the message posted for this subtype. If " "void, the name will be added instead." -msgstr "" +msgstr "このサブタイプのために投稿したメッセージに追加される説明です。" #. module: mail #: field:mail.compose.message,vote_user_ids:0 @@ -1165,7 +1167,7 @@ msgid "" "on its wall." msgstr "" "メッセージのサブタイプはメッセージ、特にシステム通知に対してより正確なタイプを与えます。たとえば、新規レコード(新規)またはプロセスのステージ変更(ステー" -"ジ変更)に関連する通知ができます。メッセージのサブタイプはユーザが受信したい通知の壁を正確にチューンできます。" +"ジ変更)に関連する通知ができます。メッセージのサブタイプはユーザがウォールで受信したい通知を正確にチューンできます。" #. module: mail #: field:res.partner,notification_email_send:0 @@ -1267,7 +1269,7 @@ msgstr "" #. module: mail #: help:mail.message.subtype,parent_id:0 msgid "Parent subtype, used for automatic subscription." -msgstr "" +msgstr "自動購読で使用する親サブタイプ" #. module: mail #: field:mail.group,message_summary:0 @@ -1299,7 +1301,7 @@ msgstr "" #: field:mail.message,starred:0 #: field:mail.notification,starred:0 msgid "Starred" -msgstr "" +msgstr "スター付き" #. module: mail #: field:mail.group,menu_id:0 @@ -1381,7 +1383,7 @@ msgstr "写し(CC)" #. module: mail #: help:mail.notification,starred:0 msgid "Starred message that goes into the todo mailbox" -msgstr "" +msgstr "ToDoメールボックスに入るスター付きメッセージ" #. module: mail #: view:mail.group:0 @@ -1454,7 +1456,7 @@ msgstr "作成月" #: help:mail.message,notified_partner_ids:0 msgid "" "Partners that have a notification pushing this message in their mailboxes" -msgstr "" +msgstr "メールボックスのメッセージをプッシュ通知した取引先" #. module: mail #: view:mail.message:0 @@ -1483,7 +1485,7 @@ msgstr "返信" #: field:mail.compose.message,notified_partner_ids:0 #: field:mail.message,notified_partner_ids:0 msgid "Notified partners" -msgstr "" +msgstr "通知された取引先" #. module: mail #. openerp-web @@ -1507,7 +1509,7 @@ msgstr "役員会" #. module: mail #: field:mail.alias,alias_model_id:0 msgid "Aliased Model" -msgstr "" +msgstr "エイリアスするモデル" #. module: mail #: help:mail.compose.message,message_id:0 @@ -1720,7 +1722,7 @@ msgstr "メッセージがありません。" msgid "" "Message subtypes followed, meaning subtypes that will be pushed onto the " "user's Wall." -msgstr "" +msgstr "追従するメッセージのサブタイプはユーザのウォールにプッシュされるサブタイプを意味します。" #. module: mail #: help:mail.group,message_ids:0 @@ -1806,7 +1808,7 @@ msgstr "" #: help:mail.compose.message,parent_id:0 #: help:mail.message,parent_id:0 msgid "Initial thread message." -msgstr "" +msgstr "初期スレッドメッセージ" #. module: mail #: model:mail.group,name:mail.group_hr_policies diff --git a/addons/project/i18n/ru.po b/addons/project/i18n/ru.po index 7a4a4824ec1..3327dca9b21 100644 --- a/addons/project/i18n/ru.po +++ b/addons/project/i18n/ru.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-11-12 14:40+0000\n" -"Last-Translator: Mihail Markov \n" +"PO-Revision-Date: 2014-01-13 23:19+0000\n" +"Last-Translator: Denis Karataev \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:28+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-01-14 06:49+0000\n" +"X-Generator: Launchpad (build 16890)\n" #. module: project #: view:project.project:0 @@ -346,7 +346,7 @@ msgstr "Июнь" #. module: project #: view:project.task:0 msgid "Gantt View" -msgstr "" +msgstr "Диаграмма Ганта" #. module: project #: selection:report.project.task.user,month:0 @@ -383,7 +383,7 @@ msgstr "Сводка" #. module: project #: view:project.task:0 msgid "Task summary..." -msgstr "" +msgstr "Сводка задач" #. module: project #: view:project.project:0 @@ -501,7 +501,7 @@ msgstr "Дата создания" #. module: project #: view:project.task:0 msgid "Add a Description..." -msgstr "" +msgstr "Добавить описание..." #. module: project #: view:res.partner:0 @@ -648,7 +648,7 @@ msgstr "Не шаблон задания" #. module: project #: field:project.task,planned_hours:0 msgid "Initially Planned Hours" -msgstr "" +msgstr "Изначально запланировано часов" #. module: project #: model:process.transition,note:project.process_transition_delegate0 @@ -717,7 +717,7 @@ msgstr "Новые Задачи" #. module: project #: field:project.config.settings,module_project_issue_sheet:0 msgid "Invoice working time on issues" -msgstr "" +msgstr "Выставлять счета за время работы над вопросами" #. module: project #: view:project.project:0 @@ -1047,6 +1047,10 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Нажмите чтобы добавить новый тэг.\n" +"

\n" +" " #. module: project #: model:ir.ui.menu,name:project.menu_task_types_view @@ -1509,7 +1513,7 @@ msgstr "Вложения" #. module: project #: view:project.category:0 msgid "Issue Version" -msgstr "" +msgstr "Версия вопроса" #. module: project #: code:addons/project/project.py:182 @@ -2014,7 +2018,7 @@ msgstr "Канбан статус" #. module: project #: field:project.config.settings,module_project_timesheet:0 msgid "Record timesheet lines per tasks" -msgstr "" +msgstr "Вести табель учета задач" #. module: project #: model:ir.model,name:project.model_report_project_task_user diff --git a/addons/project_issue/i18n/ru.po b/addons/project_issue/i18n/ru.po index f655565965f..6f959be9443 100644 --- a/addons/project_issue/i18n/ru.po +++ b/addons/project_issue/i18n/ru.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-11-12 15:36+0000\n" -"Last-Translator: Viktor P. \n" +"PO-Revision-Date: 2014-01-13 23:38+0000\n" +"Last-Translator: Denis Karataev \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:29+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-01-14 06:49+0000\n" +"X-Generator: Launchpad (build 16890)\n" #. module: project_issue #: model:project.category,name:project_issue.project_issue_category_03 @@ -108,7 +108,7 @@ msgstr "Если отмечено, новые сообщения требуют #. module: project_issue #: help:account.analytic.account,use_issues:0 msgid "Check this field if this project manages issues" -msgstr "" +msgstr "Отметьте это поле, если этот проект управляет вопросами" #. module: project_issue #: field:project.issue,day_open:0 @@ -134,7 +134,7 @@ msgstr "Ошибка! Вы не можете назначить эскалаци #: selection:project.issue,priority:0 #: selection:project.issue.report,priority:0 msgid "Highest" -msgstr "Наивысший" +msgstr "Высший" #. module: project_issue #: help:project.issue,inactivity_days:0 @@ -196,6 +196,16 @@ msgid "" "

\n" " " msgstr "" +"

\n" +" Нажмите, чтобы добавить вопрос.\n" +"

\n" +" Система отслеживания вопросов в OpenERP позволяет вам эффективно " +"управлять\n" +" внутренними запросами, ошибками в программном обеспечении, " +"жалобами клиентов,\n" +" неприятностями проектов, поломками материала и т.д. \n" +"

\n" +" " #. module: project_issue #: selection:project.issue,state:0 @@ -246,6 +256,8 @@ msgid "" "If any issue is escalated from the current Project, it will be listed under " "the project selected here." msgstr "" +"Если какой-то вопрос был перенесен на более высокий уровень из конкретного " +"проекта, он будет показан под проектом, выбранным здесь." #. module: project_issue #: view:project.issue:0 @@ -349,7 +361,7 @@ msgstr "" #. module: project_issue #: view:project.issue:0 msgid "Unassigned Issues" -msgstr "" +msgstr "Неназначенные вопросы" #. module: project_issue #: field:project.issue,create_date:0 @@ -377,7 +389,7 @@ msgstr "project.issue.version" #. module: project_issue #: field:project.config.settings,fetchmail_issue:0 msgid "Create issues from an incoming email account " -msgstr "" +msgstr "Создавать вопросы из входящей почты " #. module: project_issue #: view:project.issue:0 @@ -732,7 +744,7 @@ msgstr "Открыт" #: view:project.issue:0 #: view:project.project:0 msgid "Issues" -msgstr "Проблемы" +msgstr "Вопросы" #. module: project_issue #: view:project.issue:0 @@ -760,17 +772,17 @@ msgstr "Добавить внутреннюю заметку..." #. module: project_issue #: view:project.issue:0 msgid "Cancel Issue" -msgstr "Отменить проблему" +msgstr "Отменить вопрос" #. module: project_issue #: help:project.issue,progress:0 msgid "Computed as: Time Spent / Total Time." -msgstr "Вычисляется по формуле: Затраченное время / Общее время." +msgstr "Вычислено как: Затраченное время / Общее время." #. module: project_issue #: field:project.project,issue_count:0 msgid "Unclosed Issues" -msgstr "Незакрытые проблемы" +msgstr "Открытые вопросы" #. module: project_issue #: view:project.issue:0 @@ -801,7 +813,7 @@ msgstr "Месяц" #: field:project.issue,name:0 #: view:project.project:0 msgid "Issue" -msgstr "Проблема" +msgstr "Вопрос" #. module: project_issue #: model:project.category,name:project_issue.project_issue_category_02 @@ -837,7 +849,7 @@ msgstr "" #: model:mail.message.subtype,name:project_issue.mt_issue_closed #: model:mail.message.subtype,name:project_issue.mt_project_issue_closed msgid "Issue Closed" -msgstr "Проблема закрыта" +msgstr "Вопрос закрыт" #. module: project_issue #: view:project.issue.report:0 @@ -849,7 +861,7 @@ msgstr "" #: model:mail.message.subtype,name:project_issue.mt_issue_new #: model:mail.message.subtype,name:project_issue.mt_project_issue_new msgid "Issue Created" -msgstr "Проблема создана" +msgstr "Вопрос создан" #. module: project_issue #: code:addons/project_issue/project_issue.py:497 @@ -871,7 +883,7 @@ msgstr "Этап изменен" #. module: project_issue #: view:project.issue:0 msgid "Feature description" -msgstr "" +msgstr "Описание функционала" #. module: project_issue #: field:project.project,project_escalation_id:0 @@ -916,7 +928,7 @@ msgstr "Апрель" #. module: project_issue #: view:project.issue:0 msgid "⇒ Escalate" -msgstr "" +msgstr "⇒ Передать на уровень выше" #. module: project_issue #: model:mail.message.subtype,description:project_issue.mt_issue_new @@ -951,7 +963,7 @@ msgstr "Число дней, чтобы закрыть проблему прое #. module: project_issue #: field:project.issue.report,working_hours_close:0 msgid "Avg. Working Hours to Close" -msgstr "" +msgstr "Среднее количество часов до закрытия вопроса" #. module: project_issue #: model:mail.message.subtype,name:project_issue.mt_issue_stage @@ -972,7 +984,7 @@ msgstr "Крайний срок" #. module: project_issue #: field:project.issue,date_action_last:0 msgid "Last Action" -msgstr "" +msgstr "Последнее действие" #. module: project_issue #: view:project.issue.report:0 From cc5d5bb2bf4a84a27edf998cee22c8602c9a78e0 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Fri, 10 Jan 2014 17:15:19 +0100 Subject: [PATCH 07/10] [FIX] account: restore cross-account reconciliation check, disabled by mistake in v6.1 Both the FY closing change and the removal of the check occurred in v6.1 at revision 6529 revid:qdp-launchpad@openerp.com-20120209170333-8xu7r21hencjwu73. Also removed code specific to fiscal year closing in the regular reconciliation operation, as the FY closing is now using a dedication reconciliation algorithm. This is a forward-port of the corresponding patch in v6.1, at revno 7295 rev-id: odo@openerp.com-20140110154023-12rqfeuwx5fqpdau. bzr revid: odo@openerp.com-20140110161519-qsocx6xgqsmbe6dt --- addons/account/account_move_line.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 3e40840ff88..e2aac6ff141 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -850,18 +850,17 @@ class account_move_line(osv.osv): (tuple(ids), )) r = cr.fetchall() #TODO: move this check to a constraint in the account_move_reconcile object + if len(r) != 1: + raise osv.except_osv(_('Error'), _('Entries are not of the same account or already reconciled ! ')) if not unrec_lines: raise osv.except_osv(_('Error!'), _('Entry is already reconciled.')) account = account_obj.browse(cr, uid, account_id, context=context) + if not account.reconcile: + raise osv.except_osv(_('Error'), _('The account is not defined to be reconciled !')) if r[0][1] != None: raise osv.except_osv(_('Error!'), _('Some entries are already reconciled.')) - if context.get('fy_closing'): - # We don't want to generate any write-off when being called from the - # wizard used to close a fiscal year (and it doesn't give us any - # writeoff_acc_id). - pass - elif (not currency_obj.is_zero(cr, uid, account.company_id.currency_id, writeoff)) or \ + if (not currency_obj.is_zero(cr, uid, account.company_id.currency_id, writeoff)) or \ (account.currency_id and (not currency_obj.is_zero(cr, uid, account.currency_id, currency))): if not writeoff_acc_id: raise osv.except_osv(_('Warning!'), _('You have to provide an account for the write off/exchange difference entry.')) From a7cb9b762ddc56a538d86b7d9d2cf72c68b9ad41 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Tue, 14 Jan 2014 14:46:27 +0100 Subject: [PATCH 08/10] [FIX] email_template: fix invalid uses of tools.email_split This is necessary to have the tests pass after the corresponding server patch in server 7.0 at revision 5198 revision-id: odo@openerp.com-20140114120344-r58wndgybqusnnq7 lp bug: https://launchpad.net/bugs/1199386 fixed lp bug: https://launchpad.net/bugs/1165531 fixed bzr revid: odo@openerp.com-20140114134627-6j83f4s6pvnj4uma --- addons/email_template/tests/test_mail.py | 4 ++-- addons/email_template/wizard/mail_compose_message.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/email_template/tests/test_mail.py b/addons/email_template/tests/test_mail.py index 2e1a8c5267a..2556864df7c 100644 --- a/addons/email_template/tests/test_mail.py +++ b/addons/email_template/tests/test_mail.py @@ -64,7 +64,7 @@ class test_message_compose(TestMailBase): 'body_html': '${object.description}', 'user_signature': True, 'attachment_ids': [(0, 0, _attachments[0]), (0, 0, _attachments[1])], - 'email_to': 'b@b.b c@c.c', + 'email_to': 'b@b.b, c@c.c', 'email_cc': 'd@d.d' }) @@ -191,7 +191,7 @@ class test_message_compose(TestMailBase): email_template.write(cr, uid, [email_template_id], { 'model_id': user_model_id, 'body_html': '${object.login}', - 'email_to': '${object.email} c@c', + 'email_to': '${object.email}, c@c', 'email_recipients': '%i,%i' % (p_b_id, p_c_id), 'email_cc': 'd@d', }) diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py index 2f1e266848e..22bb53beae3 100644 --- a/addons/email_template/wizard/mail_compose_message.py +++ b/addons/email_template/wizard/mail_compose_message.py @@ -146,7 +146,7 @@ class mail_compose_message(osv.TransientModel): # transform email_to, email_cc into partner_ids partner_ids = set() - mails = tools.email_split(values.pop('email_to', '') + ' ' + values.pop('email_cc', '')) + mails = tools.email_split(values.pop('email_to', '')) + tools.email_split(values.pop('email_cc', '')) ctx = dict((k, v) for k, v in (context or {}).items() if not k.startswith('default_')) for mail in mails: partner_id = self.pool.get('res.partner').find_or_create(cr, uid, mail, context=ctx) From 3f4c6376745e937002c357b8b1c927ea990c4aa7 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 14 Jan 2014 15:57:20 +0100 Subject: [PATCH 09/10] [IMP] view_form: do not display hugly error message when name_get returns no value but more helpful message (eg: bad default value returns wrong id) bzr revid: mat@openerp.com-20140114145720-r3lg0qjezqj4p3i1 --- addons/web/static/src/js/view_form.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 148c79b3efd..e46f63b4d44 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -3299,6 +3299,10 @@ instance.web.form.FieldMany2One = instance.web.form.AbstractField.extend(instanc if (! no_recurse) { var dataset = new instance.web.DataSetStatic(this, this.field.relation, self.build_context()); this.alive(dataset.name_get([self.get("value")])).done(function(data) { + if (!data[0]) { + self.do_warn(_t("Render"), _t("No value found for the field "+self.field.string+" for value "+self.get("value"))); + return; + } self.display_value["" + self.get("value")] = data[0][1]; self.render_value(true); }); From 8a729c10faa83c9d3e17060e92ef5efd8e9b8773 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Tue, 14 Jan 2014 17:48:04 +0100 Subject: [PATCH 10/10] [FIX] purchase: fix workflow for orders based on incoming shipments Purchase orders Based on incoming shipments never ended in done stage bzr revid: dle@openerp.com-20140114164804-zhfy9lb308554kp1 --- addons/purchase/purchase.py | 18 ++++++++++++++++++ addons/purchase/purchase_workflow.xml | 3 ++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 957253bbf7c..90057fbe9a7 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -1269,4 +1269,22 @@ class mail_compose_message(osv.Model): wf_service.trg_validate(uid, 'purchase.order', context['default_res_id'], 'send_rfq', cr) return super(mail_compose_message, self).send_mail(cr, uid, ids, context=context) +class account_invoice(osv.Model): + _inherit = 'account.invoice' + + def invoice_validate(self, cr, uid, ids, context=None): + res = super(account_invoice, self).invoice_validate(cr, uid, ids, context=context) + purchase_order_obj = self.pool.get('purchase.order') + # read access on purchase.order object is not required + if not purchase_order_obj.check_access_rights(cr, uid, 'read', raise_exception=False): + user_id = SUPERUSER_ID + else: + user_id = uid + po_ids = purchase_order_obj.search(cr, user_id, [('invoice_ids', 'in', ids)], context=context) + wf_service = netsvc.LocalService("workflow") + for po_id in po_ids: + # Signal purchase order workflow that an invoice has been validated. + wf_service.trg_write(uid, 'purchase.order', po_id, cr) + return res + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml index 11936db0bed..bed4ba5275c 100644 --- a/addons/purchase/purchase_workflow.xml +++ b/addons/purchase/purchase_workflow.xml @@ -147,7 +147,7 @@ - invoice_method<>'order' and invoiced + invoice_method<>'order' @@ -200,6 +200,7 @@ + invoiced