[MERGE] merged latest fixes from 6.0 - up to rev 3399
bzr revid: odo@openerp.com-20110411101327-dxkwvwstjf9xc58s
This commit is contained in:
Olivier Dony
commit
f59ac0d6b1
|
|
@ -7,14 +7,14 @@ msgstr ""
|
|||
"Project-Id-Version: OpenERP Server 5.0.0\n"
|
||||
"Report-Msgid-Bugs-To: support@openerp.com\n"
|
||||
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
|
||||
"PO-Revision-Date: 2011-02-21 08:40+0000\n"
|
||||
"Last-Translator: Niels Huylebroeck <Unknown>\n"
|
||||
"PO-Revision-Date: 2011-04-10 19:20+0000\n"
|
||||
"Last-Translator: Mustufa Rangwala (Open ERP) <mra@tinyerp.com>\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-02-22 14:26+0000\n"
|
||||
"X-Generator: Launchpad (build 12351)\n"
|
||||
"X-Launchpad-Export-Date: 2011-04-11 05:42+0000\n"
|
||||
"X-Generator: Launchpad (build 12735)\n"
|
||||
|
||||
#. module: base
|
||||
#: view:ir.filters:0
|
||||
|
|
@ -918,7 +918,7 @@ msgstr "Toegang verwijderen"
|
|||
#. module: base
|
||||
#: model:res.country,name:base.ne
|
||||
msgid "Niger"
|
||||
msgstr "Nigeria"
|
||||
msgstr "Niger"
|
||||
|
||||
#. module: base
|
||||
#: selection:base.language.install,lang: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-03-24 12:16+0000\n"
|
||||
"PO-Revision-Date: 2011-04-07 04:09+0000\n"
|
||||
"Last-Translator: Dorin <dhongu@gmail.com>\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-25 06:13+0000\n"
|
||||
"X-Generator: Launchpad (build 12559)\n"
|
||||
"X-Launchpad-Export-Date: 2011-04-08 06:12+0000\n"
|
||||
"X-Generator: Launchpad (build 12735)\n"
|
||||
|
||||
#. module: base
|
||||
#: view:ir.filters:0
|
||||
|
|
@ -47,6 +47,8 @@ msgid ""
|
|||
"The second argument of the many2many field %s must be a SQL table !You used "
|
||||
"%s, which is not a valid SQL table name."
|
||||
msgstr ""
|
||||
"Al doilea parametru a câmpului many2many %s trebuie să fie o tabelă SQL ! %s "
|
||||
"utilizat nu este o tabelă SQL validă."
|
||||
|
||||
#. module: base
|
||||
#: view:ir.values:0
|
||||
|
|
@ -117,6 +119,8 @@ msgid ""
|
|||
"You can not write in this document (%s) ! Be sure your user belongs to one "
|
||||
"of these groups: %s."
|
||||
msgstr ""
|
||||
"Nu puteți scrie în acest document (%s) ! Asigurați-vă că utilizatorul "
|
||||
"aparține grupului: %s."
|
||||
|
||||
#. module: base
|
||||
#: help:ir.model.fields,domain:0
|
||||
|
|
@ -125,6 +129,8 @@ msgid ""
|
|||
"specified as a Python expression defining a list of triplets. For example: "
|
||||
"[('color','=','red')]"
|
||||
msgstr ""
|
||||
"Domeniu opțional pentru a restricționa valorile pentru câmpul de relație, "
|
||||
"specificat ca o listă Python. De exemplu: [('color','=','red')]"
|
||||
|
||||
#. module: base
|
||||
#: field:res.partner,ref:0
|
||||
|
|
@ -437,7 +443,7 @@ msgstr "Planificare actualizare"
|
|||
#: code:addons/orm.py:838
|
||||
#, python-format
|
||||
msgid "Key/value '%s' not found in selection field '%s'"
|
||||
msgstr ""
|
||||
msgstr "Cheia/valoarea '%s' nu este găsită în selecția câmpului '%s'"
|
||||
|
||||
#. module: base
|
||||
#: help:res.country,code:0
|
||||
|
|
@ -784,7 +790,7 @@ msgstr "Categorii subordonate"
|
|||
#. module: base
|
||||
#: model:ir.model,name:base.model_ir_config_parameter
|
||||
msgid "ir.config_parameter"
|
||||
msgstr ""
|
||||
msgstr "ir.config_parameter"
|
||||
|
||||
#. module: base
|
||||
#: selection:base.language.export,format:0
|
||||
|
|
@ -868,7 +874,7 @@ msgstr "Tranzitii"
|
|||
#: code:addons/orm.py:4020
|
||||
#, python-format
|
||||
msgid "Record #%d of %s not found, cannot copy!"
|
||||
msgstr ""
|
||||
msgstr "Înregistrarea #%d a %s negăsită, nu se poate face copia!"
|
||||
|
||||
#. module: base
|
||||
#: field:ir.module.module,contributors:0
|
||||
|
|
@ -2150,7 +2156,7 @@ msgstr ""
|
|||
#. module: base
|
||||
#: model:ir.model,name:base.model_ir_module_module_dependency
|
||||
msgid "Module dependency"
|
||||
msgstr "Dependinţele modulului"
|
||||
msgstr "Dependenţele modulului"
|
||||
|
||||
#. module: base
|
||||
#: selection:publisher_warranty.contract.wizard,state:0
|
||||
|
|
@ -2193,7 +2199,7 @@ msgstr ""
|
|||
#: view:ir.module.module:0
|
||||
#: field:ir.module.module,dependencies_id:0
|
||||
msgid "Dependencies"
|
||||
msgstr "Dependinţe"
|
||||
msgstr "Dependențe"
|
||||
|
||||
#. module: base
|
||||
#: field:multi_company.default,company_id:0
|
||||
|
|
|
|||
|
|
@ -2172,6 +2172,7 @@ class orm(orm_template):
|
|||
if fget[groupby]['type'] in ('date', 'datetime'):
|
||||
flist = "to_char(%s,'yyyy-mm') as %s " % (qualified_groupby_field, groupby)
|
||||
groupby = "to_char(%s,'yyyy-mm')" % (qualified_groupby_field)
|
||||
qualified_groupby_field = groupby
|
||||
else:
|
||||
flist = qualified_groupby_field
|
||||
else:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
#!/usr/bin/env python
|
||||
# -*- encoding: utf-8 -*-
|
||||
##############################################################################
|
||||
#
|
||||
|
|
|
|||
Loading…
Reference in New Issue