Purnendu Singh (OpenERP) has proposed merging
lp:~openerp-dev/openobject-server/trunk-some_typo into lp:openobject-server.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-some_typo/+merge/103225
Hello,
Improve strings.
Thanks,
Purnendu Singh
--
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-some_typo/+merge/103225
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/trunk-some_typo.
=== modified file 'openerp/addons/base/base_update.xml'
--- openerp/addons/base/base_update.xml 2012-04-25 15:04:23 +0000
+++ openerp/addons/base/base_update.xml 2012-04-30 06:09:20 +0000
@@ -251,7 +251,7 @@
<button name="%(bank_account_update)d" string="Set Bank Accounts" type="action" icon="gtk-go-forward"/>
<newline/>
<label string="" colspan="2"/>
- <button name="%(preview_report)d" string="Preview Header" type="action" icon="gtk-print"/>
+ <button name="%(preview_report)d" string="Preview Header/Footer" type="action" icon="gtk-print"/>
</group>
</page>
<page string="Header/Footer" groups="base.group_no_one">
=== modified file 'openerp/addons/base/ir/ir.xml'
--- openerp/addons/base/ir/ir.xml 2012-04-25 08:12:50 +0000
+++ openerp/addons/base/ir/ir.xml 2012-04-30 06:09:20 +0000
@@ -162,15 +162,15 @@
<label colspan="4" string="Day: %%(day)s"/>
</group>
<group>
- <label colspan="4" string="Day of the year: %%(doy)s"/>
- <label colspan="4" string="Week of the year: %%(woy)s"/>
- <label colspan="4" string="Day of the week (0:Monday): %%(weekday)s"/>
+ <label colspan="4" string="Day of the Year: %%(doy)s"/>
+ <label colspan="4" string="Week of the Year: %%(woy)s"/>
+ <label colspan="4" string="Day of the Week (0:Monday): %%(weekday)s"/>
</group>
<group>
<label colspan="4" string="Hour 00->24: %%(h24)s"/>
<label colspan="4" string="Hour 00->12: %%(h12)s"/>
<label colspan="4" string="Minute: %%(min)s"/>
- <label colspan="4" string="Seconde: %%(sec)s"/>
+ <label colspan="4" string="Second: %%(sec)s"/>
</group>
</group>
</page>
@@ -1668,7 +1668,7 @@
<field name="perm_create"/>
<field name="perm_unlink"/>
</group>
- <separator colspan="4" string="Rule definition (domain filter)"/>
+ <separator colspan="4" string="Rule Definition (Domain Filter)"/>
<group colspan="4">
<field name="domain_force" colspan="4" nolabel="1"/>
</group>
=== modified file 'openerp/addons/base/ir/ir_actions.py'
--- openerp/addons/base/ir/ir_actions.py 2012-03-01 04:27:45 +0000
+++ openerp/addons/base/ir/ir_actions.py 2012-04-30 06:09:20 +0000
@@ -117,26 +117,26 @@
'usage': fields.char('Action Usage', size=32),
'report_type': fields.char('Report Type', size=32, required=True, help="Report Type, e.g. pdf, html, raw, sxw, odt, html2html, mako2html, ..."),
'groups_id': fields.many2many('res.groups', 'res_groups_report_rel', 'uid', 'gid', 'Groups'),
- 'multi': fields.boolean('On multiple doc.', help="If set to true, the action will not be displayed on the right toolbar of a form view."),
- 'attachment': fields.char('Save As Attachment Prefix', size=128, help='This is the filename of the attachment used to store the printing result. Keep empty to not save the printed reports. You can use a python expression with the object and time variables.'),
+ 'multi': fields.boolean('On Multiple Doc.', help="If set to true, the action will not be displayed on the right toolbar of a form view."),
+ 'attachment': fields.char('Save as Attachment Prefix', size=128, help='This is the filename of the attachment used to store the printing result. Keep empty to not save the printed reports. You can use a python expression with the object and time variables.'),
'attachment_use': fields.boolean('Reload from Attachment', help='If you check this, then the second time the user prints with same attachment name, it returns the previous report.'),
- 'auto': fields.boolean('Custom python parser'),
-
- 'header': fields.boolean('Add RML header', help="Add or not the corporate RML header"),
-
- 'report_xsl': fields.char('XSL path', size=256),
- 'report_xml': fields.char('XML path', size=256, help=''),
+ 'auto': fields.boolean('Custom Python Parser'),
+
+ 'header': fields.boolean('Add RML Header', help="Add or not the corporate RML header"),
+
+ 'report_xsl': fields.char('XSL Path', size=256),
+ 'report_xml': fields.char('XML Path', size=256, help=''),
# Pending deprecation... to be replaced by report_file as this object will become the default report object (not so specific to RML anymore)
- 'report_rml': fields.char('Main report file path', size=256, help="The path to the main report file (depending on Report Type) or NULL if the content is in another data field"),
+ 'report_rml': fields.char('Main Report File Path', size=256, help="The path to the main report file (depending on Report Type) or NULL if the content is in another data field"),
# temporary related field as report_rml is pending deprecation - this field will replace report_rml after v6.0
- 'report_file': fields.related('report_rml', type="char", size=256, required=False, readonly=False, string='Report file', help="The path to the main report file (depending on Report Type) or NULL if the content is in another field", store=True),
+ 'report_file': fields.related('report_rml', type="char", size=256, required=False, readonly=False, string='Report File', help="The path to the main report file (depending on Report Type) or NULL if the content is in another field", store=True),
- 'report_sxw': fields.function(_report_sxw, type='char', string='SXW path'),
- 'report_sxw_content_data': fields.binary('SXW content'),
- 'report_rml_content_data': fields.binary('RML content'),
+ 'report_sxw': fields.function(_report_sxw, type='char', string='SXW Path'),
+ 'report_sxw_content_data': fields.binary('SXW Content'),
+ 'report_rml_content_data': fields.binary('RML Content'),
'report_sxw_content': fields.function(_report_content, fnct_inv=_report_content_inv, type='binary', string='SXW content',),
- 'report_rml_content': fields.function(_report_content, fnct_inv=_report_content_inv, type='binary', string='RML content'),
+ 'report_rml_content': fields.function(_report_content, fnct_inv=_report_content_inv, type='binary', string='RML Content'),
}
_defaults = {
=== modified file 'openerp/addons/base/ir/ir_attachment.py'
--- openerp/addons/base/ir/ir_attachment.py 2012-03-09 10:04:29 +0000
+++ openerp/addons/base/ir/ir_attachment.py 2012-04-30 06:09:20 +0000
@@ -142,7 +142,7 @@
_columns = {
'name': fields.char('Attachment Name',size=256, required=True),
'datas': fields.binary('Data'),
- 'datas_fname': fields.char('Filename',size=256),
+ 'datas_fname': fields.char('File Name',size=256),
'description': fields.text('Description'),
'res_name': fields.function(_name_get_resname, type='char', size=128,
string='Resource Name', store=True),
=== modified file 'openerp/addons/base/ir/ir_model.py'
--- openerp/addons/base/ir/ir_model.py 2012-04-06 08:17:26 +0000
+++ openerp/addons/base/ir/ir_model.py 2012-04-30 06:09:20 +0000
@@ -97,10 +97,10 @@
'field_id': fields.one2many('ir.model.fields', 'model_id', 'Fields', required=True),
'state': fields.selection([('manual','Custom Object'),('base','Base Object')],'Type',readonly=True),
'access_ids': fields.one2many('ir.model.access', 'model_id', 'Access'),
- 'osv_memory': fields.function(_is_osv_memory, string='In-memory model', type='boolean',
+ 'osv_memory': fields.function(_is_osv_memory, string='In-Memory Model', type='boolean',
fnct_search=_search_osv_memory,
help="Indicates whether this object model lives in memory only, i.e. is not persisted (osv.osv_memory)"),
- 'modules': fields.function(_in_modules, type='char', size=128, string='In modules', help='List of modules in which the object is defined or inherited'),
+ 'modules': fields.function(_in_modules, type='char', size=128, string='In Modules', help='List of modules in which the object is defined or inherited'),
'view_ids': fields.function(_view_ids, type='one2many', obj='ir.ui.view', string='Views'),
}
@@ -229,14 +229,14 @@
'translate': fields.boolean('Translate', help="Whether values for this field can be translated (enables the translation mechanism for that field)"),
'size': fields.integer('Size'),
'state': fields.selection([('manual','Custom Field'),('base','Base Field')],'Type', required=True, readonly=True, select=1),
- 'on_delete': fields.selection([('cascade','Cascade'),('set null','Set NULL')], 'On delete', help='On delete property for many2one fields'),
+ 'on_delete': fields.selection([('cascade','Cascade'),('set null','Set NULL')], 'On Delete', help='On delete property for many2one fields'),
'domain': fields.char('Domain', size=256, help="The optional domain to restrict possible values for relationship fields, "
"specified as a Python expression defining a list of triplets. "
"For example: [('color','=','red')]"),
'groups': fields.many2many('res.groups', 'ir_model_fields_group_rel', 'field_id', 'group_id', 'Groups'),
'view_load': fields.boolean('View Auto-Load'),
'selectable': fields.boolean('Selectable'),
- 'modules': fields.function(_in_modules, type='char', size=128, string='In modules', help='List of modules in which the field is defined'),
+ 'modules': fields.function(_in_modules, type='char', size=128, string='In Modules', help='List of modules in which the field is defined'),
'serialization_field_id': fields.many2one('ir.model.fields', 'Serialization Field', domain = "[('ttype','=','serialized')]",
ondelete='cascade', help="If set, this field will be stored in the sparse "
"structure of the serialization field, instead "
=== modified file 'openerp/addons/base/ir/ir_rule.py'
--- openerp/addons/base/ir/ir_rule.py 2012-03-16 04:29:09 +0000
+++ openerp/addons/base/ir/ir_rule.py 2012-04-30 06:09:20 +0000
@@ -80,10 +80,10 @@
'groups': fields.many2many('res.groups', 'rule_group_rel', 'rule_group_id', 'group_id', 'Groups'),
'domain_force': fields.text('Domain'),
'domain': fields.function(_domain_force_get, string='Domain', type='text'),
- 'perm_read': fields.boolean('Apply For Read'),
- 'perm_write': fields.boolean('Apply For Write'),
- 'perm_create': fields.boolean('Apply For Create'),
- 'perm_unlink': fields.boolean('Apply For Delete')
+ 'perm_read': fields.boolean('Apply for Read'),
+ 'perm_write': fields.boolean('Apply for Write'),
+ 'perm_create': fields.boolean('Apply for Create'),
+ 'perm_unlink': fields.boolean('Apply for Delete')
}
_order = 'model_id DESC'
=== modified file 'openerp/addons/base/ir/workflow/workflow.py'
--- openerp/addons/base/ir/workflow/workflow.py 2012-03-30 21:51:24 +0000
+++ openerp/addons/base/ir/workflow/workflow.py 2012-04-30 06:09:20 +0000
@@ -109,7 +109,7 @@
_columns = {
'trigger_model': fields.char('Trigger Object', size=128),
'trigger_expr_id': fields.char('Trigger Expression', size=128),
- 'signal': fields.char('Signal (button Name)', size=64,
+ 'signal': fields.char('Signal (Button Name)', size=64,
help="When the operation of transition comes from a button pressed in the client form, "\
"signal tests the name of the pressed button. If signal is NULL, no button is necessary to validate this transition."),
'group_id': fields.many2one('res.groups', 'Group Required',
=== modified file 'openerp/addons/base/module/module.py'
--- openerp/addons/base/module/module.py 2012-04-03 08:27:43 +0000
+++ openerp/addons/base/module/module.py 2012-04-30 06:09:20 +0000
@@ -175,8 +175,8 @@
# latest_version refer the installed version (the one in database)
# published_version refer the version available on the repository
'installed_version': fields.function(_get_latest_version,
- string='Latest version', type='char'),
- 'latest_version': fields.char('Installed version', size=64, readonly=True),
+ string='Latest Version', type='char'),
+ 'latest_version': fields.char('Installed Version', size=64, readonly=True),
'published_version': fields.char('Published Version', size=64, readonly=True),
'url': fields.char('URL', size=128, readonly=True),
@@ -195,7 +195,7 @@
('to remove','To be removed'),
('to install','To be installed')
], string='State', readonly=True, select=True),
- 'demo': fields.boolean('Demo data', readonly=True),
+ 'demo': fields.boolean('Demo Data', readonly=True),
'license': fields.selection([
('GPL-2', 'GPL Version 2'),
('GPL-2 or any later version', 'GPL-2 or later version'),
=== modified file 'openerp/addons/base/module/wizard/base_module_update_view.xml'
--- openerp/addons/base/module/wizard/base_module_update_view.xml 2012-04-25 08:12:50 +0000
+++ openerp/addons/base/module/wizard/base_module_update_view.xml 2012-04-30 06:09:20 +0000
@@ -19,7 +19,7 @@
</group>
<separator orientation="vertical" rowspan="15"/>
<group colspan="4">
- <separator string="Module update result" colspan="4"/>
+ <separator string="Module Update Result" colspan="4"/>
<group states="init" colspan="4">
<label string="Click on Update below to start the process..." colspan="4"/>
</group>
=== modified file 'openerp/addons/base/module/wizard/base_module_upgrade.py'
--- openerp/addons/base/module/wizard/base_module_upgrade.py 2012-03-30 22:20:23 +0000
+++ openerp/addons/base/module/wizard/base_module_upgrade.py 2012-04-30 06:09:20 +0000
@@ -30,7 +30,7 @@
_description = "Module Upgrade"
_columns = {
- 'module_info': fields.text('Modules to update',readonly=True),
+ 'module_info': fields.text('Modules to Update',readonly=True),
}
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
=== modified file 'openerp/addons/base/module/wizard/base_module_upgrade_view.xml'
--- openerp/addons/base/module/wizard/base_module_upgrade_view.xml 2012-04-25 08:12:50 +0000
+++ openerp/addons/base/module/wizard/base_module_upgrade_view.xml 2012-04-30 06:09:20 +0000
@@ -11,7 +11,7 @@
<group colspan="2" col="4">
<label align="0.0" string="Your system will be updated." colspan="4"/>
<label align="0.0" string="Note that this operation might take a few minutes." colspan="4"/>
- <separator string="Modules to update" colspan="4"/>
+ <separator string="Modules to Update" colspan="4"/>
<field name="module_info" nolabel="1" colspan="4"/>
<separator string="" colspan="4"/>
<button special="cancel" string="Cancel" icon="gtk-cancel"/>
=== modified file 'openerp/addons/base/res/res_bank.py'
--- openerp/addons/base/res/res_bank.py 2012-02-23 13:53:47 +0000
+++ openerp/addons/base/res/res_bank.py 2012-04-30 06:09:20 +0000
@@ -61,7 +61,7 @@
_columns = {
'name': fields.char('Name', size=64, required=True, translate=True),
'code': fields.char('Code', size=64, required=True),
- 'field_ids': fields.one2many('res.partner.bank.type.field', 'bank_type_id', 'Type fields'),
+ 'field_ids': fields.one2many('res.partner.bank.type.field', 'bank_type_id', 'Type Fields'),
'format_layout': fields.text('Format Layout', translate=True)
}
_defaults = {
=== modified file 'openerp/addons/base/res/res_currency.py'
--- openerp/addons/base/res/res_currency.py 2012-02-08 22:40:31 +0000
+++ openerp/addons/base/res/res_currency.py 2012-04-30 06:09:20 +0000
@@ -66,7 +66,7 @@
'company_id':fields.many2one('res.company', 'Company'),
'date': fields.date('Date'),
'base': fields.boolean('Base'),
- 'position': fields.selection([('after','After Amount'),('before','Before Amount')], 'Symbol position', help="Determines where the currency symbol should be placed after or before the amount.")
+ 'position': fields.selection([('after','After Amount'),('before','Before Amount')], 'Symbol Position', help="Determines where the currency symbol should be placed after or before the amount.")
}
_defaults = {
'active': lambda *a: 1,
=== modified file 'openerp/addons/base/res/res_currency_view.xml'
--- openerp/addons/base/res/res_currency_view.xml 2011-09-21 23:21:50 +0000
+++ openerp/addons/base/res/res_currency_view.xml 2012-04-30 06:09:20 +0000
@@ -58,7 +58,7 @@
</group>
<group col="2" colspan="2">
- <separator string="Miscelleanous" colspan="2"/>
+ <separator string="Miscellaneous" colspan="2"/>
<field name="base"/>
<field name="active" select="1"/>
</group>
=== modified file 'openerp/addons/base/res/res_partner.py'
--- openerp/addons/base/res/res_partner.py 2012-04-17 10:18:10 +0000
+++ openerp/addons/base/res/res_partner.py 2012-04-30 06:09:20 +0000
@@ -103,7 +103,7 @@
_name = 'res.partner.title'
_columns = {
'name': fields.char('Title', required=True, size=46, translate=True),
- 'shortcut': fields.char('Shortcut', required=True, size=16, translate=True),
+ 'shortcut': fields.char('Abbreviation', required=True, size=16, translate=True),
'domain': fields.selection([('partner','Partner'),('contact','Contact')], 'Domain', required=True, size=24)
}
_order = 'name'
=== modified file 'openerp/addons/base/res/res_users.py'
--- openerp/addons/base/res/res_users.py 2012-04-25 08:21:26 +0000
+++ openerp/addons/base/res/res_users.py 2012-04-30 06:09:20 +0000
@@ -203,7 +203,7 @@
'password': fields.char('Password', size=64, invisible=True, help="Keep empty if you don't want the user to be able to connect on the system."),
'new_password': fields.function(_get_password, type='char', size=64,
fnct_inv=_set_new_password,
- string='Set password', help="Specify a value only when creating a user or if you're changing the user's password, "
+ string='Set Password', help="Specify a value only when creating a user or if you're changing the user's password, "
"otherwise leave empty. After a change of password, the user has to login again."),
'user_email': fields.char('Email', size=64),
'signature': fields.text('Signature', size=64),
=== modified file 'openerp/tools/misc.py'
--- openerp/tools/misc.py 2012-03-06 17:33:19 +0000
+++ openerp/tools/misc.py 2012-04-30 06:09:20 +0000
@@ -23,7 +23,7 @@
#.apidoc title: Utilities: tools.misc
"""
-Miscelleanous tools used by OpenERP.
+Miscellaneous tools used by OpenERP.
"""
from functools import wraps
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
