[MERGE]

bzr revid: olt@tinyerp.com-20090127124659-gmd5avxlgl2831tl

1 files changed, 5 insertions, 5 deletions

diff --git a/addons/document/document.py b/addons/document/document.py
index 1a429ca5634..6cc2e7fd7e3 100644
--- a/addons/document/document.py
+++ b/addons/document/document.py
@@ -217,23 +217,23 @@ class document_directory(osv.osv):
         'create_date': fields.datetime('Date Created', readonly=True),
         'create_uid':  fields.many2one('res.users', 'Creator', readonly=True),
         'file_type': fields.char('Content Type', size=32),
-        'domain': fields.char('Domain', size=128, help="Use a domain if you want to apply an automatic filter on visible ressources."),
+        'domain': fields.char('Domain', size=128, help="Use a domain if you want to apply an automatic filter on visible resources."),
         'user_id': fields.many2one('res.users', 'Owner'),
         'group_ids': fields.many2many('res.groups', 'document_directory_group_rel', 'item_id', 'group_id', 'Groups'),
         'parent_id': fields.many2one('document.directory', 'Parent Item'),
-        'child_ids': fields.one2many('document.directory', 'parent_id', 'Childs'),
+        'child_ids': fields.one2many('document.directory', 'parent_id', 'Children'),
         'file_ids': fields.one2many('ir.attachment', 'parent_id', 'Files'),
         'content_ids': fields.one2many('document.directory.content', 'directory_id', 'Virtual Files'),
-        'type': fields.selection([('directory','Static Directory'),('ressource','Other Ressources')], 'Type', required=True),
+        'type': fields.selection([('directory','Static Directory'),('ressource','Other Resources')], 'Type', required=True),
         'ressource_type_id': fields.many2one('ir.model', 'Directories Mapped to Objects',
             help="Select an object here and Open ERP will create a mapping for each of these " \
                  "objects, using the given domain, when browsing through FTP."),
         'ressource_parent_type_id': fields.many2one('ir.model', 'Parent Model',
             help="If you put an object here, this directory template will appear bellow all of these objects. " \
                  "Don't put a parent directory if you select a parent model."),
-        'ressource_id': fields.integer('Ressource ID'),
+        'ressource_id': fields.integer('Resource ID'),
         'ressource_tree': fields.boolean('Tree Structure',
-            help="Check this if you want to use the same tree structure than the selected object in the system."),
+            help="Check this if you want to use the same tree structure as the object selected in the system."),
     }
     _defaults = {
         'user_id': lambda self,cr,uid,ctx: uid,