[MERGE] merged latest fixed from 6.0
bzr revid: odo@openerp.com-20110428160434-0ozhxwnfgssptm9c
This commit is contained in:
Olivier Dony
commit
a725ceb3fa
|
|
@ -7,14 +7,14 @@ msgstr ""
|
|||
"Project-Id-Version: pt_BR\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
|
||||
"PO-Revision-Date: 2011-03-29 13:43+0000\n"
|
||||
"Last-Translator: Alexsandro Haag <alexsandro.haag@gmail.com>\n"
|
||||
"PO-Revision-Date: 2011-04-23 20:42+0000\n"
|
||||
"Last-Translator: Emerson <Unknown>\n"
|
||||
"Language-Team: <pt@li.org>\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-31 06:35+0000\n"
|
||||
"X-Generator: Launchpad (build 12559)\n"
|
||||
"X-Launchpad-Export-Date: 2011-04-24 05:52+0000\n"
|
||||
"X-Generator: Launchpad (build 12758)\n"
|
||||
|
||||
#. module: base
|
||||
#: view:ir.filters:0
|
||||
|
|
@ -4101,7 +4101,7 @@ msgstr "Latvian / latviešu valoda"
|
|||
#: view:res.config:0
|
||||
#: view:res.config.installer:0
|
||||
msgid "vsep"
|
||||
msgstr ""
|
||||
msgstr "vsep"
|
||||
|
||||
#. module: base
|
||||
#: selection:base.language.install,lang:0
|
||||
|
|
@ -8567,7 +8567,7 @@ msgstr "Adicionar ou não um cabeçalho RML corporativo"
|
|||
#. module: base
|
||||
#: help:workflow.transition,act_to:0
|
||||
msgid "The destination activity."
|
||||
msgstr ""
|
||||
msgstr "A atividade destino."
|
||||
|
||||
#. module: base
|
||||
#: view:base.module.update:0
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 5.0.4\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
|
||||
"PO-Revision-Date: 2011-04-07 04:09+0000\n"
|
||||
"Last-Translator: Dorin <dhongu@gmail.com>\n"
|
||||
"PO-Revision-Date: 2011-04-20 19:04+0000\n"
|
||||
"Last-Translator: Mihai Boiciuc <Unknown>\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-08 06:12+0000\n"
|
||||
"X-Generator: Launchpad (build 12735)\n"
|
||||
"X-Launchpad-Export-Date: 2011-04-21 06:00+0000\n"
|
||||
"X-Generator: Launchpad (build 12758)\n"
|
||||
|
||||
#. module: base
|
||||
#: view:ir.filters:0
|
||||
|
|
@ -976,7 +976,7 @@ msgstr "Insulele Marshall"
|
|||
#: code:addons/base/ir/ir_model.py:328
|
||||
#, python-format
|
||||
msgid "Changing the model of a field is forbidden!"
|
||||
msgstr ""
|
||||
msgstr "Schimbarea modelului unui câmp este interzisă!"
|
||||
|
||||
#. module: base
|
||||
#: model:res.country,name:base.ht
|
||||
|
|
@ -1651,6 +1651,7 @@ msgstr ""
|
|||
#, python-format
|
||||
msgid "A document was modified since you last viewed it (%s:%d)"
|
||||
msgstr ""
|
||||
"Un document a fost modificat decând l-aţi vizualizat ultima data (%s:%d)"
|
||||
|
||||
#. module: base
|
||||
#: view:workflow:0
|
||||
|
|
@ -2402,7 +2403,7 @@ msgstr "Structura bazei de date"
|
|||
#: model:ir.model,name:base.model_partner_wizard_spam
|
||||
#: view:partner.wizard.spam:0
|
||||
msgid "Mass Mailing"
|
||||
msgstr ""
|
||||
msgstr "Trimitere e-mail în masă"
|
||||
|
||||
#. module: base
|
||||
#: model:res.country,name:base.yt
|
||||
|
|
@ -3081,7 +3082,7 @@ msgstr ""
|
|||
#. module: base
|
||||
#: view:base.module.upgrade:0
|
||||
msgid "The selected modules have been updated / installed !"
|
||||
msgstr ""
|
||||
msgstr "Modulele selectate au fost actualizate - instalate !"
|
||||
|
||||
#. module: base
|
||||
#: selection:base.language.install,lang:0
|
||||
|
|
@ -3251,6 +3252,8 @@ msgid ""
|
|||
"You can not create this document (%s) ! Be sure your user belongs to one of "
|
||||
"these groups: %s."
|
||||
msgstr ""
|
||||
"Nu puteţi crea documentul acesta (%s) ! Asiguraţi-vă ca numele dvs. "
|
||||
"utilizator aparţine unuia din următoarele grupuri: %s."
|
||||
|
||||
#. module: base
|
||||
#: model:res.country,name:base.mu
|
||||
|
|
@ -4026,7 +4029,7 @@ msgstr "Metoda 'create' nu este implementată pentru acest obiect !"
|
|||
#. module: base
|
||||
#: field:workflow.triggers,workitem_id:0
|
||||
msgid "Workitem"
|
||||
msgstr ""
|
||||
msgstr "Element de lucru"
|
||||
|
||||
#. module: base
|
||||
#: view:ir.actions.todo:0
|
||||
|
|
@ -4187,7 +4190,7 @@ msgstr "Necitit"
|
|||
#. module: base
|
||||
#: field:ir.cron,doall:0
|
||||
msgid "Repeat Missed"
|
||||
msgstr ""
|
||||
msgstr "Repetare pierdute"
|
||||
|
||||
#. module: base
|
||||
#: help:ir.actions.server,state:0
|
||||
|
|
@ -4248,7 +4251,7 @@ msgstr ""
|
|||
#. module: base
|
||||
#: help:res.partner,employee:0
|
||||
msgid "Check this box if the partner is an Employee."
|
||||
msgstr ""
|
||||
msgstr "Bifaţi această căsuţă dacă partenerul este un angajat."
|
||||
|
||||
#. module: base
|
||||
#: field:ir.actions.report.xml,report_rml_content:0
|
||||
|
|
@ -4260,7 +4263,7 @@ msgstr "conținut RML"
|
|||
#: model:ir.actions.act_window,name:base.action_workflow_workitem_form
|
||||
#: model:ir.ui.menu,name:base.menu_workflow_workitem
|
||||
msgid "Workitems"
|
||||
msgstr ""
|
||||
msgstr "Elemente de lucru"
|
||||
|
||||
#. module: base
|
||||
#: field:base.language.export,advice:0
|
||||
|
|
@ -4333,7 +4336,7 @@ msgstr ""
|
|||
#. module: base
|
||||
#: view:base.module.import:0
|
||||
msgid "Module file successfully imported!"
|
||||
msgstr ""
|
||||
msgstr "Fişierul modul importat cu succes!"
|
||||
|
||||
#. module: base
|
||||
#: selection:ir.actions.todo,state:0
|
||||
|
|
@ -4503,7 +4506,7 @@ msgstr "_Ok"
|
|||
#. module: base
|
||||
#: help:ir.filters,user_id:0
|
||||
msgid "False means for every user"
|
||||
msgstr ""
|
||||
msgstr "Fals înseamnă pentru fiecare utilizator"
|
||||
|
||||
#. module: base
|
||||
#: code:addons/base/module/module.py:198
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -8,14 +8,14 @@ msgstr ""
|
|||
"Project-Id-Version: openobject-addons\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
|
||||
"PO-Revision-Date: 2011-03-08 16:19+0000\n"
|
||||
"Last-Translator: Phong Nguyen-Thanh <Unknown>\n"
|
||||
"PO-Revision-Date: 2011-04-19 02:34+0000\n"
|
||||
"Last-Translator: Nguyễn Thịnh <thinhnverp@gmail.com>\n"
|
||||
"Language-Team: Vietnamese <vi@li.org>\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-09 06:12+0000\n"
|
||||
"X-Generator: Launchpad (build 12351)\n"
|
||||
"X-Launchpad-Export-Date: 2011-04-20 05:56+0000\n"
|
||||
"X-Generator: Launchpad (build 12758)\n"
|
||||
|
||||
#. module: base
|
||||
#: view:ir.filters:0
|
||||
|
|
@ -109,7 +109,7 @@ msgstr ""
|
|||
#. module: base
|
||||
#: view:ir.module.module:0
|
||||
msgid "Created Views"
|
||||
msgstr ""
|
||||
msgstr "Tạo khung nhìn"
|
||||
|
||||
#. module: base
|
||||
#: code:addons/base/ir/ir_model.py:485
|
||||
|
|
@ -150,12 +150,14 @@ msgid ""
|
|||
"Properties of base fields cannot be altered in this manner! Please modify "
|
||||
"them through Python code, preferably through a custom addon!"
|
||||
msgstr ""
|
||||
"các thuộc tính cơ bản không thể thay đổi theo cách này ! hãy thay đổi chúng "
|
||||
"thông qua Python mã, tốt hơn thông qua một addon tùy chỉnh!"
|
||||
|
||||
#. module: base
|
||||
#: code:addons/osv.py:133
|
||||
#, python-format
|
||||
msgid "Constraint Error"
|
||||
msgstr ""
|
||||
msgstr "Lỗi ràng buộc"
|
||||
|
||||
#. module: base
|
||||
#: model:ir.model,name:base.model_ir_ui_view_custom
|
||||
|
|
@ -177,7 +179,7 @@ msgstr "đã được tạo."
|
|||
#. module: base
|
||||
#: model:res.partner.category,name:base.res_partner_category_woodsuppliers0
|
||||
msgid "Wood Suppliers"
|
||||
msgstr ""
|
||||
msgstr "người bán gỗ"
|
||||
|
||||
#. module: base
|
||||
#: code:addons/base/module/module.py:303
|
||||
|
|
@ -192,13 +194,13 @@ msgstr ""
|
|||
#. module: base
|
||||
#: field:ir.sequence,number_increment:0
|
||||
msgid "Increment Number"
|
||||
msgstr ""
|
||||
msgstr "số tự tăng"
|
||||
|
||||
#. module: base
|
||||
#: model:ir.actions.act_window,name:base.action_res_company_tree
|
||||
#: model:ir.ui.menu,name:base.menu_action_res_company_tree
|
||||
msgid "Company's Structure"
|
||||
msgstr "Cơ cấu công ty"
|
||||
msgstr "cấu trúc của công ty"
|
||||
|
||||
#. module: base
|
||||
#: selection:base.language.install,lang:0
|
||||
|
|
@ -6548,7 +6550,7 @@ msgstr ""
|
|||
#: view:base.module.import:0
|
||||
#: view:base.module.update:0
|
||||
msgid "Open Modules"
|
||||
msgstr ""
|
||||
msgstr "Mở danh sách Mô-đun"
|
||||
|
||||
#. module: base
|
||||
#: model:ir.actions.act_window,help:base.action_res_bank_form
|
||||
|
|
|
|||
|
|
@ -583,7 +583,7 @@
|
|||
|
||||
<menuitem action="action_partner_category_form" id="menu_partner_category_form" name="Partner Categories" sequence="4" parent="menu_config_address_book"/>
|
||||
|
||||
<act_window domain="[('partner_id', '=', active_id)]"
|
||||
<act_window domain="[('partner_id', '=', active_id)]" context="{'default_partner_id':active_id}"
|
||||
id="act_res_partner_event" name="Events"
|
||||
res_model="res.partner.event"
|
||||
src_model="res.partner"
|
||||
|
|
|
|||
|
|
@ -458,24 +458,25 @@ class users(osv.osv):
|
|||
raise security.ExceptionNoTb('AccessDenied')
|
||||
|
||||
def check(self, db, uid, passwd):
|
||||
"""Verifies that the given (uid, password) pair is authorized for the database ``db`` and
|
||||
raise an exception if it is not."""
|
||||
if not passwd:
|
||||
return False
|
||||
# empty passwords disallowed for obvious security reasons
|
||||
raise security.ExceptionNoTb('AccessDenied')
|
||||
if self._uid_cache.get(db, {}).get(uid) == passwd:
|
||||
return True
|
||||
return
|
||||
cr = pooler.get_db(db).cursor()
|
||||
try:
|
||||
cr.execute('SELECT COUNT(1) FROM res_users WHERE id=%s AND password=%s AND active=%s',
|
||||
(int(uid), passwd, True))
|
||||
res = cr.fetchone()[0]
|
||||
if not bool(res):
|
||||
if not res:
|
||||
raise security.ExceptionNoTb('AccessDenied')
|
||||
if res:
|
||||
if self._uid_cache.has_key(db):
|
||||
ulist = self._uid_cache[db]
|
||||
ulist[uid] = passwd
|
||||
else:
|
||||
self._uid_cache[db] = {uid:passwd}
|
||||
return bool(res)
|
||||
if self._uid_cache.has_key(db):
|
||||
ulist = self._uid_cache[db]
|
||||
ulist[uid] = passwd
|
||||
else:
|
||||
self._uid_cache[db] = {uid:passwd}
|
||||
finally:
|
||||
cr.close()
|
||||
|
||||
|
|
@ -604,4 +605,4 @@ class res_config_view(osv.osv_memory):
|
|||
|
||||
res_config_view()
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
|||
Loading…
Reference in New Issue