diff options
| author | P. Christeas <p_christ@hol.gr> | 2009-01-28 15:50:50 +0200 |
|---|---|---|
| committer | P. Christeas <p_christ@hol.gr> | 2009-01-28 15:50:50 +0200 |
| commit | caa5ca5ae2433b0e90cebe4ace6aa7477ce01f9e (patch) | |
| tree | d4038792f08744837c183b7e73c0b279e15d5097 /bin/addons/base/module/wizard | |
| parent | 3c8938fdc39b16fac8ae00ef8c7d40d34985b538 (diff) | |
| parent | 4fff87ad618b808d7f34e473b01905dd3d4479e3 (diff) | |
Merge branch 'master' of openobject-server into mdv-gpl3-py26
Conflicts:
bin/tools/translate.py
bzr revid: p_christ@hol.gr-20090128135050-bb1ueo5ovziijg00
Diffstat (limited to 'bin/addons/base/module/wizard')
4 files changed, 4 insertions, 4 deletions
diff --git a/bin/addons/base/module/wizard/wizard_export_lang.py b/bin/addons/base/module/wizard/wizard_export_lang.py index 49f254604f7..2e8be987c24 100644 --- a/bin/addons/base/module/wizard/wizard_export_lang.py +++ b/bin/addons/base/module/wizard/wizard_export_lang.py @@ -73,7 +73,7 @@ class wizard_export_lang(osv.osv_memory): 'format': fields.selection( ( ('csv','CSV File'), ('po','PO File'), ('tgz', 'TGZ Archive')), 'File Format', required=True), 'modules': fields.many2many('ir.module.module', 'rel_modules_langexport', 'wiz_id', 'module_id', 'Modules', domain=[('state','=','installed')]), 'data': fields.binary('File', readonly=True), - 'advice': fields.text('', readonly=True), + 'advice': fields.text('Advice', readonly=True), 'state': fields.selection( ( ('choose','choose'), # choose language ('get','get'), # get the file ) ), diff --git a/bin/addons/base/module/wizard/wizard_import_lang.py b/bin/addons/base/module/wizard/wizard_import_lang.py index aad846d59ac..f17b50c3434 100644 --- a/bin/addons/base/module/wizard/wizard_import_lang.py +++ b/bin/addons/base/module/wizard/wizard_import_lang.py @@ -30,7 +30,7 @@ view_form="""<?xml version="1.0"?> <form string="Import language"> <image name="gtk-dialog-info" colspan="2"/> <group colspan="2" col="4"> - <separator string="Import new language" colspan="4"/> + <separator string="Import New Language" colspan="4"/> <field name="name" width="200"/> <field name="code"/> <field name="data" colspan="4"/> diff --git a/bin/addons/base/module/wizard/wizard_module_import.py b/bin/addons/base/module/wizard/wizard_module_import.py index a2c653471e2..fbf66d4c222 100644 --- a/bin/addons/base/module/wizard/wizard_module_import.py +++ b/bin/addons/base/module/wizard/wizard_module_import.py @@ -39,7 +39,7 @@ finish_form ='''<?xml version="1.0"?> ask_form ='''<?xml version="1.0"?> <form string="Module import"> - <separator string="Module import" colspan="4"/> + <separator string="Module Import" colspan="4"/> <label string="Please give your module .ZIP file to import." colspan="4"/> <field name="module_file"/> </form> diff --git a/bin/addons/base/module/wizard/wizard_module_lang_install.py b/bin/addons/base/module/wizard/wizard_module_lang_install.py index badf7dce09b..1a18ca21ed9 100644 --- a/bin/addons/base/module/wizard/wizard_module_lang_install.py +++ b/bin/addons/base/module/wizard/wizard_module_lang_install.py @@ -28,7 +28,7 @@ view_form_end = """<?xml version="1.0"?> <form string="Language file loaded."> <image name="gtk-dialog-info" colspan="2"/> <group colspan="2" col="4"> - <separator string="Installation done" colspan="4"/> + <separator string="Installation Done" colspan="4"/> <label align="0.0" string="The selected language has been successfully installed.\nYou must change the preferences of the user and open a new menu to view changes." colspan="4"/> </group> </form>""" |