[MERGE] from Geoff Gardiner

bzr revid: stephane@tinyerp.com-20090127101030-jh0oldlr451zpdq2

4 files changed, 8 insertions, 8 deletions

diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py
index 984d67f01a2..1b0189bda55 100644
--- a/bin/addons/base/module/module.py
+++ b/bin/addons/base/module/module.py
@@ -43,12 +43,12 @@ class module_repository(osv.osv):
     _description = "Module Repository"
     _columns = {
         'name': fields.char('Name', size=128),
-        'url': fields.char('Url', size=256, required=True),
+        'url': fields.char('URL', size=256, required=True),
         'sequence': fields.integer('Sequence', required=True),
         'filter': fields.char('Filter', size=128, required=True,
             help='Regexp to search module on the repository webpage:\n'
             '- The first parenthesis must match the name of the module.\n'
-            '- The second parenthesis must match all the version number.\n'
+            '- The second parenthesis must match the whole version number.\n'
             '- The last parenthesis must match the extension of the module.'),
         'active': fields.boolean('Active'),
     }
@@ -76,8 +76,8 @@ class module_category(osv.osv):
     _columns = {
         'name': fields.char("Name", size=128, required=True),
         'parent_id': fields.many2one('ir.module.category', 'Parent Category', select=True),
-        'child_ids': fields.one2many('ir.module.category', 'parent_id', 'Parent Category'),
-        'module_nr': fields.function(_module_nbr, method=True, string='# of Modules', type='integer')
+        'child_ids': fields.one2many('ir.module.category', 'parent_id', 'Child Categories'),
+        'module_nr': fields.function(_module_nbr, method=True, string='Number of Modules', type='integer')
     }
     _order = 'name'
 module_category()
@@ -140,7 +140,7 @@ class module(osv.osv):
     _columns = {
         'name': fields.char("Name", size=128, readonly=True, required=True),
         'category_id': fields.many2one('ir.module.category', 'Category', readonly=True),
-        'shortdesc': fields.char('Short description', size=256, readonly=True, translate=True),
+        'shortdesc': fields.char('Short Description', size=256, readonly=True, translate=True),
         'description': fields.text("Description", readonly=True, translate=True),
         'author': fields.char("Author", size=128, readonly=True),
         'website': fields.char("Website", size=256, readonly=True),
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>"""