diff --git a/addons/account/account.py b/addons/account/account.py
index c11d7394100..75041705547 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -2146,8 +2146,8 @@ class account_model_line(osv.osv):
_description = "Account Model Entries"
_columns = {
'name': fields.char('Name', size=64, required=True),
- 'sequence': fields.integer('Sequence', required=True, help="The sequence field is used to order the resources from lower sequences to higher ones"),
- 'quantity': fields.float('Quantity', digits_compute=dp.get_precision('Account'), help="The optional quantity on entries"),
+ 'sequence': fields.integer('Sequence', required=True, help="The sequence field is used to order the resources from lower sequences to higher ones."),
+ 'quantity': fields.float('Quantity', digits_compute=dp.get_precision('Account'), help="The optional quantity on entries."),
'debit': fields.float('Debit', digits_compute=dp.get_precision('Account')),
'credit': fields.float('Credit', digits_compute=dp.get_precision('Account')),
'account_id': fields.many2one('account.account', 'Account', required=True, ondelete="cascade"),
@@ -2156,7 +2156,7 @@ class account_model_line(osv.osv):
'amount_currency': fields.float('Amount Currency', help="The amount expressed in an optional other currency."),
'currency_id': fields.many2one('res.currency', 'Currency'),
'partner_id': fields.many2one('res.partner', 'Partner'),
- 'date_maturity': fields.selection([('today','Date of the day'), ('partner','Partner Payment Term')], 'Maturity date', help="The maturity date of the generated entries for this model. You can choose between the creation date or the creation date of the entries plus the partner payment terms."),
+ 'date_maturity': fields.selection([('today','Date of the day'), ('partner','Partner Payment Term')], 'Maturity Date', help="The maturity date of the generated entries for this model. You can choose between the creation date or the creation date of the entries plus the partner payment terms."),
}
_order = 'sequence'
_sql_constraints = [
diff --git a/addons/account/account_analytic_line.py b/addons/account/account_analytic_line.py
index a93dc70b2fb..08123c8f460 100644
--- a/addons/account/account_analytic_line.py
+++ b/addons/account/account_analytic_line.py
@@ -32,7 +32,7 @@ class account_analytic_line(osv.osv):
'product_uom_id': fields.many2one('product.uom', 'UoM'),
'product_id': fields.many2one('product.product', 'Product'),
'general_account_id': fields.many2one('account.account', 'General Account', required=True, ondelete='restrict'),
- 'move_id': fields.many2one('account.move.line', 'Move Line', ondelete='restrict', select=True),
+ 'move_id': fields.many2one('account.move.line', 'Move Line', ondelete='cascade', select=True),
'journal_id': fields.many2one('account.analytic.journal', 'Analytic Journal', required=True, ondelete='restrict', select=True),
'code': fields.char('Code', size=8),
'ref': fields.char('Ref.', size=64),
diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py
index ff0f0117ff5..04e780ade30 100644
--- a/addons/account/account_cash_statement.py
+++ b/addons/account/account_cash_statement.py
@@ -320,6 +320,7 @@ class account_cash_statement(osv.osv):
""" Changes statement state to Running.
@return: True
"""
+ obj_seq = self.pool.get('ir.sequence')
if context is None:
context = {}
statement_pool = self.pool.get('account.bank.statement')
@@ -329,15 +330,18 @@ class account_cash_statement(osv.osv):
raise osv.except_osv(_('Error !'), (_('User %s does not have rights to access %s journal !') % (statement.user_id.name, statement.journal_id.name)))
if statement.name and statement.name == '/':
- number = self.pool.get('ir.sequence').get(cr, uid, 'account.cash.statement')
+ if statement.journal_id.sequence_id:
+ c = {'fiscalyear_id': statement.period_id.fiscalyear_id.id}
+ st_number = obj_seq.get_id(cr, uid, statement.journal_id.sequence_id.id, context=c)
+ else:
+ st_number = obj_seq.get(cr, uid, 'account.cash.statement')
vals.update({
- 'name': number
+ 'name': st_number
})
vals.update({
'date': time.strftime("%Y-%m-%d %H:%M:%S"),
'state': 'open',
-
})
self.write(cr, uid, [statement.id], vals, context=context)
return True
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index bab2f43060f..e0a355c35bf 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -454,7 +454,7 @@
-
+
diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po
index dae24fa0df8..6c0713306f5 100644
--- a/addons/account/i18n/de.po
+++ b/addons/account/i18n/de.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-04-03 09:24+0000\n"
+"PO-Revision-Date: 2011-04-21 05:36+0000\n"
"Last-Translator: Ferdinand @ Camptocamp \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-04 04:47+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-22 04:38+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -911,7 +911,7 @@ msgstr "Erzeuge 3 Monats Periode"
#. module: account
#: report:account.overdue:0
msgid "Due"
-msgstr "fällig am"
+msgstr "Fällig"
#. module: account
#: view:account.invoice.report:0
@@ -2664,7 +2664,7 @@ msgstr ""
#: model:ir.actions.server,name:account.ir_actions_server_action_wizard_multi_chart
#: model:ir.ui.menu,name:account.menu_act_ir_actions_bleble
msgid "New Company Financial Setting"
-msgstr "Basiskonfiguration Unternehmen"
+msgstr "Neue Firma Financial Rahmen"
#. module: account
#: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
@@ -4014,7 +4014,7 @@ msgstr "Fällige Analytische Konten"
#: selection:account.invoice,state:0
#: report:account.overdue:0
msgid "Paid"
-msgstr "bezahlt am"
+msgstr "bezahlt"
#. module: account
#: field:account.invoice,tax_line:0
@@ -4189,7 +4189,7 @@ msgstr "Storniere Abschreibung"
#: field:account.model.line,date_maturity:0
#: report:account.overdue:0
msgid "Maturity date"
-msgstr "Fälligkeitstermin"
+msgstr "Datum Fällig"
#. module: account
#: view:report.account.receivable:0
@@ -7355,7 +7355,7 @@ msgstr "Manueller Kontenausgleich"
#. module: account
#: report:account.overdue:0
msgid "Total amount due:"
-msgstr "Gesamtbetrag (fällig):"
+msgstr "Gesamtbetrag fällig:"
#. module: account
#: field:account.analytic.chart,to_date:0
@@ -8741,7 +8741,7 @@ msgstr ""
#. module: account
#: report:account.overdue:0
msgid "Best regards."
-msgstr "Viele Grüsse."
+msgstr "Beste Grüsse."
#. module: account
#: view:account.invoice:0
diff --git a/addons/account/i18n/gl.po b/addons/account/i18n/gl.po
index 2d629ed90f1..28ae44ff267 100644
--- a/addons/account/i18n/gl.po
+++ b/addons/account/i18n/gl.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-02-02 10:14+0000\n"
-"Last-Translator: Alberto Luengo Cabanillas (Pexego) \n"
+"PO-Revision-Date: 2011-04-27 15:37+0000\n"
+"Last-Translator: Xosé \n"
"Language-Team: Galician \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:49+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-28 04:37+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -2140,7 +2140,7 @@ msgstr ""
#: field:analytic.entries.report,name:0
#: field:report.invoice.created,name:0
msgid "Description"
-msgstr "Descripción"
+msgstr "Descrición"
#. module: account
#: code:addons/account/account.py:2844
diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po
index 53eccc4f28f..fd8020ae0b8 100644
--- a/addons/account/i18n/pt_BR.po
+++ b/addons/account/i18n/pt_BR.po
@@ -7,13 +7,13 @@ 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-04-19 14:37+0000\n"
+"PO-Revision-Date: 2011-04-21 21:39+0000\n"
"Last-Translator: Nédio Batista Marques \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-20 04:36+0000\n"
+"X-Launchpad-Export-Date: 2011-04-22 04:38+0000\n"
"X-Generator: Launchpad (build 12758)\n"
#. module: account
@@ -1843,7 +1843,7 @@ msgstr "Registros por Linha"
#. module: account
#: report:account.tax.code.entries:0
msgid "A/c Code"
-msgstr ""
+msgstr "Código A/C"
#. module: account
#: field:account.invoice,move_id:0
@@ -2707,6 +2707,8 @@ msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
msgstr ""
+"O saldo final do extrato está incorreto!\n"
+"O saldo experado (%.2f) é diferente do saldo calculado (%.2f)"
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po
index 30b597eaf77..81f376dcd82 100644
--- a/addons/account/i18n/tr.po
+++ b/addons/account/i18n/tr.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-23 22:42+0000\n"
-"Last-Translator: Ahmet Altınışık \n"
+"PO-Revision-Date: 2011-04-27 21:47+0000\n"
+"Last-Translator: Ayhan KIZILTAN \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:55+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-28 04:37+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -39,8 +39,8 @@ msgid ""
"You cannot remove/deactivate an account which is set as a property to any "
"Partner."
msgstr ""
-"You cannot remove/deactivate an account which is set as a property to any "
-"Partner."
+"Herhangi bir Ortağa bir özellik olarak ayarlanmış bir hesabı "
+"kaldıramaz/durdurmazsınız."
#. module: account
#: view:account.move.reconcile:0
@@ -50,7 +50,7 @@ msgstr "Yevmiye Kaydını Mutabakatla"
#. module: account
#: field:account.installer.modules,account_voucher:0
msgid "Voucher Management"
-msgstr "Çek Yönetimi"
+msgstr "Fiş Yönetimi"
#. module: account
#: view:account.account:0
@@ -75,7 +75,7 @@ msgstr "Lütfen fatura dizisi tanımlayınız"
#. module: account
#: constraint:account.period:0
msgid "Error ! The duration of the Period(s) is/are invalid. "
-msgstr "Hata! Dönem bilgisi hatalı "
+msgstr "Hata! Dönem(ler)in süresi geçersiz. "
#. module: account
#: field:account.analytic.line,currency_id:0
@@ -95,7 +95,7 @@ msgstr "Bugüne kadarki Yaşlandırılmış Alacak"
#. module: account
#: field:account.partner.ledger,reconcil:0
msgid "Include Reconciled Entries"
-msgstr "Mutabakatlı girişler dahil"
+msgstr "Mutabakatlı girişleri içer"
#. module: account
#: view:account.pl.report:0
@@ -103,7 +103,7 @@ msgid ""
"The Profit and Loss report gives you an overview of your company profit and "
"loss in a single document"
msgstr ""
-"Kar / Zarar raporu, tek sayfada şirketinizin kar ve zarar durumu ile ilgili "
+"Kar ve Zarar raporu, tek sayfada şirketinizin kar ve zarar durumu ile ilgili "
"bilgi sunar."
#. module: account
@@ -114,7 +114,7 @@ msgstr "Fatura ya da ödemeden içe aktar"
#. module: account
#: model:ir.model,name:account.model_wizard_multi_charts_accounts
msgid "wizard.multi.charts.accounts"
-msgstr "wizard.multi.charts.accounts"
+msgstr "sihirbaz.çoklu.plan.hesaplar"
#. module: account
#: view:account.move:0
@@ -127,8 +127,8 @@ msgid ""
"If you unreconciliate transactions, you must also verify all the actions "
"that are linked to those transactions because they will not be disabled"
msgstr ""
-"If you unreconciliate transactions, you must also verify all the actions "
-"that are linked to those transactions because they will not be disabled"
+"Bir işlemin uzlaşmasını kaldırdığınızda, o işleme bağlı eylemler devre dışı "
+"bırakılmayacağı için o işleme bağlı bütün eylemleri de kontrol etmelisiniz."
#. module: account
#: report:account.tax.code.entries:0
@@ -139,7 +139,7 @@ msgstr "Muhasebe Girdileri-"
#: code:addons/account/account.py:1291
#, python-format
msgid "You can not delete posted movement: \"%s\"!"
-msgstr "You can not delete posted movement: \"%s\"!"
+msgstr "İşlenmiş hareketleri sizmezsiniz: \"%s\"!"
#. module: account
#: report:account.invoice:0
@@ -155,7 +155,7 @@ msgstr "Menşei"
#: view:account.move.line.reconcile:0
#: view:account.move.line.reconcile.writeoff:0
msgid "Reconcile"
-msgstr "Reconcile"
+msgstr "Mutabakat"
#. module: account
#: field:account.bank.statement.line,ref:0
@@ -177,9 +177,7 @@ msgstr "Mali Yılı Seçin "
msgid ""
"If the active field is set to False, it will allow you to hide the payment "
"term without removing it."
-msgstr ""
-"'Aktif' seçeneği işaretli değilse, ödeme bilgilerini silmeden gizlemenize "
-"izin verir."
+msgstr "Aktif seçeneği seçili değilse, Ödeme şartları silmeden gizlenir."
#. module: account
#: code:addons/account/invoice.py:1421
@@ -196,12 +194,12 @@ msgstr "Hesap Kaynağı"
#. module: account
#: model:ir.actions.act_window,name:account.act_acc_analytic_acc_5_report_hr_timesheet_invoice_journal
msgid "All Analytic Entries"
-msgstr "Bütün Analiz girişleri"
+msgstr "Bütün Analitik hareketler"
#. module: account
#: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
msgid "Invoices Created Within Past 15 Days"
-msgstr "Son 15 günde yaratılmış faturalar"
+msgstr "Son 15 Günde Oluşturulmuş Faturalar"
#. module: account
#: selection:account.account.type,sign:0
@@ -221,9 +219,9 @@ msgid ""
"invoice) to create analytic entries, OpenERP will look for a matching "
"journal of the same type."
msgstr ""
-"Gives the type of the analytic journal. When it needs for a document (eg: an "
-"invoice) to create analytic entries, OpenERP will look for a matching "
-"journal of the same type."
+"Analitik yevmiye defterinin tipini belirtir. Bir belge için (ör: fatura) "
+"analitik giriş oluşturmak gerektiğinde OpenERP aynı tipe uyan yevmiye "
+"defteri arayacaktır."
#. module: account
#: model:ir.actions.act_window,name:account.action_account_tax_template_form
@@ -234,7 +232,7 @@ msgstr "Vergi Şablonu"
#. module: account
#: model:ir.model,name:account.model_account_tax
msgid "account.tax"
-msgstr "account.tax"
+msgstr "muhasebe.vergi"
#. module: account
#: code:addons/account/account.py:901
@@ -243,13 +241,13 @@ msgid ""
"No period defined for this date: %s !\n"
"Please create a fiscal year."
msgstr ""
-"Bu tarih için dönem tanımlanmadı: ( %s )\n"
-"Lütfen mali yıl yaratınız."
+"Bu tarih için dönem belirtilmedi: %s !\n"
+"Lütfen bir mali yıl oluşturun."
#. module: account
#: model:ir.model,name:account.model_account_move_line_reconcile_select
msgid "Move line reconcile select"
-msgstr "Move line reconcile select"
+msgstr "Seçilen mutabakat satırını taşı"
#. module: account
#: help:account.model.line,sequence:0
@@ -257,8 +255,7 @@ msgid ""
"The sequence field is used to order the resources from lower sequences to "
"higher ones"
msgstr ""
-"The sequence field is used to order the resources from lower sequences to "
-"higher ones"
+"Sıra alanı, kaynakları küçükten büyüğe doğru sıralamak için kullanılır."
#. module: account
#: help:account.tax.code,notprintable:0
@@ -267,24 +264,24 @@ msgid ""
"Check this box if you don't want any VAT related to this Tax Code to appear "
"on invoices"
msgstr ""
-"Check this box if you don't want any VAT related to this Tax Code to appear "
-"on invoices"
+"Faturalarda bu Vergi Koduyla ilintili KDV görünmesini istemiyorsanız bu "
+"kutuyu işaretleyin."
#. module: account
#: code:addons/account/invoice.py:1210
#, python-format
msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
-msgstr "'%s' faturası parçalı öndendi: (Ödenen %s%s Toplam %s%s Kalan %s%s)"
+msgstr "'%s' nolu fatura kısmen ödendi: (Ödenen %s%s Toplam %s%s Kalan %s%s)"
#. module: account
#: model:process.transition,note:account.process_transition_supplierentriesreconcile0
msgid "Accounting entries are an input of the reconciliation."
-msgstr "Accounting entries are an input of the reconciliation."
+msgstr "Hesap girişleri uzlaşmaya ait girişlerdir."
#. module: account
#: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
msgid "Belgian Reports"
-msgstr "Belgian Reports"
+msgstr "Belçika Raporları"
#. module: account
#: code:addons/account/account_move_line.py:1176
@@ -302,7 +299,7 @@ msgstr "Hesaplanan bakiye"
#: model:ir.actions.act_window,name:account.action_view_account_use_model
#: model:ir.ui.menu,name:account.menu_action_manual_recurring
msgid "Manual Recurring"
-msgstr "Manual Recurring"
+msgstr "El ile Yineleme"
#. module: account
#: view:account.fiscalyear.close.state:0
@@ -312,7 +309,7 @@ msgstr "Mali Yılı Kapat"
#. module: account
#: field:account.automatic.reconcile,allow_write_off:0
msgid "Allow write off"
-msgstr "Allow write off"
+msgstr "Borcu silmeye izin ver"
#. module: account
#: view:account.analytic.chart:0
@@ -322,7 +319,7 @@ msgstr "Analiz için dönem seçin"
#. module: account
#: view:account.move.line:0
msgid "St."
-msgstr "St."
+msgstr "Ara Toplam"
#. module: account
#: code:addons/account/invoice.py:529
@@ -341,8 +338,8 @@ msgid ""
"Installs localized accounting charts to match as closely as possible the "
"accounting needs of your company based on your country."
msgstr ""
-"Installs localized accounting charts to match as closely as possible the "
-"accounting needs of your company based on your country."
+"Ülkenizde kullanılan hesap planına en uygun yerelleştirilmiş hesap planını "
+"kurar."
#. module: account
#: code:addons/account/wizard/account_move_journal.py:63
@@ -391,16 +388,20 @@ msgid ""
"OpenERP. Journal items are created by OpenERP if you use Bank Statements, "
"Cash Registers, or Customer/Supplier payments."
msgstr ""
+"Bu görünüm, OpenERP de kayıtların toplu olarak girilmesi için muhasebeciler "
+"tarafından kullanılır. Banka Hesap Özetleri, Kasa Kayıtları, veya "
+"Müşteri/Satıcı ödemelerine ait yevmiye girişleri OpenERP tarafından "
+"oluşturulur."
#. module: account
#: model:ir.model,name:account.model_account_tax_template
msgid "account.tax.template"
-msgstr "account.tax.template"
+msgstr "muhasebe.vergi.şablonu"
#. module: account
#: model:ir.model,name:account.model_account_bank_accounts_wizard
msgid "account.bank.accounts.wizard"
-msgstr "account.bank.accounts.wizard"
+msgstr "muhasebe.banka.hesap.sihirbazı"
#. module: account
#: field:account.move.line,date_created:0
@@ -421,7 +422,7 @@ msgstr "Açma/Kapama Durumu"
#. module: account
#: help:account.journal,currency:0
msgid "The currency used to enter statement"
-msgstr "The currency used to enter statement"
+msgstr "hesap özeti girişi için kullanılacak para birimi"
#. module: account
#: field:account.open.closed.fiscalyear,fyear_id:0
@@ -434,8 +435,8 @@ msgid ""
"This field contains the informatin related to the numbering of the journal "
"entries of this journal."
msgstr ""
-"This field contains the informatin related to the numbering of the journal "
-"entries of this journal."
+"Bu Alan, bu yevmiyenin yevmiye girişleri numaralandırılmasıyla ilintili "
+"bilgi içerir."
#. module: account
#: field:account.journal,default_debit_account_id:0
@@ -467,7 +468,7 @@ msgstr "Hesap Planı Şablonu"
#. module: account
#: help:account.model.line,amount_currency:0
msgid "The amount expressed in an optional other currency."
-msgstr "The amount expressed in an optional other currency."
+msgstr "Tutar, seçmeli olarak başka bir para birimiyle beliritlebilir."
#. module: account
#: help:account.journal.period,state:0
@@ -476,9 +477,9 @@ msgid ""
"it comes to 'Printed' state. When all transactions are done, it comes in "
"'Done' state."
msgstr ""
-"When journal period is created. The state is 'Draft'. If a report is printed "
-"it comes to 'Printed' state. When all transactions are done, it comes in "
-"'Done' state."
+"Yevmiye dönemi oluşturulduğunda, durum 'Taslak' tır. Bir rapor "
+"yazdırıldığındadurum 'Yazdırılmış' halini alır. Bütün işlemlemler "
+"tamamalandığında durum 'Tamamlandı' halini alır."
#. module: account
#: model:ir.actions.act_window,help:account.action_account_tax_chart
@@ -488,6 +489,10 @@ msgid ""
"amount of each area of the tax declaration for your country. It’s presented "
"in a hierarchical structure, which can be modified to fit your needs."
msgstr ""
+"Vergi Tablosu, Vergi Durumlarını (veya vergi kodlarını) gösteren bir ağaç "
+"görünümüdür ve geçerli vergi durumunu belirtir. Vergi Tablosu, ülkenize ait "
+"vergi tutarlarını gösterir. Gereksinimlerinize göre uyarlayabileceğiniz bir "
+"sıradüzenli yapıdadır."
#. module: account
#: view:account.analytic.line:0
@@ -531,12 +536,12 @@ msgstr "Seçili faturaları onayla"
#. module: account
#: field:account.addtmpl.wizard,cparent_id:0
msgid "Parent target"
-msgstr "Hedef Cari"
+msgstr "Ana Hedef"
#. module: account
#: field:account.bank.statement,account_id:0
msgid "Account used in this journal"
-msgstr "Cari bu yevmiyede kullanıldı"
+msgstr "Bu yevmiyede kullanılan hesap"
#. module: account
#: help:account.aged.trial.balance,chart_account_id:0
@@ -575,7 +580,7 @@ msgstr "Li."
#. module: account
#: field:account.automatic.reconcile,unreconciled:0
msgid "Not reconciled transactions"
-msgstr "Hareketler için mutabakat yapılmadı"
+msgstr "Mutabakat yapılmayan hareketler"
#. module: account
#: code:addons/account/account_cash_statement.py:348
@@ -599,7 +604,7 @@ msgstr "Bir Mali Yılı Kapat"
#. module: account
#: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
msgid "The accountant confirms the statement."
-msgstr "The accountant confirms the statement."
+msgstr "Muhasebeci hesap özetini onaylar."
#. module: account
#: selection:account.balance.report,display_account:0
@@ -1123,6 +1128,10 @@ msgid ""
"purchase orders or receipts. This way, you can control the invoice from your "
"supplier according to what you purchased or received."
msgstr ""
+"Satıcı Faturaları ile satıcılarınızın kestiği faturaları girip "
+"işleyebilirsiniz. OpenERP, satınalma siparişlerinden veya satıanalma "
+"fişlerinden taslak faturalar da oluşturabilir. Bu yolla siz de satıcı "
+"faturalarını satıalınan ve teslim alınan mala göre kontrol edebilirsainiz."
#. module: account
#: view:account.invoice.cancel:0
@@ -1403,6 +1412,8 @@ msgid ""
"entry per accounting document: invoice, refund, supplier payment, bank "
"statements, etc."
msgstr ""
+"Borç ya da alacak işlemi olmak üzere bir çok yevmiye kalemi içeren Yevmiye "
+"Girişidir. Her hesap belgesi için OpenERP bir tek Yevmiye girişi oluşturur."
#. module: account
#: view:account.entries.report:0
@@ -1547,6 +1558,11 @@ msgid ""
"the Payment column of a line, you can press F1 to open the reconciliation "
"form."
msgstr ""
+"Banka hesap özeti, belirli bir tarih aralığında, bir mevduat hesabında, "
+"kredi kartı hesabında veya herhangi bir finansal hesapta yapılan mali "
+"işlemlerin özetidir. Açılış bakiyesi otomatik olarak belirir ve özette "
+"kapanış bakiyesi degörülmelidir. Bir satırda Ödeme kolonunda iken F1 basarak "
+"Uzlaşm Formunu açabilirsiniz."
#. module: account
#: report:account.analytic.account.cost_ledger:0
@@ -1654,6 +1670,9 @@ msgid ""
"Have a complete tree view of all journal items per account code by clicking "
"on an account."
msgstr ""
+"Şirket Hesap Planı, her mali yıl için ve arama süzgeci dönemsel aramaya "
+"ayarlı olarak görünür. Bir hesaba tıklayarak o hesaba ait bütün yevmiye "
+"girişlerinin ağaç görünümü elde edilir."
#. module: account
#: constraint:account.fiscalyear:0
@@ -1786,7 +1805,7 @@ msgstr "Reserve And Profit/Loss Account"
#. module: account
#: sql_constraint:account.move.line:0
msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Hesap girişindeki Alacak / Borç değeri hatalı !"
#. module: account
#: view:account.invoice.report:0
@@ -1834,7 +1853,7 @@ msgstr "Sub Total"
#. module: account
#: view:account.account:0
msgid "Treasury Analysis"
-msgstr ""
+msgstr "Maliye İncelemesi"
#. module: account
#: constraint:res.company:0
@@ -1953,6 +1972,7 @@ msgid ""
"If the active field is set to False, it will allow you to hide the tax "
"without removing it."
msgstr ""
+"Aktif alan Yanlışa ayarlıysa, vergiyi silmeden gizlemenize izin verir."
#. module: account
#: help:account.bank.statement,name:0
@@ -2033,6 +2053,8 @@ msgid ""
"Invalid period ! Some periods overlap or the date period is not in the scope "
"of the fiscal year. "
msgstr ""
+"Geçersiz dönem ! Bazı dönemler çakışıyor veya mali yıl tarih dönemini "
+"kapsamıyor. "
#. module: account
#: selection:account.invoice,state:0
@@ -2046,7 +2068,7 @@ msgstr "Pro-forma"
#: code:addons/account/installer.py:348
#, python-format
msgid " Journal"
-msgstr ""
+msgstr " Yevmiye"
#. module: account
#: code:addons/account/account.py:1319
@@ -2055,6 +2077,8 @@ msgid ""
"There is no default default debit account defined \n"
"on journal \"%s\""
msgstr ""
+"Yevmiyede \"%s\" \n"
+"Varsayılan borç hesabı tanımlanmamış"
#. module: account
#: help:account.account,type:0
@@ -2085,6 +2109,9 @@ msgid ""
"certified Chart of Accounts exists for your specified country, a generic one "
"can be installed and will be selected by default."
msgstr ""
+"Varsayılan Hesap planı ülke seçiminize uyuyor. Belirlediğiniz ülke için "
+"onaylı Hesap Planı yoksa, genel bir hesap planı kurulur ve varsayılan "
+"seçilir."
#. module: account
#: view:account.account.type:0
@@ -2282,6 +2309,10 @@ msgid ""
"You can create one in the menu: \n"
"Configuration\\Financial Accounting\\Accounts\\Journals."
msgstr ""
+"Bu firma için %s tipindehesap yevmiyesi bulunamadı\n"
+"\n"
+"Menüde bir tane oluşturabilirsiniz \n"
+"Konfigürason\\Mali Hesap\\Hesaplar\\evmiyeler."
#. module: account
#: field:account.invoice.tax,base_code_id:0
@@ -2312,6 +2343,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 ""
+"Bu menü, fatura ve ödemelere göre KDV beyanı yazdırır. Bir ya da birkaç mali "
+"yıl dönemi seçin. Vergi beyanı için gerekli bilgi OpenERP tarafından "
+"faturalardan (veya bazı ülkelerde ödemelerden) otomatik olarak çıkartılır. "
+"Bu bilgi gerçek zamana güncellenir. Bu bilgi, vergiyi ay başlarında ve ay "
+"sonlarında ya da üçer aylık sürelerde izleminiz açısından yararlıdır."
#. module: account
#: selection:account.move.line,centralisation:0
@@ -2397,7 +2433,7 @@ msgstr ""
#: view:account.print.journal:0
msgid ""
"This report gives you an overview of the situation of a specific journal"
-msgstr ""
+msgstr "Bu rapor, belirli bir yevmiyenin durumuna gözatmanızı sağlar."
#. module: account
#: constraint:product.category:0
@@ -2724,7 +2760,7 @@ msgstr "Base Code Amount"
#. module: account
#: field:wizard.multi.charts.accounts,sale_tax:0
msgid "Default Sale Tax"
-msgstr ""
+msgstr "Varsayılan Satış Vergisi"
#. module: account
#: help:account.model.line,date_maturity:0
@@ -2908,7 +2944,7 @@ msgstr "Görünüm"
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
-msgstr ""
+msgstr "BNK%s"
#. module: account
#: code:addons/account/account.py:2906
@@ -3155,7 +3191,7 @@ msgstr "Faturada Yazılamaz"
#: report:account.vat.declaration:0
#: field:account.vat.declaration,chart_tax_id:0
msgid "Chart of Tax"
-msgstr ""
+msgstr "Vergi Tablosu"
#. module: account
#: view:account.journal:0
@@ -3260,7 +3296,7 @@ msgstr ""
#. module: account
#: report:account.general.ledger:0
msgid "Counterpart"
-msgstr ""
+msgstr "Karşılık"
#. module: account
#: view:account.journal:0
@@ -3514,7 +3550,7 @@ msgstr "Satıcılar Hesabı"
#: constraint:account.move:0
msgid ""
"You cannot create entries on different periods/journals in the same move"
-msgstr ""
+msgstr "Aynı işlemde farklı dönemlere/yevmiyelere girişler oluşturamazsınız"
#. module: account
#: model:process.node,name:account.process_node_supplierpaymentorder0
@@ -3542,7 +3578,7 @@ msgstr "Unit Price"
#. module: account
#: model:ir.actions.act_window,name:account.action_account_tree1
msgid "Analytic Items"
-msgstr ""
+msgstr "Çözümsel Kalemler"
#. module: account
#: code:addons/account/account_move_line.py:1128
@@ -3560,7 +3596,7 @@ msgstr "#Entries"
#, python-format
msgid ""
"You selected an Unit of Measure which is not compatible with the product."
-msgstr ""
+msgstr "ürünle uyumlu olmayan bir Ölçü Birimi seçtiniz."
#. module: account
#: code:addons/account/invoice.py:473
@@ -3695,6 +3731,7 @@ msgstr "Onayla"
#: sql_constraint:account.model.line:0
msgid "Wrong credit or debit value in model (Credit Or Debit Must Be \"0\")!"
msgstr ""
+"Modelde yanlış alacak veya borç değeri (Alacak veya Borç \"0\" olmalı) !"
#. module: account
#: model:ir.actions.act_window,help:account.action_account_invoice_report_all
@@ -3771,7 +3808,7 @@ msgstr "Analytic Balance"
#: code:addons/account/report/account_profit_loss.py:124
#, python-format
msgid "Net Loss"
-msgstr ""
+msgstr "Net Zarar"
#. module: account
#: help:account.account,active:0
@@ -3779,6 +3816,8 @@ msgid ""
"If the active field is set to False, it will allow you to hide the account "
"without removing it."
msgstr ""
+"Aktif alan Yanlış olarak ayarlıysa, hesabı silmeden gizlemenize izin "
+"verecektir."
#. module: account
#: view:account.tax.template:0
@@ -3975,7 +4014,7 @@ msgstr "Statement %s is confirmed, journal items are created."
#. module: account
#: constraint:account.fiscalyear:0
msgid "Error! The duration of the Fiscal Year is invalid. "
-msgstr ""
+msgstr "Hata! Mali Yıl süresi geçersiz. "
#. module: account
#: field:report.aged.receivable,name:0
@@ -3990,7 +4029,7 @@ msgstr "Check if you want to display Accounts with 0 balance too."
#. module: account
#: view:account.tax:0
msgid "Compute Code"
-msgstr ""
+msgstr "Kodu Hesapla"
#. module: account
#: view:account.account.template:0
@@ -4096,7 +4135,7 @@ msgstr "Account Journal Select"
#. module: account
#: view:account.invoice:0
msgid "Print Invoice"
-msgstr ""
+msgstr "Faturayı Yazdır"
#. module: account
#: view:account.tax.template:0
@@ -4146,6 +4185,8 @@ msgid ""
"This will automatically configure your chart of accounts, bank accounts, "
"taxes and journals according to the selected template"
msgstr ""
+"Bu Hesap Planınızı, banka hesaplarınızı, vergilerinizi ve yevmiyeleri "
+"seçilen şablona uygun olarak otomatikmen yapılandıracaktır."
#. module: account
#: field:account.tax,price_include:0
@@ -4229,7 +4270,7 @@ msgstr "Closing balance based on cashBox"
#: constraint:account.account:0
#: constraint:account.tax.code:0
msgid "Error ! You can not create recursive accounts."
-msgstr ""
+msgstr "Hata! Yinelen hesap oluşturamazsınız."
#. module: account
#: constraint:account.account:0
@@ -4248,7 +4289,7 @@ msgstr "Generate Entries"
#. module: account
#: help:account.vat.declaration,chart_tax_id:0
msgid "Select Charts of Taxes"
-msgstr ""
+msgstr "Vergi Tablosu seçin"
#. module: account
#: view:account.fiscal.position:0
@@ -9874,12 +9915,12 @@ msgstr "Maturity"
#. module: account
#: selection:account.aged.trial.balance,direction_selection:0
msgid "Future"
-msgstr "Future"
+msgstr "İleri Tarihli İşlemler"
#. module: account
#: view:account.move.line:0
msgid "Search Journal Items"
-msgstr "Search Journal Items"
+msgstr "Yevmiye Maddelerini Araştır"
#. module: account
#: help:account.tax,base_sign:0
@@ -9891,7 +9932,7 @@ msgstr "Search Journal Items"
#: help:account.tax.template,ref_tax_sign:0
#: help:account.tax.template,tax_sign:0
msgid "Usually 1 or -1."
-msgstr "Usually 1 or -1."
+msgstr "Genelde 1 veya -1"
#. module: account
#: model:ir.model,name:account.model_account_fiscal_position_account_template
diff --git a/addons/account/project/wizard/account_analytic_journal_report.py b/addons/account/project/wizard/account_analytic_journal_report.py
index cb2b67aad39..59dd0361805 100644
--- a/addons/account/project/wizard/account_analytic_journal_report.py
+++ b/addons/account/project/wizard/account_analytic_journal_report.py
@@ -22,8 +22,8 @@ import time
from osv import osv, fields
-class account_analytic_Journal_report(osv.osv_memory):
- _name = 'account.analytic.Journal.report'
+class account_analytic_journal_report(osv.osv_memory):
+ _name = 'account.analytic.journal.report'
_description = 'Account Analytic Journal'
_columns = {
@@ -52,5 +52,5 @@ class account_analytic_Journal_report(osv.osv_memory):
'datas': datas,
}
-account_analytic_Journal_report()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+account_analytic_journal_report()
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/account/project/wizard/account_analytic_journal_report_view.xml b/addons/account/project/wizard/account_analytic_journal_report_view.xml
index 137920ee056..20777401da0 100644
--- a/addons/account/project/wizard/account_analytic_journal_report_view.xml
+++ b/addons/account/project/wizard/account_analytic_journal_report_view.xml
@@ -4,7 +4,7 @@
Account Analytic Journal
- account.analytic.Journal.report
+ account.analytic.journal.report
form
diff --git a/addons/account_budget/report/budget_report.py b/addons/account_budget/report/budget_report.py
index 8b98b067bb3..7681f9268d9 100644
--- a/addons/account_budget/report/budget_report.py
+++ b/addons/account_budget/report/budget_report.py
@@ -67,6 +67,8 @@ class budget_report(report_sxw.rml_parse):
context = {'wizard_date_from': d_from, 'wizard_date_to': d_to}
for i in range(0, len(an_ids)):
+ if not an_ids[i][0]:
+ continue
analytic_name = acc_analytic_obj.browse(self.cr, self.uid, [an_ids[i][0]])
res={
'b_id': '-1',
diff --git a/addons/account_budget/report/crossovered_budget_report.py b/addons/account_budget/report/crossovered_budget_report.py
index 8a3b745e32a..b70b7da34bb 100644
--- a/addons/account_budget/report/crossovered_budget_report.py
+++ b/addons/account_budget/report/crossovered_budget_report.py
@@ -72,6 +72,8 @@ class budget_report(report_sxw.rml_parse):
context = {'wizard_date_from': d_from, 'wizard_date_to': d_to}
for i in range(0, len(an_ids)):
+ if not an_ids[i][0]:
+ continue
analytic_name = acc_analytic_obj.browse(self.cr, self.uid, [an_ids[i][0]])
res={
'b_id': '-1',
diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index a6699d9af04..5eadb0049b0 100644
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -338,7 +338,7 @@ class payment_line(osv.osv):
required=True, help='Payment amount in the partner currency'),
'currency': fields.many2one('res.currency','Partner Currency', required=True),
'company_currency': fields.many2one('res.currency', 'Company Currency', readonly=True),
- 'bank_id': fields.many2one('res.partner.bank', 'Destination Bank account'),
+ 'bank_id': fields.many2one('res.partner.bank', 'Destination Bank Account'),
'order_id': fields.many2one('payment.order', 'Order', required=True,
ondelete='cascade', select=True),
'partner_id': fields.many2one('res.partner', string="Partner", required=True, help='The Ordering Customer'),
diff --git a/addons/account_payment/i18n/ro.po b/addons/account_payment/i18n/ro.po
index 405e9574e7a..78a7caaaf1e 100644
--- a/addons/account_payment/i18n/ro.po
+++ b/addons/account_payment/i18n/ro.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-08-02 22:08+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2011-04-26 18:16+0000\n"
+"Last-Translator: filsys \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-15 05:33+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-27 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
#. module: account_payment
#: field:payment.order,date_scheduled:0
@@ -261,7 +261,7 @@ msgstr ""
#: code:addons/account_payment/account_move_line.py:110
#, python-format
msgid "Error !"
-msgstr ""
+msgstr "Eroare !"
#. module: account_payment
#: view:account.move.line:0
@@ -414,7 +414,7 @@ msgstr "Mesajul următor al dialogului"
#: code:addons/account_payment/account_move_line.py:110
#, python-format
msgid "No partner defined on entry line"
-msgstr ""
+msgstr "Nu a fost definit nici un partener"
#. module: account_payment
#: help:payment.line,info_partner:0
diff --git a/addons/account_sequence/i18n/pt.po b/addons/account_sequence/i18n/pt.po
new file mode 100644
index 00000000000..053e67f95b3
--- /dev/null
+++ b/addons/account_sequence/i18n/pt.po
@@ -0,0 +1,221 @@
+# Portuguese translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-04-24 03:28+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Portuguese \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-04-25 04:50+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+#: model:ir.actions.act_window,name:account_sequence.action_account_seq_installer
+msgid "Account Sequence Application Configuration"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move:0
+msgid ""
+"You cannot create entries on different periods/journals in the same move"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.move,internal_sequence_number:0
+#: help:account.move.line,internal_sequence_number:0
+msgid "Internal Sequence Number"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_next:0
+msgid "Next number of this sequence"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_next:0
+msgid "Next Number"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_increment:0
+msgid "Increment Number"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.module.module,description:account_sequence.module_meta_information
+msgid ""
+"\n"
+" This module maintains internal sequence number for accounting entries.\n"
+" "
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.module.module,shortdesc:account_sequence.module_meta_information
+msgid "Entries Sequence Numbering"
+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 ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure Your Account Sequence Application"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,progress:0
+msgid "Configuration Progress"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,suffix:0
+msgid "Suffix value of the record for the sequence"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.journal,internal_sequence_id:0
+msgid ""
+"This sequence will be used to maintain the internal number for the journal "
+"entries related to this journal."
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,padding:0
+msgid "Number padding"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move_line
+msgid "Journal Items"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.move,internal_sequence_number:0
+#: field:account.move.line,internal_sequence_number:0
+msgid "Internal Number"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,padding:0
+msgid ""
+"OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
+"get the required padding size."
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,name:0
+msgid "Name"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move:0
+msgid ""
+"You cannot create more than one move per period on centralized journal"
+msgstr ""
+
+#. module: account_sequence
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.journal,internal_sequence_id:0
+msgid "Internal Sequence"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_sequence_installer
+msgid "account.sequence.installer"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure"
+msgstr ""
+
+#. module: account_sequence
+#: help:account.sequence.installer,prefix:0
+msgid "Prefix value of the record for the sequence"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move
+msgid "Account Entry"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,suffix:0
+msgid "Suffix"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,config_logo:0
+msgid "Image"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "title"
+msgstr ""
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_sequence
+#: field:account.sequence.installer,prefix:0
+msgid "Prefix"
+msgstr ""
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_journal
+msgid "Journal"
+msgstr ""
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "You can enhance the Account Sequence Application by installing ."
+msgstr ""
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr ""
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index 9bfee8b8d49..b4422cd8051 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -379,6 +379,8 @@ class account_voucher(osv.osv):
account_id = partner.property_account_payable.id
tr_type = 'purchase'
else:
+ if not journal.default_credit_account_id or not journal.default_debit_account_id:
+ raise osv.except_osv(_('Error !'), _('Please define default credit/debit account on the %s !') % (journal.name))
account_id = journal.default_credit_account_id.id or journal.default_debit_account_id.id
tr_type = 'receipt'
diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py
index 39ffeb70eed..6dfaac21e70 100644
--- a/addons/analytic/analytic.py
+++ b/addons/analytic/analytic.py
@@ -150,7 +150,7 @@ class account_analytic_account(osv.osv):
_columns = {
'name': fields.char('Account Name', size=128, required=True),
'complete_name': fields.function(_complete_name_calc, method=True, type='char', string='Full Account Name'),
- 'code': fields.char('Account Code', size=24),
+ 'code': fields.char('Account Code', size=24, select=True),
'type': fields.selection([('view','View'), ('normal','Normal')], 'Account Type', help='If you select the View Type, it means you won\'t allow to create journal entries using that account.'),
'description': fields.text('Description'),
'parent_id': fields.many2one('account.analytic.account', 'Parent Analytic Account', select=2),
@@ -245,13 +245,23 @@ class account_analytic_account(osv.osv):
cr.execute("select analytic_account_id from project_project")
project_ids = [x[0] for x in cr.fetchall()]
return self.name_get(cr, uid, project_ids, context=context)
- account = self.search(cr, uid, [('code', '=', name)] + args, limit=limit, context=context)
- if not account:
- account = self.search(cr, uid, [('name', 'ilike', '%%%s%%' % name)] + args, limit=limit, context=context)
- newacc = account
- while newacc:
- newacc = self.search(cr, uid, [('parent_id', 'in', newacc)]+args, limit=limit, context=context)
- account += newacc
+ if name:
+ account = self.search(cr, uid, [('code', '=', name)] + args, limit=limit, context=context)
+ if not account:
+ names=map(lambda i : i.strip(),name.split('/'))
+ for i in range(len(names)):
+ dom=[('name', operator, names[i])]
+ if i>0:
+ dom+=[('id','child_of',account)]
+ account = self.search(cr, uid, dom, limit=limit, context=context)
+ newacc = account
+ while newacc:
+ newacc = self.search(cr, uid, [('parent_id', 'in', newacc)], limit=limit, context=context)
+ account += newacc
+ if args:
+ account = self.search(cr, uid, [('id', 'in', account)] + args, limit=limit, context=context)
+ else:
+ account = self.search(cr, uid, args, limit=limit, context=context)
return self.name_get(cr, uid, account, context=context)
account_analytic_account()
diff --git a/addons/analytic/i18n/tr.po b/addons/analytic/i18n/tr.po
new file mode 100644
index 00000000000..6934dd45c10
--- /dev/null
+++ b/addons/analytic/i18n/tr.po
@@ -0,0 +1,255 @@
+# Turkish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-04-26 21:49+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Turkish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-04-27 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: analytic
+#: field:account.analytic.account,child_ids:0
+msgid "Child Accounts"
+msgstr "Muavin Hesaplar"
+
+#. module: analytic
+#: field:account.analytic.account,name:0
+msgid "Account Name"
+msgstr "Hesap Adı"
+
+#. module: analytic
+#: help:account.analytic.line,unit_amount:0
+msgid "Specifies the amount of quantity to count."
+msgstr ""
+
+#. module: analytic
+#: model:ir.module.module,description:analytic.module_meta_information
+msgid ""
+"Module for defining analytic accounting object.\n"
+" "
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,state:0
+msgid "State"
+msgstr "Durum"
+
+#. module: analytic
+#: field:account.analytic.account,user_id:0
+msgid "Account Manager"
+msgstr "Hesap Yöneticisi"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Draft"
+msgstr "Taslak"
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Closed"
+msgstr "Kapalı"
+
+#. module: analytic
+#: field:account.analytic.account,debit:0
+msgid "Debit"
+msgstr "Borç"
+
+#. module: analytic
+#: help:account.analytic.account,state:0
+msgid ""
+"* When an account is created its in 'Draft' state. "
+" \n"
+"* If any associated partner is there, it can be in 'Open' state. "
+" \n"
+"* If any pending balance is there it can be in 'Pending'. "
+" \n"
+"* And finally when all the transactions are over, it can be in 'Close' "
+"state. \n"
+"* The project can be in either if the states 'Template' and 'Running'.\n"
+" If it is template then we can make projects based on the template projects. "
+"If its in 'Running' state it is a normal project. "
+" \n"
+" If it is to be reviewed then the state is 'Pending'.\n"
+" When the project is completed the state is set to 'Done'."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,type:0
+msgid "Account Type"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Template"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: analytic
+#: model:ir.model,name:analytic.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,description:0
+#: field:account.analytic.line,name:0
+msgid "Description"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "Normal"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,company_id:0
+#: field:account.analytic.line,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,quantity_max:0
+msgid "Maximum Quantity"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.line,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,parent_id:0
+msgid "Parent Analytic Account"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.line,date:0
+msgid "Date"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,currency_id:0
+msgid "Account currency"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,quantity:0
+#: field:account.analytic.line,unit_amount:0
+msgid "Quantity"
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.line,amount:0
+msgid ""
+"Calculated by multiplying the quantity and the price given in the Product's "
+"cost price. Always expressed in the company main currency."
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.account,quantity_max:0
+msgid "Sets the higher limit of quantity of hours."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,credit:0
+msgid "Credit"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.line,amount:0
+msgid "Amount"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,contact_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid ""
+"Error! The currency has to be the same as the currency of the selected "
+"company"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,balance:0
+msgid "Balance"
+msgstr ""
+
+#. module: analytic
+#: constraint:account.analytic.account:0
+msgid "Error! You can not create recursive analytic accounts."
+msgstr ""
+
+#. module: analytic
+#: help:account.analytic.account,type:0
+msgid ""
+"If you select the View Type, it means you won't allow to create journal "
+"entries using that account."
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,date:0
+msgid "Date End"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,code:0
+msgid "Account Code"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,complete_name:0
+msgid "Full Account Name"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.line,account_id:0
+#: model:ir.model,name:analytic.model_account_analytic_account
+#: model:ir.module.module,shortdesc:analytic.module_meta_information
+msgid "Analytic Account"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,type:0
+msgid "View"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,date_start:0
+msgid "Date Start"
+msgstr ""
+
+#. module: analytic
+#: selection:account.analytic.account,state:0
+msgid "Open"
+msgstr ""
+
+#. module: analytic
+#: field:account.analytic.account,line_ids:0
+msgid "Analytic Entries"
+msgstr ""
diff --git a/addons/base_action_rule/i18n/it.po b/addons/base_action_rule/i18n/it.po
index 5eb83aebe3f..06b819cb545 100644
--- a/addons/base_action_rule/i18n/it.po
+++ b/addons/base_action_rule/i18n/it.po
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2011-01-13 11:58+0000\n"
-"Last-Translator: Nicola Riolini - Micronaet \n"
+"PO-Revision-Date: 2011-04-25 09:02+0000\n"
+"Last-Translator: simone.sandri \n"
"Language-Team: Italian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-01-15 05:55+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-26 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
@@ -78,7 +78,7 @@ msgstr "Giorni"
#. module: base_action_rule
#: field:base.action.rule,last_run:0
msgid "Last Run"
-msgstr ""
+msgstr "Ultima Esecuzione"
#. module: base_action_rule
#: code:addons/base_action_rule/base_action_rule.py:313
diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 3e3e7e14b3d..71c84a2cda2 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -1300,7 +1300,7 @@ e.g.: Every other month on the last Sunday of the month for 10 occurrences:\
if name == "UNTIL":
is_until = True
value = parser.parse(value)
- rrule_until_date = parser.parse(value.strftime("%Y-%m-%d"))
+ rrule_until_date = parser.parse(value.strftime("%Y-%m-%d %H:%M:%S"))
if until_date and until_date >= rrule_until_date:
until_date = rrule_until_date
if until_date:
diff --git a/addons/base_calendar/i18n/tr.po b/addons/base_calendar/i18n/tr.po
new file mode 100644
index 00000000000..97cefdf1d28
--- /dev/null
+++ b/addons/base_calendar/i18n/tr.po
@@ -0,0 +1,1660 @@
+# Turkish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-04-23 18:46+0000\n"
+"Last-Translator: Ayhan KIZILTAN \n"
+"Language-Team: Turkish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-04-24 04:37+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event starts"
+msgstr "Olay Başlar"
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Hourly"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required to Join"
+msgstr "Katılmak gerekir"
+
+#. module: base_calendar
+#: help:calendar.event,exdate:0
+#: help:calendar.todo,exdate:0
+msgid ""
+"This property defines the list of date/time exceptions for a recurring "
+"calendar component."
+msgstr ""
+"Bu özellik yinelenen takvim öğeleri için istisna tutulan tarih/saat "
+"listesini belirtir."
+
+#. module: base_calendar
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event.edit.all,name:0
+msgid "Title"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Monthly"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invited User"
+msgstr "Davetli Kullanıcı"
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,recurrency:0
+#: help:calendar.todo,recurrency:0
+msgid "Recurrent Meeting"
+msgstr "Yinelenen Toplantı"
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
+#: model:ir.ui.menu,name:base_calendar.menu_crm_meeting_avail_alarm
+msgid "Alarms"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Sunday"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,role:0
+msgid "Role"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation details"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fourth"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,show_as:0
+#: field:calendar.todo,show_as:0
+msgid "Show as"
+msgstr "Farklı Göster"
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,day:0
+#: selection:base.calendar.set.exrule,select1:0
+#: field:calendar.event,day:0
+#: selection:calendar.event,select1:0
+#: field:calendar.todo,day:0
+#: selection:calendar.todo,select1:0
+msgid "Date of month"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Public"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid " "
+msgstr " "
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "March"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
+#, python-format
+msgid "Warning !"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Friday"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,allday:0
+#: field:calendar.todo,allday:0
+msgid "All Day"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,select1:0
+#: field:calendar.event,select1:0
+#: field:calendar.todo,select1:0
+msgid "Option"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,availability:0
+#: selection:calendar.event,show_as:0
+#: selection:calendar.todo,show_as:0
+#: selection:res.users,availability:0
+msgid "Free"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,rsvp:0
+msgid "Indicats whether the favor of a reply is requested"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,delegated_to:0
+msgid "The users that the original request was delegated to"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,ref:0
+msgid "Event Ref"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,we:0
+#: field:calendar.event,we:0
+#: field:calendar.todo,we:0
+msgid "Wed"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Show time as"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,tu:0
+#: field:calendar.event,tu:0
+#: field:calendar.todo,tu:0
+msgid "Tue"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Yearly"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_related:0
+#: selection:res.alarm,trigger_related:0
+msgid "The event ends"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Last"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,state:0
+msgid "Status of the attendee's participation"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Room"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Days"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Invitation Detail"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1356
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:96
+#: code:addons/base_calendar/wizard/base_calendar_invite_attendee.py:143
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:128
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:136
+#, python-format
+msgid "Error!"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Chair Person"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Procedure"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Cancelled"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Minutes"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Display"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event.edit.all:0
+msgid "Edit all Occurrences"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation type"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Secondly"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,event_date:0
+#: field:calendar.attendee,event_date:0
+#: view:calendar.event:0
+msgid "Event Date"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Group By..."
+msgstr ""
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,email:0
+msgid "Provide external email address who will receive this invitation."
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.module.module,description:base_calendar.module_meta_information
+msgid ""
+"Full featured calendar system that supports:\n"
+" - Calendar of events\n"
+" - Alerts (create requests)\n"
+" - Recurring events\n"
+" - Invitations to people"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,cutype:0
+msgid "Specify the type of Invitation"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Years"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,event_end_date:0
+#: field:calendar.attendee,event_end_date:0
+msgid "Event End Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Optional Participation"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,date_deadline:0
+#: field:calendar.todo,date_deadline:0
+msgid "Deadline"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:385
+#: code:addons/base_calendar/base_calendar.py:1090
+#: code:addons/base_calendar/base_calendar.py:1092
+#, python-format
+msgid "Warning!"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,active:0
+#: help:calendar.todo,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the "
+"event alarm information without removing it."
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.module.module,shortdesc:base_calendar.module_meta_information
+msgid "Basic Calendar Functionality"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,organizer:0
+#: field:calendar.event,organizer_id:0
+#: field:calendar.todo,organizer:0
+#: field:calendar.todo,organizer_id:0
+msgid "Organizer"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+#: field:calendar.event,user_id:0
+#: field:calendar.todo,user_id:0
+msgid "Responsible"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: model:res.request.link,name:base_calendar.request_link_meeting
+msgid "Event"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,edit_all:0
+#: help:calendar.todo,edit_all:0
+msgid "Edit all Occurrences of recurrent Meeting."
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_occurs:0
+#: selection:res.alarm,trigger_occurs:0
+msgid "Before"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Confirmed"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_calendar_event_edit_all
+msgid "Edit all events"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,attendee_ids:0
+#: field:calendar.event,attendee_ids:0
+#: field:calendar.todo,attendee_ids:0
+msgid "Attendees"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Confirm"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_todo
+msgid "Calendar Task"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,su:0
+#: field:calendar.event,su:0
+#: field:calendar.todo,su:0
+msgid "Sun"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,cutype:0
+msgid "Invite Type"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,partner_id:0
+msgid "Partner related to contact"
+msgstr ""
+
+#. module: base_calendar
+#: view:res.alarm:0
+msgid "Reminder details"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,parent_ids:0
+msgid "Delegrated From"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,select1:0
+#: selection:calendar.event,select1:0
+#: selection:calendar.todo,select1:0
+msgid "Day of month"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event,location:0
+#: field:calendar.event.edit.all,location:0
+#: field:calendar.todo,location:0
+msgid "Location"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,send_mail:0
+msgid "Send mail?"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,email:0
+#: selection:calendar.alarm,action:0
+#: field:calendar.attendee,email:0
+msgid "Email"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Event Detail"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Run"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,exdate:0
+#: field:calendar.todo,exdate:0
+msgid "Exception Date/Times"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Confidential"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,end_date:0
+#: field:calendar.event,end_date:0
+#: field:calendar.todo,end_date:0
+msgid "Repeat Until"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,help:base_calendar.action_res_alarm_view
+msgid ""
+"Create specific calendar alarms that may be assigned to calendar events or "
+"meetings."
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Visibility"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,rsvp:0
+msgid "Required Reply?"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,base_calendar_url:0
+#: field:calendar.todo,base_calendar_url:0
+msgid "Caldav URL"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "Select range to Exclude"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_uid:0
+#: field:calendar.todo,recurrent_uid:0
+msgid "Recurrent ID"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "July"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Accepted"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,th:0
+#: field:calendar.event,th:0
+#: field:calendar.todo,th:0
+msgid "Thu"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,child_ids:0
+msgid "Delegrated To"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Required Reply"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "Forever"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "Participation required"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "_Cancel"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,create_date:0
+#: field:calendar.todo,create_date:0
+msgid "Created"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,class:0
+#: selection:calendar.todo,class:0
+msgid "Private"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Daily"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:385
+#, python-format
+msgid "Can not Duplicate"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,class:0
+#: field:calendar.todo,class:0
+msgid "Mark as"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,partner_address_id:0
+msgid "Contact"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,rrule_type:0
+#: help:calendar.todo,rrule_type:0
+msgid "Let the event automatically repeat at that interval"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Delegate"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,partner_id:0
+#: view:calendar.attendee:0
+#: field:calendar.attendee,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: selection:base_calendar.invite.attendee,type:0
+msgid "Partner Contacts"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "_Ok"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "First"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Privacy"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,vtimezone:0
+#: field:calendar.todo,vtimezone:0
+msgid "Timezone"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Subject"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "September"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "December"
+msgstr ""
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,send_mail:0
+msgid "Check this if you want to send an Email to Invited Person"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Availability"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event.edit.all:0
+msgid "_Save"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Individual"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,count:0
+#: help:calendar.todo,count:0
+msgid "Repeat x times"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,user_id:0
+msgid "Owner"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Delegation Info"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event.edit.all,date:0
+msgid "Start Date"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,cn:0
+msgid "Common name"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Declined"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "My Role"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "My Events"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Decline"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Weeks"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Group"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,edit_all:0
+#: field:calendar.todo,edit_all:0
+msgid "Edit All"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,contact_ids:0
+msgid "Contacts"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_res_alarm
+msgid "Basic Alarm Information"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,fr:0
+#: field:calendar.event,fr:0
+#: field:calendar.todo,fr:0
+msgid "Fri"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_interval:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+#: selection:res.alarm,trigger_interval:0
+msgid "Hours"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1092
+#, python-format
+msgid "Count can not be Negative"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,member:0
+msgid "Member"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,location:0
+#: help:calendar.todo,location:0
+msgid "Location of Event"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,rrule:0
+#: field:calendar.todo,rrule:0
+msgid "Recurrent Rule"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,attach:0
+msgid "Attachment"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation From"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "End of recurrency"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event.edit.all,alarm_id:0
+msgid "Reminder"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+#: model:ir.actions.act_window,name:base_calendar.action_base_calendar_set_exrule
+#: model:ir.model,name:base_calendar.model_base_calendar_set_exrule
+msgid "Set Exrule"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: model:ir.actions.act_window,name:base_calendar.action_view_event
+#: model:ir.ui.menu,name:base_calendar.menu_events
+msgid "Events"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_view_calendar_invite_attendee_wizard
+#: model:ir.model,name:base_calendar.model_base_calendar_invite_attendee
+msgid "Invite Attendees"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,email:0
+msgid "Email of Invited Person"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,repeat:0
+#: field:calendar.event,count:0
+#: field:calendar.todo,count:0
+#: field:res.alarm,repeat:0
+msgid "Repeat"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,dir:0
+msgid ""
+"Reference to the URIthat points to the directory information corresponding "
+"to the attendee."
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "August"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Monday"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Third"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "June"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,alarm_id:0
+msgid "Basic Alarm"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+#: view:calendar.event:0
+msgid "The"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,delegated_from:0
+msgid "Delegated From"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event,date:0
+msgid "Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "November"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,member:0
+msgid "Indicate the groups that the attendee belongs to"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+msgid "Data"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,mo:0
+#: field:calendar.event,mo:0
+#: field:calendar.todo,mo:0
+msgid "Mon"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,count:0
+msgid "Count"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "No Repeat"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "October"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Uncertain"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,language:0
+msgid "Language"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_occurs:0
+#: field:res.alarm,trigger_occurs:0
+msgid "Triggers"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "January"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_related:0
+#: field:res.alarm,trigger_related:0
+msgid "Related to"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,interval:0
+#: field:calendar.alarm,trigger_interval:0
+#: field:res.alarm,trigger_interval:0
+msgid "Interval"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Wednesday"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/base_calendar.py:1090
+#, python-format
+msgid "Interval can not be Negative"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,name:0
+#: view:calendar.event:0
+msgid "Summary"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,active:0
+#: field:calendar.event,active:0
+#: field:calendar.todo,active:0
+#: field:res.alarm,active:0
+msgid "Active"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Choose day in the month where repeat the meeting"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,action:0
+msgid "Action"
+msgstr ""
+
+#. module: base_calendar
+#: help:base_calendar.invite.attendee,type:0
+msgid "Select whom you want to Invite"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,duration:0
+#: help:res.alarm,duration:0
+msgid ""
+"Duration' and 'Repeat' are both optional, but if one occurs, so MUST the "
+"other"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_event_edit_all
+msgid "Calendar Edit all event"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,role:0
+msgid "Participation role for the calendar user"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: field:calendar.attendee,delegated_to:0
+msgid "Delegated To"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,action:0
+msgid "Defines the action to be invoked when an alarm is triggered"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "End date"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Search Events"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Recurrency Option"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+#: selection:calendar.event,rrule_type:0
+#: selection:calendar.todo,rrule_type:0
+msgid "Weekly"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,active:0
+#: help:res.alarm,active:0
+msgid ""
+"If the active field is set to true, it will allow you to hide the event "
+"alarm information without removing it."
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrent_id:0
+#: field:calendar.todo,recurrent_id:0
+msgid "Recurrent ID date"
+msgstr ""
+
+#. module: base_calendar
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,state:0
+#: view:calendar.attendee:0
+#: field:calendar.attendee,state:0
+#: view:calendar.event:0
+#: field:calendar.event,state:0
+#: field:calendar.todo,state:0
+msgid "State"
+msgstr ""
+
+#. module: base_calendar
+#: view:res.alarm:0
+msgid "Reminder Details"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "To Review"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,freq:0
+#: field:calendar.event,freq:0
+#: field:calendar.todo,freq:0
+msgid "Frequency"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Done"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,interval:0
+#: help:calendar.todo,interval:0
+msgid "Repeat every (Days/Week/Month/Year)"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: field:base_calendar.invite.attendee,user_ids:0
+msgid "Users"
+msgstr ""
+
+#. module: base_calendar
+#: view:base.calendar.set.exrule:0
+msgid "of"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+#: view:calendar.event.edit.all:0
+msgid "Cancel"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_res_users
+msgid "res.users"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Tuesday"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,description:0
+msgid ""
+"Provides a more complete description of the "
+"calendar component, than that provided by the "
+"\"SUMMARY\" property"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Responsible User"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,availability:0
+#: selection:calendar.event,show_as:0
+#: selection:calendar.todo,show_as:0
+#: selection:res.users,availability:0
+msgid "Busy"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_event
+msgid "Calendar Event"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,state:0
+#: selection:calendar.event,state:0
+#: selection:calendar.todo,state:0
+msgid "Tentative"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,interval:0
+#: field:calendar.todo,interval:0
+msgid "Repeat every"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,end_type:0
+#: selection:calendar.todo,end_type:0
+msgid "Fix amout of times"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,recurrency:0
+#: field:calendar.todo,recurrency:0
+msgid "Recurrent"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,rrule_type:0
+#: field:calendar.todo,rrule_type:0
+msgid "Recurrency"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.actions.act_window,name:base_calendar.action_view_attendee_form
+#: model:ir.ui.menu,name:base_calendar.menu_attendee_invitations
+msgid "Event Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Thursday"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,exrule:0
+#: field:calendar.todo,exrule:0
+msgid "Exception Rule"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,language:0
+msgid ""
+"To specify the language for text values in aproperty or property parameter."
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Details"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,exrule:0
+#: help:calendar.todo,exrule:0
+msgid ""
+"Defines a rule or repeating pattern of time to exclude from the recurring "
+"rule."
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,month_list:0
+#: field:calendar.event,month_list:0
+#: field:calendar.todo,month_list:0
+msgid "Month"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+#: view:calendar.event:0
+msgid "Invite People"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,rrule:0
+#: help:calendar.todo,rrule:0
+msgid ""
+"Defines a rule or repeating pattern for recurring events\n"
+"e.g.: Every other month on the last Sunday of the month for 10 occurrences: "
+" FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=-1SU"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,dir:0
+msgid "URI Reference"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,description:0
+#: view:calendar.event:0
+#: field:calendar.event,description:0
+#: field:calendar.event,name:0
+#: field:calendar.todo,description:0
+#: field:calendar.todo,name:0
+msgid "Description"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "May"
+msgstr ""
+
+#. module: base_calendar
+#: field:base_calendar.invite.attendee,type:0
+#: view:calendar.attendee:0
+msgid "Type"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Search Invitations"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,trigger_occurs:0
+#: selection:res.alarm,trigger_occurs:0
+msgid "After"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,state:0
+msgid "Stop"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_values
+msgid "ir.values"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_ir_model
+msgid "Objects"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: selection:calendar.attendee,state:0
+msgid "Delegated"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,sa:0
+#: field:calendar.event,sa:0
+#: field:calendar.todo,sa:0
+msgid "Sat"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Choose day where repeat the meeting"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,freq:0
+msgid "Minutely"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.attendee,sent_by:0
+msgid "Specify the user that is acting on behalf of the calendar user"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+#: field:calendar.event.edit.all,date_deadline:0
+msgid "End Date"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "February"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.event,freq:0
+#: selection:calendar.todo,freq:0
+msgid "Months"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,cutype:0
+msgid "Resource"
+msgstr ""
+
+#. module: base_calendar
+#: field:res.alarm,name:0
+msgid "Name"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_alarm
+msgid "Event alarm information"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,name:0
+msgid ""
+"Contains the text to be used as the message subject for "
+"email or contains the text to be used for display"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,alarm_id:0
+#: field:calendar.event,base_calendar_alarm_id:0
+#: field:calendar.todo,alarm_id:0
+#: field:calendar.todo,base_calendar_alarm_id:0
+msgid "Alarm"
+msgstr ""
+
+#. module: base_calendar
+#: code:addons/base_calendar/wizard/base_calendar_set_exrule.py:90
+#, python-format
+msgid "Please Apply Recurrency before applying Exception Rule."
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,sent_by_uid:0
+msgid "Sent By User"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,month_list:0
+#: selection:calendar.event,month_list:0
+#: selection:calendar.todo,month_list:0
+msgid "April"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.event:0
+msgid "Recurrency period"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,week_list:0
+#: field:calendar.event,week_list:0
+#: field:calendar.todo,week_list:0
+msgid "Weekday"
+msgstr ""
+
+#. module: base_calendar
+#: field:base.calendar.set.exrule,byday:0
+#: field:calendar.event,byday:0
+#: field:calendar.todo,byday:0
+msgid "By day"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,model_id:0
+msgid "Model"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.alarm,action:0
+msgid "Audio"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,id:0
+#: field:calendar.todo,id:0
+msgid "ID"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,role:0
+msgid "For information Purpose"
+msgstr ""
+
+#. module: base_calendar
+#: view:base_calendar.invite.attendee:0
+msgid "Invite"
+msgstr ""
+
+#. module: base_calendar
+#: model:ir.model,name:base_calendar.model_calendar_attendee
+msgid "Attendee information"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,res_id:0
+msgid "Resource ID"
+msgstr ""
+
+#. module: base_calendar
+#: selection:calendar.attendee,state:0
+msgid "Needs Action"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,sent_by:0
+msgid "Sent By"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,sequence:0
+#: field:calendar.todo,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.event,alarm_id:0
+#: help:calendar.todo,alarm_id:0
+msgid "Set an alarm at this time, before the event occurs"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base_calendar.invite.attendee,type:0
+msgid "Internal User"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+#: view:calendar.event:0
+msgid "Accept"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,week_list:0
+#: selection:calendar.event,week_list:0
+#: selection:calendar.todo,week_list:0
+msgid "Saturday"
+msgstr ""
+
+#. module: base_calendar
+#: view:calendar.attendee:0
+msgid "Invitation To"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Second"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.attendee,availability:0
+#: field:res.users,availability:0
+msgid "Free/Busy"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.event,end_type:0
+#: field:calendar.todo,end_type:0
+msgid "Way to end reccurency"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,duration:0
+#: field:calendar.alarm,trigger_duration:0
+#: field:calendar.event,duration:0
+#: field:calendar.todo,date:0
+#: field:calendar.todo,duration:0
+#: field:res.alarm,duration:0
+#: field:res.alarm,trigger_duration:0
+msgid "Duration"
+msgstr ""
+
+#. module: base_calendar
+#: selection:base_calendar.invite.attendee,type:0
+msgid "External Email"
+msgstr ""
+
+#. module: base_calendar
+#: field:calendar.alarm,trigger_date:0
+msgid "Trigger Date"
+msgstr ""
+
+#. module: base_calendar
+#: help:calendar.alarm,attach:0
+msgid ""
+"* Points to a sound resource, which is rendered when the "
+"alarm is triggered for audio,\n"
+" * File which is intended to be sent as message "
+"attachments for email,\n"
+" * Points to a procedure resource, which is invoked when "
+" the alarm is triggered for procedure."
+msgstr ""
+
+#. module: base_calendar
+#: selection:base.calendar.set.exrule,byday:0
+#: selection:calendar.event,byday:0
+#: selection:calendar.todo,byday:0
+msgid "Fifth"
+msgstr ""
diff --git a/addons/base_calendar/wizard/base_calendar_invite_attendee.py b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
index ea4d5aca85f..7d5b26026b5 100644
--- a/addons/base_calendar/wizard/base_calendar_invite_attendee.py
+++ b/addons/base_calendar/wizard/base_calendar_invite_attendee.py
@@ -140,7 +140,7 @@ send an Email to Invited Person')
if not mail_to:
name = map(lambda x: x[1], filter(lambda x: type==x[0], \
self._columns['type'].selection))
- raise osv.except_osv(_('Error!'), ("%s must have an email Address to send mail") %(name[0]))
+ raise osv.except_osv(_('Error!'), _("%s must have an email address to send mail") %(name[0]))
att_obj._send_mail(cr, uid, attendees, mail_to, \
email_from = current_user.user_email or tools.config.get('email_from', False))
diff --git a/addons/base_module_doc_rst/report/report_proximity_graph.py b/addons/base_module_doc_rst/report/report_proximity_graph.py
index 2d3704fd5b7..d14d709f501 100644
--- a/addons/base_module_doc_rst/report/report_proximity_graph.py
+++ b/addons/base_module_doc_rst/report/report_proximity_graph.py
@@ -48,7 +48,7 @@ class report_graph(report.interface.report_int):
if id:
get_dpend_module(id[0].id)
get_dpend_module(module_id)
- graph = pydot.Dot(graph_type='digraph',fontsize='10', label="\\nProximity Graph. \\n\\nGray Color:Official Modules, Red Color:Extra Addons Modules, Blue Color:Community Modules, Purple Color:Unknow Modules"
+ graph = pydot.Dot(graph_type='digraph',fontsize='10', label="\\nProximity Graph. \\n\\nGray Color-Official Modules, Red Color-Extra Addons Modules, Blue Color-Community Modules, Purple Color-Unknow Modules"
, center='1')
for node in nodes:
if node[1] == "official":
diff --git a/addons/base_synchro/i18n/ru.po b/addons/base_synchro/i18n/ru.po
index 2d5595e3191..1bc566195b9 100644
--- a/addons/base_synchro/i18n/ru.po
+++ b/addons/base_synchro/i18n/ru.po
@@ -8,24 +8,24 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
-"PO-Revision-Date: 2010-12-11 22:14+0000\n"
-"Last-Translator: Chertykov Denis \n"
+"PO-Revision-Date: 2011-04-25 08:58+0000\n"
+"Last-Translator: Viktor Prokopiev \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: 2011-01-15 05:56+0000\n"
-"X-Generator: Launchpad (build 12177)\n"
+"X-Launchpad-Export-Date: 2011-04-26 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
#. module: base_synchro
#: model:ir.actions.act_window,name:base_synchro.action_view_base_synchro
msgid "Base Synchronization"
-msgstr ""
+msgstr "Базовая синхронизация"
#. module: base_synchro
#: field:base.synchro.server,server_db:0
msgid "Server Database"
-msgstr ""
+msgstr "База данных сервера"
#. module: base_synchro
#: view:base.synchro.server:0
@@ -46,7 +46,7 @@ msgstr "Последняя синхронизация"
#. module: base_synchro
#: field:base.synchro,user_id:0
msgid "Send Result To"
-msgstr ""
+msgstr "Отправить результат"
#. module: base_synchro
#: model:ir.model,name:base_synchro.model_base_synchro_obj_avoid
@@ -56,7 +56,7 @@ msgstr "Не синхронизируемые поля"
#. module: base_synchro
#: view:base.synchro:0
msgid "_Close"
-msgstr ""
+msgstr "_Закрыть"
#. module: base_synchro
#: view:base.synchro:0
@@ -66,7 +66,7 @@ msgstr "Передача данных на сервер"
#. module: base_synchro
#: model:ir.model,name:base_synchro.model_base_synchro_obj
msgid "Register Class"
-msgstr ""
+msgstr "Класс регистра"
#. module: base_synchro
#: view:base.synchro.obj:0
@@ -127,7 +127,7 @@ msgstr "Пароль"
#. module: base_synchro
#: field:base.synchro.obj,avoid_ids:0
msgid "Fields Not Sync."
-msgstr ""
+msgstr "Поля не синхронизированы"
#. module: base_synchro
#: selection:base.synchro.obj,action:0
@@ -147,12 +147,12 @@ msgstr "Поля"
#. module: base_synchro
#: view:base.synchro.obj.line:0
msgid "Transfered Ids Details"
-msgstr ""
+msgstr "Сведения о переданных идентификаторах"
#. module: base_synchro
#: field:base.synchro.obj,action:0
msgid "Synchronisation direction"
-msgstr ""
+msgstr "Направление синхронизации"
#. module: base_synchro
#: field:base.synchro.obj,server_id:0
@@ -164,12 +164,12 @@ msgstr "Сервер"
#: model:ir.model,name:base_synchro.model_base_synchro_obj_line
#: model:ir.ui.menu,name:base_synchro.menu_action_base_synchro_obj_line_tree
msgid "Synchronized instances"
-msgstr ""
+msgstr "Синхронизированные экземпляры"
#. module: base_synchro
#: field:base.synchro.obj,active:0
msgid "Active"
-msgstr ""
+msgstr "Активно"
#. module: base_synchro
#: view:base.synchro.obj:0
@@ -180,7 +180,7 @@ msgstr "Объект для синхронизации"
#. module: base_synchro
#: model:ir.module.module,shortdesc:base_synchro.module_meta_information
msgid "Base Synchro"
-msgstr ""
+msgstr "Базовый Синхронизация"
#. module: base_synchro
#: model:ir.actions.act_window,name:base_synchro.action_base_synchro_server_tree
@@ -191,17 +191,17 @@ msgstr "Сервера для синхронизации"
#. module: base_synchro
#: view:base.synchro.obj:0
msgid "Transfer Details"
-msgstr ""
+msgstr "Подробности передачи"
#. module: base_synchro
#: field:base.synchro.obj.line,remote_id:0
msgid "Remote Id"
-msgstr ""
+msgstr "Удалённый идентификатор"
#. module: base_synchro
#: field:base.synchro.obj,line_id:0
msgid "Ids Affected"
-msgstr ""
+msgstr "Затронутые идентификаторы"
#. module: base_synchro
#: model:ir.ui.menu,name:base_synchro.next_id_63
@@ -222,7 +222,7 @@ msgstr "Домен"
#. module: base_synchro
#: view:base.synchro:0
msgid "_Synchronize"
-msgstr ""
+msgstr "_Синхронизировать"
#. module: base_synchro
#: view:base.synchro:0
@@ -237,7 +237,7 @@ msgstr "Имя сервера"
#. module: base_synchro
#: field:base.synchro.obj,sequence:0
msgid "Sequence"
-msgstr ""
+msgstr "Последовательность"
#. module: base_synchro
#: view:base.synchro:0
@@ -245,48 +245,49 @@ msgid ""
"The synchronisation has been started.You will receive a request when it's "
"done."
msgstr ""
+"Синхронизация была начата. Вы получите запрос когда все будет сделано."
#. module: base_synchro
#: field:base.synchro.server,server_port:0
msgid "Server Port"
-msgstr ""
+msgstr "Порт сервера"
#. module: base_synchro
#: model:ir.ui.menu,name:base_synchro.menu_action_view_base_synchro
msgid "Synchronize objects"
-msgstr ""
+msgstr "Синхронизировать объекты"
#. module: base_synchro
#: view:base.synchro:0
msgid "Synchronization Complited!"
-msgstr ""
+msgstr "Синхронизация выполнена!"
#. module: base_synchro
#: model:ir.model,name:base_synchro.model_base_synchro
msgid "base.synchro"
-msgstr ""
+msgstr "base.synchro"
#. module: base_synchro
#: field:base.synchro.obj.line,local_id:0
msgid "Local Id"
-msgstr ""
+msgstr "Локальный идентификатор"
#. module: base_synchro
#: model:ir.actions.act_window,name:base_synchro.actions_regclass_tree
#: model:ir.actions.act_window,name:base_synchro.actions_transfer_line_form
msgid "Filters"
-msgstr ""
+msgstr "Фильтры"
#. module: base_synchro
#: selection:base.synchro.obj,action:0
msgid "Download"
-msgstr ""
+msgstr "Загрузить"
#. module: base_synchro
#: field:base.synchro,server_url:0
#: field:base.synchro.server,server_url:0
msgid "Server URL"
-msgstr ""
+msgstr "Адрес сервера"
#~ msgid "The name of the module must be unique !"
#~ msgstr "Название модуля должно быть уникальным !"
diff --git a/addons/caldav/wizard/caldav_browse_view.xml b/addons/caldav/wizard/caldav_browse_view.xml
index 0a7e6269fe2..53af6029883 100644
--- a/addons/caldav/wizard/caldav_browse_view.xml
+++ b/addons/caldav/wizard/caldav_browse_view.xml
@@ -15,8 +15,10 @@
-
-
+
+
+
+
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 4459f7ca217..aca5aa0bba9 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -658,7 +658,8 @@ class crm_case_section(osv.osv):
"""
if context is None:
context = {}
-
+ if not isinstance(ids, list) :
+ ids = [ids]
res = []
if not ids:
return res
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index f7f61df26c1..7df8a35642c 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -329,6 +329,13 @@ class crm_lead(crm_case, osv.osv):
self.write(cr, uid, ids, data)
return stage
+ def unlink(self, cr, uid, ids, context=None):
+ for lead in self.browse(cr, uid, ids, context):
+ if (not lead.section_id.allow_unlink) and (lead.state <> 'draft'):
+ raise osv.except_osv(_('Warning !'),
+ _('You can not delete this lead. You should better cancel it.'))
+ return super(crm_lead, self).unlink(cr, uid, ids, context)
+
def message_new(self, cr, uid, msg, context=None):
"""
Automatically calls when new email message arrives
diff --git a/addons/crm/crm_meeting_view.xml b/addons/crm/crm_meeting_view.xml
index aba69889f57..a2d66040fa9 100644
--- a/addons/crm/crm_meeting_view.xml
+++ b/addons/crm/crm_meeting_view.xml
@@ -102,7 +102,7 @@
-
+
-
+
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 685019a3001..cc9005d69bf 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -3,7 +3,7 @@
+ groups="base.group_sale_manager,base.group_sale_salesman"/>
diff --git a/addons/crm/i18n/lt.po b/addons/crm/i18n/lt.po
index fd607e6c3d0..a563d8fe75d 100644
--- a/addons/crm/i18n/lt.po
+++ b/addons/crm/i18n/lt.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-01-17 06:57+0000\n"
-"Last-Translator: Paulius Sladkevičius - inovera.lt \n"
+"PO-Revision-Date: 2011-04-26 14:24+0000\n"
+"Last-Translator: Mantas Kriaučiūnas \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-03-18 04:44+0000\n"
-"X-Generator: Launchpad (build 12559)\n"
+"X-Launchpad-Export-Date: 2011-04-27 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
"Language: lt\n"
#. module: crm
@@ -1613,7 +1613,7 @@ msgstr "Nuorodos"
#: view:res.partner:0
#, python-format
msgid "Cancel"
-msgstr "Atšaukti"
+msgstr "Atsisakyti"
#. module: crm
#: model:ir.model,name:crm.model_res_users
diff --git a/addons/crm/i18n/ru.po b/addons/crm/i18n/ru.po
index 21c2bb2263d..d4e920041b5 100644
--- a/addons/crm/i18n/ru.po
+++ b/addons/crm/i18n/ru.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
-"PO-Revision-Date: 2011-04-15 19:44+0000\n"
-"Last-Translator: Chertykov Denis \n"
+"PO-Revision-Date: 2011-04-25 08:48+0000\n"
+"Last-Translator: Stanislav Hanzhin \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-04-16 04:58+0000\n"
-"X-Generator: Launchpad (build 12735)\n"
+"X-Launchpad-Export-Date: 2011-04-26 04:41+0000\n"
+"X-Generator: Launchpad (build 12758)\n"
#. module: crm
#: view:crm.lead.report:0
@@ -271,6 +271,10 @@ msgid ""
"sort out your leads analysis by different groups to get accurate grained "
"analysis."
msgstr ""
+"Анализ кандидатов позволяет контролировать различную информацию о "
+"взаимоотношениях с клиентами. Проверять частоту обращений, количество "
+"ответов и отосланных писем. Вы можете разбить анализ кандидатов на группы "
+"для получения более подробного анализа."
#. module: crm
#: view:crm.lead:0
@@ -448,6 +452,11 @@ msgid ""
"customer. You can also import a .CSV file with a list of calls to be done by "
"your sales team."
msgstr ""
+"\"Исходящие звонки\" - список всех звонков, которые предстоит сделать вашему "
+"отделу продаж. Менеджер продаж может записывать информацию о звонке. Эта "
+"информация будет привязана к контрагенту для отслеживания каждого контакта с "
+"ним. Так же вы можете импортировать файл в формате CSV со списком "
+"необходимых звонков звонков вашего отдела продаж."
#. module: crm
#: model:ir.model,name:crm.model_crm_lead2opportunity_action
@@ -660,6 +669,8 @@ msgid ""
"Default state of mind for period preceeding the 'Max Interval' computation. "
"This is the starting state of mind by default if the partner has no event."
msgstr ""
+"Мнение по умолчанию для периода предшествующего вычислению 'Макс. интервал'. "
+"Это мнение по умолчанию для контрагентов без обращений."
#. module: crm
#: selection:crm.meeting,end_type:0
@@ -1317,7 +1328,7 @@ msgstr "Рассылки"
#. module: crm
#: field:crm.meeting,class:0
msgid "Mark as"
-msgstr "Пометить как"
+msgstr "Отметить как"
#. module: crm
#: field:crm.meeting,count:0
@@ -1327,7 +1338,7 @@ msgstr "Повторить"
#. module: crm
#: help:crm.meeting,rrule_type:0
msgid "Let the event automatically repeat at that interval"
-msgstr "Пусть события автоматически повторяются с этим интервалом"
+msgstr "Пусть событие автоматически повторяется с этим интервалом"
#. module: crm
#: view:base.action.rule:0
@@ -1434,7 +1445,7 @@ msgstr "crm.lead"
#. module: crm
#: field:crm.meeting,write_date:0
msgid "Write Date"
-msgstr ""
+msgstr "Дата записи"
#. module: crm
#: view:crm.meeting:0
@@ -1537,7 +1548,7 @@ msgstr "Предложения по категориям"
#. module: crm
#: view:crm.meeting:0
msgid "Choose day in the month where repeat the meeting"
-msgstr "Выбери день месяца, когда повторить встречу."
+msgstr "Выберите день месяца, когда повторить встречу."
#. module: crm
#: view:crm.segmentation:0
@@ -1622,7 +1633,7 @@ msgstr "Объединить два предложения"
#. module: crm
#: selection:crm.meeting,end_type:0
msgid "Fix amout of times"
-msgstr ""
+msgstr "Определенное количество раз"
#. module: crm
#: view:crm.lead:0
@@ -1785,6 +1796,10 @@ msgid ""
"sent/to be sent to your colleagues/partners. You can not only invite OpenERP "
"users, but also external parties, such as a customer."
msgstr ""
+"Используя \"Приглашения\" вы можете создавать и управлять приглашениями на "
+"совещания, которые отправлены или будут отправлены вашим "
+"коллегам/контрагентам. Вы можете приглашать не только пользователей OpenERP, "
+"но и внешних адресатов, например заказчиков."
#. module: crm
#: selection:crm.meeting,week_list:0
@@ -1940,6 +1955,10 @@ msgid ""
"with a partner. From the phone call form, you can trigger a request for "
"another call, a meeting or an opportunity."
msgstr ""
+"Функция \"Входящие звонки\" позволяет вам быстро описывать входящие звонки. "
+"Каждый звонок будет связан с контрагентом для отслеживания каждого контакта. "
+"Из формы ввода звонка вы можете запланировать следующий звонок, совещание "
+"или предложение."
#. module: crm
#: help:crm.meeting,recurrency:0
@@ -2472,7 +2491,7 @@ msgstr ""
#. module: crm
#: help:crm.installer,crm_fundraising:0
msgid "This may help associations in their fundraising process and tracking."
-msgstr ""
+msgstr "Это может помочь ассоциациям в сборе средств и их отслеживании."
#. module: crm
#: field:crm.lead2opportunity.partner,action:0
@@ -2527,7 +2546,7 @@ msgstr "Другое"
#: selection:crm.meeting,state:0
#: selection:crm.phonecall,state:0
msgid "Done"
-msgstr "Готово"
+msgstr "Сделано"
#. module: crm
#: help:crm.meeting,interval:0
@@ -2587,7 +2606,7 @@ msgstr "Техподдержка"
#. module: crm
#: field:crm.meeting,recurrency:0
msgid "Recurrent"
-msgstr "Повторение"
+msgstr "Повторяющийся"
#. module: crm
#: code:addons/crm/crm.py:397
@@ -2742,7 +2761,7 @@ msgstr "Кандидат в Предложение"
#. module: crm
#: model:ir.model,name:crm.model_calendar_attendee
msgid "Attendee information"
-msgstr "Информация о участнике"
+msgstr "Информация об участнике"
#. module: crm
#: view:crm.segmentation:0
@@ -2940,7 +2959,7 @@ msgstr "Кем предложено"
#: view:crm.lead:0
#: model:ir.model,name:crm.model_crm_add_note
msgid "Add Internal Note"
-msgstr "Добавить внутреннею запись"
+msgstr "Добавить внутреннею заметку"
#. module: crm
#: code:addons/crm/crm_lead.py:304
@@ -3916,7 +3935,7 @@ msgstr "Подтвердить"
#. module: crm
#: field:crm.segmentation.line,expr_name:0
msgid "Control Variable"
-msgstr ""
+msgstr "Управляющая переменная"
#. module: crm
#: selection:crm.meeting,byday:0
diff --git a/addons/crm/wizard/crm_lead_to_opportunity.py b/addons/crm/wizard/crm_lead_to_opportunity.py
index 422efc97973..f51016e0da7 100644
--- a/addons/crm/wizard/crm_lead_to_opportunity.py
+++ b/addons/crm/wizard/crm_lead_to_opportunity.py
@@ -105,7 +105,7 @@ class crm_lead2opportunity_partner(osv.osv_memory):
for lead in lead_obj.browse(cr, uid, context.get('active_ids', []), context=context):
if lead.state in ['done', 'cancel']:
- raise osv.except_osv(_("Warning !"), _("Closed/Cancelled Leads Could not convert into Opportunity"))
+ raise osv.except_osv(_("Warning !"), _("Closed/Cancelled Leads can not be converted into Opportunity"))
return False
def _convert(self, cr, uid, ids, lead, partner_id, stage_ids, context=None):
diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
index 23ddaad5bfe..9a623d2eaab 100644
--- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
+++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml
@@ -16,7 +16,7 @@
-
+
diff --git a/addons/crm/wizard/crm_partner_to_opportunity_view.xml b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
index 7ceb9bc40d9..762303f06ba 100644
--- a/addons/crm/wizard/crm_partner_to_opportunity_view.xml
+++ b/addons/crm/wizard/crm_partner_to_opportunity_view.xml
@@ -8,7 +8,7 @@
crm.partner2opportunity
form
-