From 744bfb8cc170cad94895a93409916c4624f36eec Mon Sep 17 00:00:00 2001
From: Numerigraphe - Lionel Sausin <ls@numerigraphe.fr>
Date: Wed, 24 Mar 2010 17:37:24 +0100
Subject: [PATCH 1/2] [IMP] wording: "children" intead of "childs"

lp bug: https://launchpad.net/bugs/327259 fixed

bzr revid: ls@numerigraphe.fr-20100324163724-q1xe1ozomk23k17j
---
 addons/account/account.py                            |  6 +++---
 addons/account/account_assert_test.xml               |  4 ++--
 addons/account/report/general_ledger.py              |  4 ++--
 addons/account/report/general_ledger_landscape.py    |  4 ++--
 addons/account/wizard/wizard_move_line_select.py     |  2 +-
 addons/account_report/report/accounting_report.py    |  2 +-
 addons/account_report/report/accounting_report.rml   |  2 +-
 addons/analytic/project.py                           |  4 ++--
 .../wizard/tiny_sxw2rml/tiny_sxw2rml.py              |  4 ++--
 addons/caldav/DAV/davcmd.py                          |  2 +-
 addons/caldav/DAV/iface.py                           |  2 +-
 addons/caldav/DAV/propfind.py                        |  4 ++--
 addons/caldav/DAV/utils.py                           | 12 ++++++------
 addons/document/document_directory.py                |  2 +-
 addons/document_ftp/ftpserver/abstracted_fs.py       |  4 ++--
 addons/document_webdav/DAV/davcmd.py                 |  2 +-
 addons/document_webdav/DAV/iface.py                  |  2 +-
 addons/document_webdav/DAV/propfind.py               |  4 ++--
 addons/document_webdav/DAV/utils.py                  | 12 ++++++------
 addons/document_webdav/dav_fs.py                     |  6 +++---
 addons/hr/hr_department.py                           | 12 ++++++------
 addons/product/i18n/ar.po                            |  2 +-
 addons/product/i18n/bg.po                            |  2 +-
 addons/product/i18n/bs.po                            |  2 +-
 addons/product/i18n/ca.po                            |  2 +-
 addons/product/i18n/cs.po                            |  2 +-
 addons/product/i18n/de.po                            |  2 +-
 addons/product/i18n/el.po                            |  2 +-
 addons/product/i18n/es.po                            |  2 +-
 addons/product/i18n/es_AR.po                         |  2 +-
 addons/product/i18n/et.po                            |  2 +-
 addons/product/i18n/fi.po                            |  2 +-
 addons/product/i18n/fr.po                            |  2 +-
 addons/product/i18n/hr.po                            |  2 +-
 addons/product/i18n/hu.po                            |  2 +-
 addons/product/i18n/id.po                            |  2 +-
 addons/product/i18n/it.po                            |  2 +-
 addons/product/i18n/ko.po                            |  2 +-
 addons/product/i18n/lt.po                            |  2 +-
 addons/product/i18n/lv.po                            |  2 +-
 addons/product/i18n/nb.po                            |  2 +-
 addons/product/i18n/nb_NB.po                         |  2 +-
 addons/product/i18n/nl.po                            |  2 +-
 addons/product/i18n/nl_BE.po                         |  2 +-
 addons/product/i18n/pl.po                            |  2 +-
 addons/product/i18n/product.pot                      |  2 +-
 addons/product/i18n/pt.po                            |  2 +-
 addons/product/i18n/pt_BR.po                         |  2 +-
 addons/product/i18n/ro.po                            |  2 +-
 addons/product/i18n/ru.po                            |  2 +-
 addons/product/i18n/sk.po                            |  2 +-
 addons/product/i18n/sl.po                            |  2 +-
 addons/product/i18n/sq.po                            |  4 ++--
 addons/product/i18n/sr.po                            |  2 +-
 addons/product/i18n/sv.po                            |  2 +-
 addons/product/i18n/tlh.po                           |  2 +-
 addons/product/i18n/tr.po                            |  2 +-
 addons/product/i18n/uk.po                            |  2 +-
 addons/product/i18n/vi.po                            |  2 +-
 addons/product/i18n/zh_CN.po                         |  2 +-
 addons/product/i18n/zh_TW.po                         |  2 +-
 addons/product/pricelist.py                          |  2 +-
 addons/stock/i18n/ar.po                              |  2 +-
 addons/stock/i18n/bg.po                              |  2 +-
 addons/stock/i18n/bs.po                              |  2 +-
 addons/stock/i18n/ca.po                              |  2 +-
 addons/stock/i18n/cs.po                              |  2 +-
 addons/stock/i18n/de.po                              |  2 +-
 addons/stock/i18n/el.po                              |  2 +-
 addons/stock/i18n/es.po                              |  2 +-
 addons/stock/i18n/es_AR.po                           |  2 +-
 addons/stock/i18n/et.po                              |  2 +-
 addons/stock/i18n/fi.po                              |  2 +-
 addons/stock/i18n/fr.po                              |  2 +-
 addons/stock/i18n/hr.po                              |  2 +-
 addons/stock/i18n/hu.po                              |  2 +-
 addons/stock/i18n/id.po                              |  2 +-
 addons/stock/i18n/it.po                              |  2 +-
 addons/stock/i18n/ko.po                              |  2 +-
 addons/stock/i18n/lt.po                              |  2 +-
 addons/stock/i18n/nl.po                              |  2 +-
 addons/stock/i18n/nl_BE.po                           |  2 +-
 addons/stock/i18n/pl.po                              |  2 +-
 addons/stock/i18n/pt.po                              |  2 +-
 addons/stock/i18n/pt_BR.po                           |  2 +-
 addons/stock/i18n/ro.po                              |  2 +-
 addons/stock/i18n/ru.po                              |  2 +-
 addons/stock/i18n/sl.po                              |  2 +-
 addons/stock/i18n/sq.po                              |  4 ++--
 addons/stock/i18n/sr.po                              |  2 +-
 addons/stock/i18n/stock.pot                          |  2 +-
 addons/stock/i18n/sv.po                              |  2 +-
 addons/stock/i18n/th.po                              |  2 +-
 addons/stock/i18n/th_TH.po                           |  2 +-
 addons/stock/i18n/tlh.po                             |  2 +-
 addons/stock/i18n/tr.po                              |  2 +-
 addons/stock/i18n/uk.po                              |  2 +-
 addons/stock/i18n/vi.po                              |  4 ++--
 addons/stock/i18n/zh_CN.po                           |  2 +-
 addons/stock/i18n/zh_TW.po                           |  2 +-
 addons/stock/wizard/wizard_inventory.py              |  2 +-
 addons/wiki/wiki_view.xml                            |  4 ++--
 addons/wiki/wizard/open_page.py                      |  2 +-
 103 files changed, 134 insertions(+), 134 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 12868487c49..2bb7165eb4d 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -176,7 +176,7 @@ class account_account(osv.osv):
                 args[pos] = ('id', 'in', ids1)
             pos += 1
 
-        if context and context.has_key('consolidate_childs'): #add consolidated childs of accounts
+        if context and context.has_key('consolidate_children'): #add consolidated children of accounts
             ids = super(account_account, self).search(cr, uid, args, offset, limit,
                 order, context=context, count=count)
             for consolidate_child in self.browse(cr, uid, context['account_id']).child_consol_ids:
@@ -1456,7 +1456,7 @@ class account_tax(osv.osv):
         RETURN:
             [ tax ]
             tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2}
-            one tax for each tax id in IDS and their childs
+            one tax for each tax id in IDS and their children
         """
         res = self._unit_compute(cr, uid, taxes, price_unit, address_id, product, partner, quantity)
         total = 0.0
@@ -1553,7 +1553,7 @@ class account_tax(osv.osv):
         RETURN:
             [ tax ]
             tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2}
-            one tax for each tax id in IDS and their childs
+            one tax for each tax id in IDS and their children
         """
         res = self._unit_compute_inv(cr, uid, taxes, price_unit, address_id, product, partner=None)
         total = 0.0
diff --git a/addons/account/account_assert_test.xml b/addons/account/account_assert_test.xml
index 585c6bda124..bb497328082 100644
--- a/addons/account/account_assert_test.xml
+++ b/addons/account/account_assert_test.xml
@@ -6,8 +6,8 @@
         </assert>
 
 
-   <!--     <assert model="account.account" search="[]" string="For all accounts, the balance is equal to the sum of the balance of its childs">
-        <assert model="account.account" search="[]" string="For all accounts, the balance is equal to the sum of the balance of its childs">
+   <!--     <assert model="account.account" search="[]" string="For all accounts, the balance is equal to the sum of the balance of its children">
+        <assert model="account.account" search="[]" string="For all accounts, the balance is equal to the sum of the balance of its children">
             <test expr="not len(child_id) or (balance - sum([c.balance for c in child_id]) &lt;= 0.00001)"/>
         </assert>
 
diff --git a/addons/account/report/general_ledger.py b/addons/account/report/general_ledger.py
index b06aa1198fc..ff7af199d15 100644
--- a/addons/account/report/general_ledger.py
+++ b/addons/account/report/general_ledger.py
@@ -187,8 +187,8 @@ class general_ledger(rml_parse.rml_parse):
         ##
         #
         self.query = self.pool.get('account.move.line')._query_get(self.cr, self.uid, context=ctx)
-        if account and account.child_consol_ids: # add ids of consolidated childs also of selected account
-            ctx['consolidate_childs'] = True
+        if account and account.child_consol_ids: # add ids of consolidated children also of selected account
+            ctx['consolidate_children'] = True
             ctx['account_id'] = account.id
         ids_acc = self.pool.get('account.account').search(self.cr, self.uid,[('parent_id', 'child_of', [account.id])], context=ctx)
         for child_id in ids_acc:
diff --git a/addons/account/report/general_ledger_landscape.py b/addons/account/report/general_ledger_landscape.py
index c888994622b..0c591c72088 100644
--- a/addons/account/report/general_ledger_landscape.py
+++ b/addons/account/report/general_ledger_landscape.py
@@ -190,8 +190,8 @@ class general_ledger_landscape(rml_parse.rml_parse):
 
         #
         self.query = self.pool.get('account.move.line')._query_get(self.cr, self.uid, context=ctx)
-        if account and account.child_consol_ids: # add ids of consolidated childs also of selected account
-            ctx['consolidate_childs'] = True
+        if account and account.child_consol_ids: # add ids of consolidated children also of selected account
+            ctx['consolidate_children'] = True
             ctx['account_id'] = account.id
         ids_acc = self.pool.get('account.account').search(self.cr, self.uid,[('parent_id', 'child_of', [account.id])], context=ctx)
         for child_id in ids_acc:
diff --git a/addons/account/wizard/wizard_move_line_select.py b/addons/account/wizard/wizard_move_line_select.py
index 76ff699e4e9..a64454ebd5e 100644
--- a/addons/account/wizard/wizard_move_line_select.py
+++ b/addons/account/wizard/wizard_move_line_select.py
@@ -51,7 +51,7 @@ class wizard_move_line_select(wizard.interface):
         if data['id']:
             acc_data = account_obj.browse(cr, uid, data['id']).child_consol_ids
             if acc_data:
-                result['context'].update({'consolidate_childs': True})
+                result['context'].update({'consolidate_children': True})
         result['domain']=result['domain'][0:-1]+','+domain+result['domain'][-1]
         return result
 
diff --git a/addons/account_report/report/accounting_report.py b/addons/account_report/report/accounting_report.py
index 1bb6e7bbab8..bd4cfa3cf76 100644
--- a/addons/account_report/report/accounting_report.py
+++ b/addons/account_report/report/accounting_report.py
@@ -31,7 +31,7 @@ class accounting_report(report_sxw.rml_parse):
         self.ret_list = []
         self.localcontext.update({
             'time': time,
-            'childs':self.process
+            'children':self.process
         })
 
     def process(self,id,level=0):
diff --git a/addons/account_report/report/accounting_report.rml b/addons/account_report/report/accounting_report.rml
index 95c9f03d1b0..32fe308f38e 100644
--- a/addons/account_report/report/accounting_report.rml
+++ b/addons/account_report/report/accounting_report.rml
@@ -88,7 +88,7 @@
 	</blockTable>
 	<para style="P3"><font color="white"> </font></para>
 	<section>
-		<para style="P7">[[repeatIn(childs(o.id),'obj')]]</para>
+		<para style="P7">[[repeatIn(children(o.id),'obj')]]</para>
 		<blockTable colWidths="362.0,73.0,93.0" repeatRows="1" style="Table3">
 			<tr>
 				<td><para style="P11"><font color="white">[[ '....'*(obj['level']) ]]</font><font>[[ obj['name'] ]]</font></para></td>
diff --git a/addons/analytic/project.py b/addons/analytic/project.py
index e9558f7a101..deec011cf19 100644
--- a/addons/analytic/project.py
+++ b/addons/analytic/project.py
@@ -255,8 +255,8 @@ class account_analytic_account(osv.osv):
         if not parent_id:
             return {}
         parent = self.read(cr, uid, [parent_id], ['partner_id','code'])[0]
-        childs = self.search(cr, uid, [('parent_id', '=', parent_id)])
-        numchild = len(childs)
+        children = self.search(cr, uid, [('parent_id', '=', parent_id)])
+        numchild = len(children)
         if parent['partner_id']:
             partner = parent['partner_id'][0]
         else:
diff --git a/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py b/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py
index 9ba1fc6dfaa..da1b6aace7c 100644
--- a/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py
+++ b/addons/base_report_designer/wizard/tiny_sxw2rml/tiny_sxw2rml.py
@@ -256,8 +256,8 @@ class DomApi(DomApiGeneral):
             parent = self.style_dict[style_name].getAttribute("style:parent-style-name").encode("utf-8")
             res = self.getStylePropertiesDict(parent)
 
-        childs = self.style_dict[style_name].childNodes
-        for c in childs:
+        children = self.style_dict[style_name].childNodes
+        for c in children:
             if c.nodeType == c.ELEMENT_NODE and c.nodeName.find("properties")>0 :
                 for attr in c._attrs.keys():
                     res[attr] = c.getAttribute(attr).encode("utf-8")
diff --git a/addons/caldav/DAV/davcmd.py b/addons/caldav/DAV/davcmd.py
index 5c6be3ff9f7..397e5e50aa3 100644
--- a/addons/caldav/DAV/davcmd.py
+++ b/addons/caldav/DAV/davcmd.py
@@ -39,7 +39,7 @@ def deltree(dc,uri,exclude={}):
     
     # test here, if an element is a prefix of an uri which
     # generated an error before.
-    # note that we walk here from childs to parents, thus
+    # note that we walk here from children to parents, thus
     # we cannot delete a parent if a child made a problem.
     # (see example in 8.6.2.1)
     ok=1
diff --git a/addons/caldav/DAV/iface.py b/addons/caldav/DAV/iface.py
index c8f5fe2594d..a365aba3e46 100644
--- a/addons/caldav/DAV/iface.py
+++ b/addons/caldav/DAV/iface.py
@@ -199,7 +199,7 @@ class dav_interface:
 
     To decide which approach is the best you have to decide if your application
     is able to generate errors inside a tree. E.g. a function which completely
-    fails on a tree if one of the tree's childs fail is not what we need. Then
+    fails on a tree if one of the tree's children fail is not what we need. Then
     2) would be your way of doing it.
     Actually usually 2) is the better solution and should only be replaced by
     1) if you really need it.
diff --git a/addons/caldav/DAV/propfind.py b/addons/caldav/DAV/propfind.py
index 0fb9c229c03..dff90f739c7 100755
--- a/addons/caldav/DAV/propfind.py
+++ b/addons/caldav/DAV/propfind.py
@@ -131,7 +131,7 @@ class PROPFIND:
             re=self.mk_propname_response(self.__uri,pnames,doc)
             ms.appendChild(re)
 
-        for newuri in dc.get_childs(self.__uri):
+        for newuri in dc.get_children(self.__uri):
             pnames=dc.get_propnames(newuri)
             re=self.mk_propname_response(newuri,pnames,doc)
             ms.appendChild(re)
@@ -193,7 +193,7 @@ class PROPFIND:
             ms.appendChild(res)
 
 	    try:
-		for newuri in self.__dataclass.get_childs(self.__uri):
+		for newuri in self.__dataclass.get_children(self.__uri):
 			gp,bp=self.get_propvalues(newuri)
 			res=self.mk_prop_response(newuri,gp,bp,doc)
 			ms.appendChild(res)
diff --git a/addons/caldav/DAV/utils.py b/addons/caldav/DAV/utils.py
index c4bb4d1a4c0..d66cf18dc92 100755
--- a/addons/caldav/DAV/utils.py
+++ b/addons/caldav/DAV/utils.py
@@ -88,15 +88,15 @@ def create_treelist(dataclass,uri):
     while len(queue):
         element=queue[-1]
         if dataclass.is_collection(element):
-            childs=dataclass.get_childs(element)
+            children=dataclass.get_children(element)
         else:
-            childs=[]
-        if len(childs):
-            list=list+childs
+            children=[]
+        if len(children):
+            list=list+children
         # update queue
         del queue[-1]
-        if len(childs):
-            queue=queue+childs
+        if len(children):
+            queue=queue+children
     return list
 
 def is_prefix(uri1,uri2):
diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py
index 554eae43e08..aedb5cc3732 100644
--- a/addons/document/document_directory.py
+++ b/addons/document/document_directory.py
@@ -242,7 +242,7 @@ class document_directory(osv.osv):
         oo2 = node.object2 and (node.object2._name, node.object2.id) or False
         return node
 
-    def ol_get_childs(self, cr, uid, uri, context={}):
+    def ol_get_children(self, cr, uid, uri, context={}):
         node = self.get_object(cr, uid, uri, context)
         if uri:
             children = node.children()
diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py
index 0ffa8eb80f2..fc546f3e466 100644
--- a/addons/document_ftp/ftpserver/abstracted_fs.py
+++ b/addons/document_ftp/ftpserver/abstracted_fs.py
@@ -521,7 +521,7 @@ class abstracted_fs:
         """
             Renaming operation, the effect depends on the src:
             * A file: read, create and remove
-            * A directory: change the parent and reassign childs to ressource
+            * A directory: change the parent and reassign children to ressource
         """
         cr = False
         try:
@@ -544,7 +544,7 @@ class abstracted_fs:
                     'directory': [],
                     'attachment': []
                 }
-                # Compute all childs to set the new ressource ID                
+                # Compute all children to set the new ressource ID                
                 child_ids = [src]
                 while len(child_ids):
                     node = child_ids.pop(0)                    
diff --git a/addons/document_webdav/DAV/davcmd.py b/addons/document_webdav/DAV/davcmd.py
index 5c6be3ff9f7..397e5e50aa3 100644
--- a/addons/document_webdav/DAV/davcmd.py
+++ b/addons/document_webdav/DAV/davcmd.py
@@ -39,7 +39,7 @@ def deltree(dc,uri,exclude={}):
     
     # test here, if an element is a prefix of an uri which
     # generated an error before.
-    # note that we walk here from childs to parents, thus
+    # note that we walk here from children to parents, thus
     # we cannot delete a parent if a child made a problem.
     # (see example in 8.6.2.1)
     ok=1
diff --git a/addons/document_webdav/DAV/iface.py b/addons/document_webdav/DAV/iface.py
index c8f5fe2594d..a365aba3e46 100644
--- a/addons/document_webdav/DAV/iface.py
+++ b/addons/document_webdav/DAV/iface.py
@@ -199,7 +199,7 @@ class dav_interface:
 
     To decide which approach is the best you have to decide if your application
     is able to generate errors inside a tree. E.g. a function which completely
-    fails on a tree if one of the tree's childs fail is not what we need. Then
+    fails on a tree if one of the tree's children fail is not what we need. Then
     2) would be your way of doing it.
     Actually usually 2) is the better solution and should only be replaced by
     1) if you really need it.
diff --git a/addons/document_webdav/DAV/propfind.py b/addons/document_webdav/DAV/propfind.py
index 0fb9c229c03..dff90f739c7 100755
--- a/addons/document_webdav/DAV/propfind.py
+++ b/addons/document_webdav/DAV/propfind.py
@@ -131,7 +131,7 @@ class PROPFIND:
             re=self.mk_propname_response(self.__uri,pnames,doc)
             ms.appendChild(re)
 
-        for newuri in dc.get_childs(self.__uri):
+        for newuri in dc.get_children(self.__uri):
             pnames=dc.get_propnames(newuri)
             re=self.mk_propname_response(newuri,pnames,doc)
             ms.appendChild(re)
@@ -193,7 +193,7 @@ class PROPFIND:
             ms.appendChild(res)
 
 	    try:
-		for newuri in self.__dataclass.get_childs(self.__uri):
+		for newuri in self.__dataclass.get_children(self.__uri):
 			gp,bp=self.get_propvalues(newuri)
 			res=self.mk_prop_response(newuri,gp,bp,doc)
 			ms.appendChild(res)
diff --git a/addons/document_webdav/DAV/utils.py b/addons/document_webdav/DAV/utils.py
index c4bb4d1a4c0..d66cf18dc92 100755
--- a/addons/document_webdav/DAV/utils.py
+++ b/addons/document_webdav/DAV/utils.py
@@ -88,15 +88,15 @@ def create_treelist(dataclass,uri):
     while len(queue):
         element=queue[-1]
         if dataclass.is_collection(element):
-            childs=dataclass.get_childs(element)
+            children=dataclass.get_children(element)
         else:
-            childs=[]
-        if len(childs):
-            list=list+childs
+            children=[]
+        if len(children):
+            list=list+children
         # update queue
         del queue[-1]
-        if len(childs):
-            queue=queue+childs
+        if len(children):
+            queue=queue+children
     return list
 
 def is_prefix(uri1,uri2):
diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index 1acbfd7d5ec..312f1b42db2 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -142,9 +142,9 @@ class tinydav_handler(dav_interface):
             cr.close()
         return self.db_name_list
 
-    def get_childs(self,uri):
+    def get_children(self,uri):
         """ return the child objects as self.baseuris for the given URI """
-        self.parent.log_message('get childs: %s' % uri)
+        self.parent.log_message('get children: %s' % uri)
         if uri[-1]=='/':uri=uri[:-1]
         cr, uid, pool, dbname, uri2 = self.get_cr(uri)
         
@@ -160,7 +160,7 @@ class tinydav_handler(dav_interface):
         else:
             fp = node.full_path()
             if fp and len(fp):
-                self.parent.log_message('childs: @%s' % fp)
+                self.parent.log_message('children: @%s' % fp)
                 fp = '/'.join(fp)
             else:
                 fp = None
diff --git a/addons/hr/hr_department.py b/addons/hr/hr_department.py
index ef1160132a5..b0abcb413ea 100644
--- a/addons/hr/hr_department.py
+++ b/addons/hr/hr_department.py
@@ -135,13 +135,13 @@ class res_users(osv.osv):
             ids_dept = obj_dept.search(cr, uid, [('id', 'child_of', mgnt_dept_ids)])
             if ids_dept:
                 data_dept = obj_dept.read(cr, uid, ids_dept, ['member_ids'])
-                childs = map(lambda x: x['member_ids'], data_dept)
-                childs = tools.flatten(childs)
-                childs = obj_user.search(cr, uid, [('id','in',childs),('active','=',True)])
-                if manager_id in childs:
-                    childs.remove(manager_id)
+                children = map(lambda x: x['member_ids'], data_dept)
+                children = tools.flatten(children)
+                children = obj_user.search(cr, uid, [('id','in',children),('active','=',True)])
+                if manager_id in children:
+                    children.remove(manager_id)
 
-                child_ids.extend(tools.flatten(childs))
+                child_ids.extend(tools.flatten(children))
                 set = {}
                 map(set.__setitem__, child_ids, [])
                 child_ids =  set.keys()
diff --git a/addons/product/i18n/ar.po b/addons/product/i18n/ar.po
index 0be860cd3b7..7d967d70433 100644
--- a/addons/product/i18n/ar.po
+++ b/addons/product/i18n/ar.po
@@ -1675,7 +1675,7 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/bg.po b/addons/product/i18n/bg.po
index a97902da97c..e01ed5c3e50 100644
--- a/addons/product/i18n/bg.po
+++ b/addons/product/i18n/bg.po
@@ -1674,7 +1674,7 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/bs.po b/addons/product/i18n/bs.po
index 4feb4f244e5..65493adca81 100644
--- a/addons/product/i18n/bs.po
+++ b/addons/product/i18n/bs.po
@@ -1742,7 +1742,7 @@ msgstr "Min. količina"
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 "Postavite kategoriju proizvoda ako se ovo pravilo odnosi na proizvode "
 "kategorije i pod kategorije. Ostavite prazno za sve proizvode"
diff --git a/addons/product/i18n/ca.po b/addons/product/i18n/ca.po
index eb5add69766..f1c82c5724f 100644
--- a/addons/product/i18n/ca.po
+++ b/addons/product/i18n/ca.po
@@ -1750,7 +1750,7 @@ msgstr "Quantitat Mín."
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 "Indica una categoria de producte si aquesta regla només s'aplica a productes "
 "d'una categoria i als seus descendents. Deixeu-lo buit per a tots els "
diff --git a/addons/product/i18n/cs.po b/addons/product/i18n/cs.po
index 770168d632f..6d1d8bf8eaa 100644
--- a/addons/product/i18n/cs.po
+++ b/addons/product/i18n/cs.po
@@ -1672,7 +1672,7 @@ msgstr "Min. množství"
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/de.po b/addons/product/i18n/de.po
index 0b9089b8dd5..ff93744ecfd 100644
--- a/addons/product/i18n/de.po
+++ b/addons/product/i18n/de.po
@@ -1758,7 +1758,7 @@ msgstr "Min. Anzahl"
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 "Definiere eine Produkt Kategorie wenn diese Regel nur auf die Produkte einer "
 "Kategorie und seinen zugeordneten Produkten angewendet werden soll. Lasse "
diff --git a/addons/product/i18n/el.po b/addons/product/i18n/el.po
index 865108c3da1..5d0be84cbae 100644
--- a/addons/product/i18n/el.po
+++ b/addons/product/i18n/el.po
@@ -1768,7 +1768,7 @@ msgstr "Ελάχιστη Ποσότητα"
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 "Ρυθμίστε μιά κατηγορία προϊόντων έαν αυτός ο κανόνας χρησιμοποιείται σε "
 "προϊόντα μιάς κατηγορίας και των υποκατηγοριών. Διατηρήστε κενό για όλα τα "
diff --git a/addons/product/i18n/es.po b/addons/product/i18n/es.po
index de87785a953..b24286d3bcb 100644
--- a/addons/product/i18n/es.po
+++ b/addons/product/i18n/es.po
@@ -1758,7 +1758,7 @@ msgstr "Cantidad mín."
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 "Indicar una categoría de producto si esta regla sólo se aplica a productos "
 "de una categoría y a sus descendientes. Dejarlo vacío para todos los "
diff --git a/addons/product/i18n/es_AR.po b/addons/product/i18n/es_AR.po
index 4b90b6aefcb..da4d5653f93 100644
--- a/addons/product/i18n/es_AR.po
+++ b/addons/product/i18n/es_AR.po
@@ -1750,7 +1750,7 @@ msgstr "Cantidad mín."
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 "Indicar una categoría de producto si esta regla sólo se aplica a productos "
 "de una categoría y a sus descendientes. Dejarlo vacío para todos los "
diff --git a/addons/product/i18n/et.po b/addons/product/i18n/et.po
index da83f4082ae..49593d56621 100644
--- a/addons/product/i18n/et.po
+++ b/addons/product/i18n/et.po
@@ -1739,7 +1739,7 @@ msgstr "Vähim kogus"
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 "Määra toote kategooria, kui see reegel rakendub ainult kategooria toodetele "
 "ja nende alamatele. Hoia tühjana kõigi toodete jaoks."
diff --git a/addons/product/i18n/fi.po b/addons/product/i18n/fi.po
index c5812946a89..2a7a124f1da 100644
--- a/addons/product/i18n/fi.po
+++ b/addons/product/i18n/fi.po
@@ -1741,7 +1741,7 @@ msgstr "Vähimmäismäärä"
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 "Aseta tuotekategoria jos sääntöä sovelletaan vain siinä tai sen "
 "alakategorioissa oleviin tuotteisiin. Jätä tyhjäksi jos sovelletaan kaikkiin "
diff --git a/addons/product/i18n/fr.po b/addons/product/i18n/fr.po
index de574f2ad94..1b5d04bc2ea 100644
--- a/addons/product/i18n/fr.po
+++ b/addons/product/i18n/fr.po
@@ -1756,7 +1756,7 @@ msgstr "Quantité min."
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 "Indiquer une catégorie de produit si la règle n'est appliquée que sur une "
 "catégorie de produits et ses fils. Laisser vide si elle s'applique à tous "
diff --git a/addons/product/i18n/hr.po b/addons/product/i18n/hr.po
index 464763f73e7..f30e2e15828 100644
--- a/addons/product/i18n/hr.po
+++ b/addons/product/i18n/hr.po
@@ -1672,7 +1672,7 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/hu.po b/addons/product/i18n/hu.po
index 314de2b9225..161c1bb099f 100644
--- a/addons/product/i18n/hu.po
+++ b/addons/product/i18n/hu.po
@@ -1675,7 +1675,7 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/id.po b/addons/product/i18n/id.po
index cb1c2eab207..d94af708cae 100644
--- a/addons/product/i18n/id.po
+++ b/addons/product/i18n/id.po
@@ -1672,7 +1672,7 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/it.po b/addons/product/i18n/it.po
index a9563091940..c7b10727187 100644
--- a/addons/product/i18n/it.po
+++ b/addons/product/i18n/it.po
@@ -1763,7 +1763,7 @@ msgstr "Quantità Minima"
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 "Selezionare una categoria di prodotti se questa regola va applicata ai "
 "prodotti di una categoria e le sue sottocategorie. Lasciare vuoto per tutti "
diff --git a/addons/product/i18n/ko.po b/addons/product/i18n/ko.po
index aef302433fd..4eea960468d 100644
--- a/addons/product/i18n/ko.po
+++ b/addons/product/i18n/ko.po
@@ -1683,7 +1683,7 @@ msgstr "최소 수량"
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 "이 규칙이 어느 한 카테고리와 그 차일드 카테고리들의 상품에만 적용될 경우, 상품 카테고리를 설정합니다. 모든 상품의 경우는 비워 "
 "두십시오."
diff --git a/addons/product/i18n/lt.po b/addons/product/i18n/lt.po
index d0c67a0b681..ca53898de03 100644
--- a/addons/product/i18n/lt.po
+++ b/addons/product/i18n/lt.po
@@ -1719,7 +1719,7 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/lv.po b/addons/product/i18n/lv.po
index ce2878d90c1..59d9f5838db 100644
--- a/addons/product/i18n/lv.po
+++ b/addons/product/i18n/lv.po
@@ -1673,7 +1673,7 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/nb.po b/addons/product/i18n/nb.po
index 35f9b4ccf56..1ba802eb317 100644
--- a/addons/product/i18n/nb.po
+++ b/addons/product/i18n/nb.po
@@ -1675,7 +1675,7 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/nb_NB.po b/addons/product/i18n/nb_NB.po
index 74e08e40d52..a11793571b4 100644
--- a/addons/product/i18n/nb_NB.po
+++ b/addons/product/i18n/nb_NB.po
@@ -1699,7 +1699,7 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/nl.po b/addons/product/i18n/nl.po
index d63a657bf85..53d47baf539 100644
--- a/addons/product/i18n/nl.po
+++ b/addons/product/i18n/nl.po
@@ -1758,7 +1758,7 @@ msgstr "Min. hoeveelheid"
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 "Selecteer een productcategorie als deze regel alleen betrekking heeft op "
 "producten van één categorie en diens subcategorieën. Laat deze leeg voor "
diff --git a/addons/product/i18n/nl_BE.po b/addons/product/i18n/nl_BE.po
index 69373408224..d30f375aa5a 100644
--- a/addons/product/i18n/nl_BE.po
+++ b/addons/product/i18n/nl_BE.po
@@ -1593,7 +1593,7 @@ msgstr ""
 
 #. module: product
 #: help:product.pricelist.item,categ_id:0
-msgid "Set a category of product if this rule only apply to products of a category and his childs. Keep empty for all products"
+msgid "Set a category of product if this rule only apply to products of a category and his children. Keep empty for all products"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/pl.po b/addons/product/i18n/pl.po
index b1099930e33..6dcece2c8dc 100644
--- a/addons/product/i18n/pl.po
+++ b/addons/product/i18n/pl.po
@@ -1750,7 +1750,7 @@ msgstr "Ilość minimalna"
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 "Ustaw kategorię produktu, jeśli ta reguła ma dotyczyć produktów tej "
 "kategorii lub kategorii podrzędnych. Zostaw puste, jeśli ma dotyczyć "
diff --git a/addons/product/i18n/product.pot b/addons/product/i18n/product.pot
index 303354de6d9..ef2585674a5 100644
--- a/addons/product/i18n/product.pot
+++ b/addons/product/i18n/product.pot
@@ -1593,7 +1593,7 @@ msgstr ""
 
 #. module: product
 #: help:product.pricelist.item,categ_id:0
-msgid "Set a category of product if this rule only apply to products of a category and his childs. Keep empty for all products"
+msgid "Set a category of product if this rule only apply to products of a category and his children. Keep empty for all products"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/pt.po b/addons/product/i18n/pt.po
index a4ec6d20c62..cad3b0046f7 100644
--- a/addons/product/i18n/pt.po
+++ b/addons/product/i18n/pt.po
@@ -1732,7 +1732,7 @@ msgstr "Quantidade mínima"
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 "Defina a categoria se esta regra aplica-se apenas a artigos dessa categoria "
 "e dependentes. Deixe vazio para todos os artigos."
diff --git a/addons/product/i18n/pt_BR.po b/addons/product/i18n/pt_BR.po
index b1a8eeb60a8..951a6460069 100644
--- a/addons/product/i18n/pt_BR.po
+++ b/addons/product/i18n/pt_BR.po
@@ -1732,7 +1732,7 @@ msgstr "Quantidade mínima"
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 "Defina uma categoria de produto, se esta regra apenas se aplica aos produtos "
 "de uma categoria e seus filhos. Mantenha em branco para todos os produtos"
diff --git a/addons/product/i18n/ro.po b/addons/product/i18n/ro.po
index 5cd2be6e211..7a325044c89 100644
--- a/addons/product/i18n/ro.po
+++ b/addons/product/i18n/ro.po
@@ -1672,7 +1672,7 @@ msgstr "Cantitatea minima"
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/ru.po b/addons/product/i18n/ru.po
index 2d5ccd8e9f5..2be22127e10 100644
--- a/addons/product/i18n/ru.po
+++ b/addons/product/i18n/ru.po
@@ -1689,7 +1689,7 @@ msgstr "Мин. кол-во"
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/sk.po b/addons/product/i18n/sk.po
index 9603cb67211..5c21c46d4ad 100644
--- a/addons/product/i18n/sk.po
+++ b/addons/product/i18n/sk.po
@@ -1683,7 +1683,7 @@ msgstr "Min. množstvo"
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/sl.po b/addons/product/i18n/sl.po
index dfeda387f0a..8d3a09702ab 100644
--- a/addons/product/i18n/sl.po
+++ b/addons/product/i18n/sl.po
@@ -1697,7 +1697,7 @@ msgstr "Min. količina"
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/sq.po b/addons/product/i18n/sq.po
index 5a6e63362c5..fac0805c63d 100644
--- a/addons/product/i18n/sq.po
+++ b/addons/product/i18n/sq.po
@@ -1594,7 +1594,7 @@ msgstr ""
 
 #. module: product
 #: help:product.pricelist.item,categ_id:0
-msgid "Set a category of product if this rule only apply to products of a category and his childs. Keep empty for all products"
+msgid "Set a category of product if this rule only apply to products of a category and his children. Keep empty for all products"
 msgstr ""
 
 #. module: product
@@ -3216,7 +3216,7 @@ msgstr ""
 
 #. module: product
 #: help:product.pricelist.item,categ_id:0
-msgid "Set a category of product if this rule only apply to products of a category and his childs. Keep empty for all products"
+msgid "Set a category of product if this rule only apply to products of a category and his children. Keep empty for all products"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/sr.po b/addons/product/i18n/sr.po
index a263076896e..06187712649 100644
--- a/addons/product/i18n/sr.po
+++ b/addons/product/i18n/sr.po
@@ -1744,7 +1744,7 @@ msgstr "Min. količina"
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 "Postavite kategoriju proizvoda ako se ovo pravilo odnosi na proizvode "
 "kategorije i pod kategorije. Ostavite prazno za sve proizvode"
diff --git a/addons/product/i18n/sv.po b/addons/product/i18n/sv.po
index 52125e3d02d..29b4b9488f2 100644
--- a/addons/product/i18n/sv.po
+++ b/addons/product/i18n/sv.po
@@ -1749,7 +1749,7 @@ msgstr "Minsta kvantitet"
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 "Bestäm en produktkategori om denna regel endast tillämpas på produkter i en "
 "kategori och barnprodukter. Håll tomt för alla produkter"
diff --git a/addons/product/i18n/tlh.po b/addons/product/i18n/tlh.po
index d0bb08373d1..09fea75c945 100644
--- a/addons/product/i18n/tlh.po
+++ b/addons/product/i18n/tlh.po
@@ -1672,7 +1672,7 @@ msgstr ""
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/tr.po b/addons/product/i18n/tr.po
index d023fcdd436..18814586852 100644
--- a/addons/product/i18n/tr.po
+++ b/addons/product/i18n/tr.po
@@ -1672,7 +1672,7 @@ msgstr "Mil. Miktar"
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/uk.po b/addons/product/i18n/uk.po
index 729659b5c77..7701fe4c8a1 100644
--- a/addons/product/i18n/uk.po
+++ b/addons/product/i18n/uk.po
@@ -1688,7 +1688,7 @@ msgstr "Мін. кількість"
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/vi.po b/addons/product/i18n/vi.po
index 48adf03071b..463943bb352 100644
--- a/addons/product/i18n/vi.po
+++ b/addons/product/i18n/vi.po
@@ -1673,7 +1673,7 @@ msgstr "Số lượng tối thiểu"
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/zh_CN.po b/addons/product/i18n/zh_CN.po
index 344fde38a0e..aad76c7f01e 100644
--- a/addons/product/i18n/zh_CN.po
+++ b/addons/product/i18n/zh_CN.po
@@ -1672,7 +1672,7 @@ msgstr "最小数量"
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr "设置产品类别如果这规则只适合产品分类和它的子项.留空为为全部"
 
 #. module: product
diff --git a/addons/product/i18n/zh_TW.po b/addons/product/i18n/zh_TW.po
index 73246b4bdc5..5817763e2e1 100644
--- a/addons/product/i18n/zh_TW.po
+++ b/addons/product/i18n/zh_TW.po
@@ -1672,7 +1672,7 @@ msgstr "最小数量"
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 001bee74055..05302685bcd 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -363,7 +363,7 @@ class product_pricelist_item(osv.osv):
         'price_version_id': fields.many2one('product.pricelist.version', 'Price List Version', required=True, select=True, ondelete='cascade'),
         'product_tmpl_id': fields.many2one('product.template', 'Product Template', ondelete='cascade', help="Set a template if this rule only apply to a template of product. Keep empty for all products"),
         'product_id': fields.many2one('product.product', 'Product', ondelete='cascade', help="Set a product if this rule only apply to one product. Keep empty for all products"),
-        'categ_id': fields.many2one('product.category', 'Product Category', ondelete='cascade', help="Set a category of product if this rule only apply to products of a category and his childs. Keep empty for all products"),
+        'categ_id': fields.many2one('product.category', 'Product Category', ondelete='cascade', help="Set a category of product if this rule only apply to products of a category and his children. Keep empty for all products"),
 
         'min_quantity': fields.integer('Min. Quantity', required=True, help="The rule only applies if the partner buys/sells more than this quantity."),
         'sequence': fields.integer('Sequence', required=True, help="Gives the sequence order when displaying a list of pricelist items."),
diff --git a/addons/stock/i18n/ar.po b/addons/stock/i18n/ar.po
index b8749b91f69..68b6e3db944 100644
--- a/addons/stock/i18n/ar.po
+++ b/addons/stock/i18n/ar.po
@@ -358,7 +358,7 @@ msgstr ""
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr ""
 
 #. module: stock
diff --git a/addons/stock/i18n/bg.po b/addons/stock/i18n/bg.po
index c832e9fc3bf..93374b951f0 100644
--- a/addons/stock/i18n/bg.po
+++ b/addons/stock/i18n/bg.po
@@ -358,7 +358,7 @@ msgstr "Редове с движения"
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr "Включване на всички подчинени на това местонахождение"
 
 #. module: stock
diff --git a/addons/stock/i18n/bs.po b/addons/stock/i18n/bs.po
index e1a87b95fc4..b908bb246c3 100644
--- a/addons/stock/i18n/bs.po
+++ b/addons/stock/i18n/bs.po
@@ -358,7 +358,7 @@ msgstr "Stavke kretanja"
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr "Uključi sve podlokacije za datu lokaciju"
 
 #. module: stock
diff --git a/addons/stock/i18n/ca.po b/addons/stock/i18n/ca.po
index c39b670ecc7..badc0dde805 100644
--- a/addons/stock/i18n/ca.po
+++ b/addons/stock/i18n/ca.po
@@ -359,7 +359,7 @@ msgstr "Línies de moviment"
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr "Inclou tots els descendents de la ubicació"
 
 #. module: stock
diff --git a/addons/stock/i18n/cs.po b/addons/stock/i18n/cs.po
index b07a13d9082..01a2279ff4c 100644
--- a/addons/stock/i18n/cs.po
+++ b/addons/stock/i18n/cs.po
@@ -358,7 +358,7 @@ msgstr ""
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr ""
 
 #. module: stock
diff --git a/addons/stock/i18n/de.po b/addons/stock/i18n/de.po
index d30efde9c5b..0abd630ede3 100644
--- a/addons/stock/i18n/de.po
+++ b/addons/stock/i18n/de.po
@@ -358,7 +358,7 @@ msgstr "Buchungszeilen"
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr "Beinhaltet alle einzelnen Lagerplätze dieses Lagerortes"
 
 #. module: stock
diff --git a/addons/stock/i18n/el.po b/addons/stock/i18n/el.po
index 4eeaac056d9..71b5a0b3d01 100644
--- a/addons/stock/i18n/el.po
+++ b/addons/stock/i18n/el.po
@@ -361,7 +361,7 @@ msgstr "Γραμμές Κίνησης"
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr "Να συμπεριληφθούν τα υπό-τμήματα"
 
 #. module: stock
diff --git a/addons/stock/i18n/es.po b/addons/stock/i18n/es.po
index 2c49d783a08..132cd2e9f98 100644
--- a/addons/stock/i18n/es.po
+++ b/addons/stock/i18n/es.po
@@ -358,7 +358,7 @@ msgstr "Líneas de movimiento"
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr "Incluir todos los descendientes de la ubicación"
 
 #. module: stock
diff --git a/addons/stock/i18n/es_AR.po b/addons/stock/i18n/es_AR.po
index 27da795aec8..3d319aba59c 100644
--- a/addons/stock/i18n/es_AR.po
+++ b/addons/stock/i18n/es_AR.po
@@ -358,7 +358,7 @@ msgstr "Líneas del movimiento"
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr "Incluir todos los descendientes de la ubicación"
 
 #. module: stock
diff --git a/addons/stock/i18n/et.po b/addons/stock/i18n/et.po
index 4938a409b04..858563bbfc7 100644
--- a/addons/stock/i18n/et.po
+++ b/addons/stock/i18n/et.po
@@ -358,7 +358,7 @@ msgstr "Liiguta read"
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr "Kaasa kõik alamad asukohale"
 
 #. module: stock
diff --git a/addons/stock/i18n/fi.po b/addons/stock/i18n/fi.po
index 6a6ef949665..be2b9de447f 100644
--- a/addons/stock/i18n/fi.po
+++ b/addons/stock/i18n/fi.po
@@ -359,7 +359,7 @@ msgstr ""
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr ""
 
 #. module: stock
diff --git a/addons/stock/i18n/fr.po b/addons/stock/i18n/fr.po
index a8230d8bcfb..eb249e2e23c 100644
--- a/addons/stock/i18n/fr.po
+++ b/addons/stock/i18n/fr.po
@@ -374,7 +374,7 @@ msgstr "Lignes de mouvements"
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr "Inclure tous les sous-emplacements"
 
 #. module: stock
diff --git a/addons/stock/i18n/hr.po b/addons/stock/i18n/hr.po
index 97612c2234d..7c9c908814c 100644
--- a/addons/stock/i18n/hr.po
+++ b/addons/stock/i18n/hr.po
@@ -358,7 +358,7 @@ msgstr ""
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr ""
 
 #. module: stock
diff --git a/addons/stock/i18n/hu.po b/addons/stock/i18n/hu.po
index 075f04de2c2..be604963487 100644
--- a/addons/stock/i18n/hu.po
+++ b/addons/stock/i18n/hu.po
@@ -358,7 +358,7 @@ msgstr ""
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr ""
 
 #. module: stock
diff --git a/addons/stock/i18n/id.po b/addons/stock/i18n/id.po
index 616615c07e1..4e1692f5024 100644
--- a/addons/stock/i18n/id.po
+++ b/addons/stock/i18n/id.po
@@ -358,7 +358,7 @@ msgstr ""
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr ""
 
 #. module: stock
diff --git a/addons/stock/i18n/it.po b/addons/stock/i18n/it.po
index 87c26e2b6fb..00cb0498a59 100644
--- a/addons/stock/i18n/it.po
+++ b/addons/stock/i18n/it.po
@@ -358,7 +358,7 @@ msgstr "Movimenti"
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr "Includere tutti i derivati per la locazione"
 
 #. module: stock
diff --git a/addons/stock/i18n/ko.po b/addons/stock/i18n/ko.po
index 9759bd2b96f..5752bf370b8 100644
--- a/addons/stock/i18n/ko.po
+++ b/addons/stock/i18n/ko.po
@@ -359,7 +359,7 @@ msgstr "이동 라인"
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr "이 위치에 대한 모든 자식들을 포함"
 
 #. module: stock
diff --git a/addons/stock/i18n/lt.po b/addons/stock/i18n/lt.po
index dfd90f22f60..88c6fc4d216 100644
--- a/addons/stock/i18n/lt.po
+++ b/addons/stock/i18n/lt.po
@@ -358,7 +358,7 @@ msgstr ""
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr ""
 
 #. module: stock
diff --git a/addons/stock/i18n/nl.po b/addons/stock/i18n/nl.po
index ec9bab40170..5de4723b4bb 100644
--- a/addons/stock/i18n/nl.po
+++ b/addons/stock/i18n/nl.po
@@ -359,7 +359,7 @@ msgstr "Verplaats regels"
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr "Inclusief alle onderliggende"
 
 #. module: stock
diff --git a/addons/stock/i18n/nl_BE.po b/addons/stock/i18n/nl_BE.po
index c4fa7645e8f..f11ba52346a 100644
--- a/addons/stock/i18n/nl_BE.po
+++ b/addons/stock/i18n/nl_BE.po
@@ -358,7 +358,7 @@ msgstr ""
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr ""
 
 #. module: stock
diff --git a/addons/stock/i18n/pl.po b/addons/stock/i18n/pl.po
index 824e5a0b01c..85b0703a60a 100644
--- a/addons/stock/i18n/pl.po
+++ b/addons/stock/i18n/pl.po
@@ -358,7 +358,7 @@ msgstr "Pozycje przesunięcia"
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr "Włącz podrzędne dla tej strefy"
 
 #. module: stock
diff --git a/addons/stock/i18n/pt.po b/addons/stock/i18n/pt.po
index a7fbfc88ea4..b8348a27bd4 100644
--- a/addons/stock/i18n/pt.po
+++ b/addons/stock/i18n/pt.po
@@ -358,7 +358,7 @@ msgstr "Linhas de movimento"
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr "Incluir todos os dependentes da localização"
 
 #. module: stock
diff --git a/addons/stock/i18n/pt_BR.po b/addons/stock/i18n/pt_BR.po
index 19d49bd480e..b835a1efaf5 100644
--- a/addons/stock/i18n/pt_BR.po
+++ b/addons/stock/i18n/pt_BR.po
@@ -359,7 +359,7 @@ msgstr "Mover Linhas"
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr ""
 
 #. module: stock
diff --git a/addons/stock/i18n/ro.po b/addons/stock/i18n/ro.po
index fcd4b43832d..408bc1598a7 100644
--- a/addons/stock/i18n/ro.po
+++ b/addons/stock/i18n/ro.po
@@ -358,7 +358,7 @@ msgstr ""
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr ""
 
 #. module: stock
diff --git a/addons/stock/i18n/ru.po b/addons/stock/i18n/ru.po
index 6cf8a262bac..daeb36d3521 100644
--- a/addons/stock/i18n/ru.po
+++ b/addons/stock/i18n/ru.po
@@ -358,7 +358,7 @@ msgstr ""
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr ""
 
 #. module: stock
diff --git a/addons/stock/i18n/sl.po b/addons/stock/i18n/sl.po
index 84fbcb11afd..489017e5efd 100644
--- a/addons/stock/i18n/sl.po
+++ b/addons/stock/i18n/sl.po
@@ -358,7 +358,7 @@ msgstr "Postavke knjižb"
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr ""
 
 #. module: stock
diff --git a/addons/stock/i18n/sq.po b/addons/stock/i18n/sq.po
index 5049342665d..6cd2d2e8a21 100644
--- a/addons/stock/i18n/sq.po
+++ b/addons/stock/i18n/sq.po
@@ -358,7 +358,7 @@ msgstr ""
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr ""
 
 #. module: stock
@@ -2707,7 +2707,7 @@ msgstr ""
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr ""
 
 #. module: stock
diff --git a/addons/stock/i18n/sr.po b/addons/stock/i18n/sr.po
index 0ee8799e10c..1e7cfbfc1d3 100644
--- a/addons/stock/i18n/sr.po
+++ b/addons/stock/i18n/sr.po
@@ -359,7 +359,7 @@ msgstr ""
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr "Uključivanje svih potomaka za ovu lokaciju"
 
 #. module: stock
diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot
index 2d4c615b7c1..816c045450c 100644
--- a/addons/stock/i18n/stock.pot
+++ b/addons/stock/i18n/stock.pot
@@ -357,7 +357,7 @@ msgstr ""
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr ""
 
 #. module: stock
diff --git a/addons/stock/i18n/sv.po b/addons/stock/i18n/sv.po
index 748521b7691..b11730fb9a3 100644
--- a/addons/stock/i18n/sv.po
+++ b/addons/stock/i18n/sv.po
@@ -358,7 +358,7 @@ msgstr ""
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr ""
 
 #. module: stock
diff --git a/addons/stock/i18n/th.po b/addons/stock/i18n/th.po
index d6db33207b5..74800d875d2 100644
--- a/addons/stock/i18n/th.po
+++ b/addons/stock/i18n/th.po
@@ -359,7 +359,7 @@ msgstr ""
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr ""
 
 #. module: stock
diff --git a/addons/stock/i18n/th_TH.po b/addons/stock/i18n/th_TH.po
index 743887ec224..25bafea3589 100644
--- a/addons/stock/i18n/th_TH.po
+++ b/addons/stock/i18n/th_TH.po
@@ -383,7 +383,7 @@ msgstr ""
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr ""
 
 #. module: stock
diff --git a/addons/stock/i18n/tlh.po b/addons/stock/i18n/tlh.po
index 36b604862b6..4ee15db05a1 100644
--- a/addons/stock/i18n/tlh.po
+++ b/addons/stock/i18n/tlh.po
@@ -358,7 +358,7 @@ msgstr ""
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr ""
 
 #. module: stock
diff --git a/addons/stock/i18n/tr.po b/addons/stock/i18n/tr.po
index bb3c422d784..f01945aeba2 100644
--- a/addons/stock/i18n/tr.po
+++ b/addons/stock/i18n/tr.po
@@ -358,7 +358,7 @@ msgstr "Hareket Kalemleri"
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr ""
 
 #. module: stock
diff --git a/addons/stock/i18n/uk.po b/addons/stock/i18n/uk.po
index 2ade489512c..f5e21a67f12 100644
--- a/addons/stock/i18n/uk.po
+++ b/addons/stock/i18n/uk.po
@@ -358,7 +358,7 @@ msgstr ""
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr ""
 
 #. module: stock
diff --git a/addons/stock/i18n/vi.po b/addons/stock/i18n/vi.po
index ed3f0643fc4..29aec1a1c5f 100644
--- a/addons/stock/i18n/vi.po
+++ b/addons/stock/i18n/vi.po
@@ -358,7 +358,7 @@ msgstr ""
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr ""
 
 #. module: stock
@@ -2707,7 +2707,7 @@ msgstr ""
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr ""
 
 #. module: stock
diff --git a/addons/stock/i18n/zh_CN.po b/addons/stock/i18n/zh_CN.po
index d046f9c0519..b320f49062f 100644
--- a/addons/stock/i18n/zh_CN.po
+++ b/addons/stock/i18n/zh_CN.po
@@ -358,7 +358,7 @@ msgstr "调拨线路"
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr "包括所有库位子项"
 
 #. module: stock
diff --git a/addons/stock/i18n/zh_TW.po b/addons/stock/i18n/zh_TW.po
index 6c91342e3da..0d2808efc6d 100644
--- a/addons/stock/i18n/zh_TW.po
+++ b/addons/stock/i18n/zh_TW.po
@@ -358,7 +358,7 @@ msgstr ""
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr ""
 
 #. module: stock
diff --git a/addons/stock/wizard/wizard_inventory.py b/addons/stock/wizard/wizard_inventory.py
index 42345353866..cb2be9280b9 100644
--- a/addons/stock/wizard/wizard_inventory.py
+++ b/addons/stock/wizard/wizard_inventory.py
@@ -46,7 +46,7 @@ inventory_fields = {
         'relation':'stock.location',
         'required':True
     },
-    'recursive' : {'string':'Include all childs for the location', 'type':'boolean'}
+    'recursive' : {'string':'Include all children for the location', 'type':'boolean'}
 }
 
 
diff --git a/addons/wiki/wiki_view.xml b/addons/wiki/wiki_view.xml
index d2fa06d4fd5..5169c6f0d49 100644
--- a/addons/wiki/wiki_view.xml
+++ b/addons/wiki/wiki_view.xml
@@ -83,8 +83,8 @@
             id="menu_action_wiki_groups_browse"
             action="action_wiki_groups_browse"/>-->
 
-        <record id="view_wiki_tree_childs" model="ir.ui.view">
-            <field name="name">wiki.wiki.tree.childs</field>
+        <record id="view_wiki_tree_children" model="ir.ui.view">
+            <field name="name">wiki.wiki.tree.children</field>
             <field name="model">wiki.wiki</field>
             <field name="type">tree</field>
             <field name="field_parent">child_ids</field>
diff --git a/addons/wiki/wizard/open_page.py b/addons/wiki/wizard/open_page.py
index df015f5c5a0..626deaa3780 100644
--- a/addons/wiki/wizard/open_page.py
+++ b/addons/wiki/wizard/open_page.py
@@ -49,7 +49,7 @@ class wiz_open_page(wizard.interface):
             value['view_type'] = 'form'
             value['view_mode'] = 'tree,form'
         elif group.method == 'tree':
-            view_id = pool.get('ir.ui.view').search(cr, uid, [('name','=','wiki.wiki.tree.childs')])
+            view_id = pool.get('ir.ui.view').search(cr, uid, [('name','=','wiki.wiki.tree.children')])
             value['view_id'] = view_id
             value['domain'] = [('group_id','=',group.id),('parent_id','=',False)]
             value['view_type'] = 'tree'            

From c1cb4b70d0b9c8df7dffa8706070ae682b5004f4 Mon Sep 17 00:00:00 2001
From: Numerigraphe - Lionel Sausin <ls@numerigraphe.fr>
Date: Mon, 25 Oct 2010 10:48:51 +0200
Subject: [PATCH 2/2] [IMP] wording: children intead of childs (again)

bzr revid: ls@numerigraphe.fr-20101025084851-3ri17e8ct5x7lue0
---
 addons/auction/auction.py                   |  2 +-
 addons/auction/i18n/auction.pot             |  2 +-
 addons/document_webdav/dav_fs.py            |  4 ++--
 addons/hr_evaluation/hr_evaluation.py       | 10 +++++-----
 addons/product/i18n/el.po                   |  2 +-
 addons/product/i18n/es_EC.po                |  2 +-
 addons/product/i18n/eu.po                   |  2 +-
 addons/product/i18n/fi.po                   |  2 +-
 addons/product/i18n/ko.po                   |  2 +-
 addons/product/i18n/mn.po                   |  2 +-
 addons/product/i18n/nb.po                   |  2 +-
 addons/product/i18n/vi.po                   |  2 +-
 addons/project_planning/project_planning.py | 12 ++++++------
 addons/stock/i18n/es_EC.po                  |  2 +-
 addons/stock/i18n/mn.po                     |  2 +-
 addons/stock/test/stock_report.yml          |  2 +-
 addons/wiki/wiki.py                         |  2 +-
 addons/wiki/wizard/wiki_create_menu.py      |  2 +-
 18 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/addons/auction/auction.py b/addons/auction/auction.py
index 870194fa125..20090def512 100644
--- a/addons/auction/auction.py
+++ b/addons/auction/auction.py
@@ -190,7 +190,7 @@ class aie_category(osv.osv):
        'name': fields.char('Name', size=64, required=True),
        'code':fields.char('Code', size=64),
        'parent_id': fields.many2one('aie.category', 'Parent aie Category', ondelete='cascade'),
-       'child_ids': fields.one2many('aie.category', 'parent_id', help="Childs aie category")
+       'child_ids': fields.one2many('aie.category', 'parent_id', help="children aie category")
     }
 
     def name_get(self, cr, uid, ids, context=None):
diff --git a/addons/auction/i18n/auction.pot b/addons/auction/i18n/auction.pot
index 8c8e0dc2a96..ba25f39b356 100644
--- a/addons/auction/i18n/auction.pot
+++ b/addons/auction/i18n/auction.pot
@@ -1461,7 +1461,7 @@ msgstr ""
 
 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""
 
 #. module: auction
diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py
index 5d7fa2b5ec6..6b2a204b12f 100644
--- a/addons/document_webdav/dav_fs.py
+++ b/addons/document_webdav/dav_fs.py
@@ -307,7 +307,7 @@ class openerp_dav_handler(dav_interface):
                 fp = node.full_path()
                 if fp and len(fp):
                     fp = '/'.join(fp)
-                    self.parent.log_message('childs for: %s' % fp)
+                    self.parent.log_message('children for: %s' % fp)
                 else:
                     fp = None
                 domain = None
@@ -345,7 +345,7 @@ class openerp_dav_handler(dav_interface):
         except DAV_Error:
             raise
         except Exception, e:
-            self.parent.log_error("cannot get_childs: "+ str(e))
+            self.parent.log_error("cannot get_children: "+ str(e))
             raise
         finally:
             if cr: cr.close()
diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index a8b2a3e2c69..e8066a7299f 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -211,15 +211,15 @@ class hr_evaluation(osv.osv):
         for evaluation in self.browse(cr, uid, ids, context=context):
             wait = False
             for phase in evaluation.plan_id.phase_ids:
-                childs = []
+                children = []
                 if phase.action == "bottom-up":
-                    childs = evaluation.employee_id.child_ids
+                    children = evaluation.employee_id.child_ids
                 elif phase.action in ("top-down", "final"):
                     if evaluation.employee_id.parent_id:
-                        childs = [evaluation.employee_id.parent_id]
+                        children = [evaluation.employee_id.parent_id]
                 elif phase.action == "self":
-                    childs = [evaluation.employee_id]
-                for child in childs:
+                    children = [evaluation.employee_id]
+                for child in children:
 #                    if not child.user_id:
 #                        continue
 
diff --git a/addons/product/i18n/el.po b/addons/product/i18n/el.po
index 726b4b10daf..e6deaabe800 100644
--- a/addons/product/i18n/el.po
+++ b/addons/product/i18n/el.po
@@ -1927,7 +1927,7 @@ msgstr "Έκπτωση Τιμής"
 #~ "αποθηκευόμενα προϊόντα με απεριόριστο στόκ ή χωρίς διαχείριση αποθήκευσης "
 #~ "στο σύστημα."
 
-#~ msgid "Childs Categories"
+#~ msgid "children Categories"
 #~ msgstr "Υποκατηγορίες"
 
 #~ msgid ""
diff --git a/addons/product/i18n/es_EC.po b/addons/product/i18n/es_EC.po
index 4a86e904af0..d15982674be 100644
--- a/addons/product/i18n/es_EC.po
+++ b/addons/product/i18n/es_EC.po
@@ -1749,7 +1749,7 @@ msgstr "Cantidad mín."
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 "Indicar una categoría de producto si esta regla sólo se aplica a productos "
 "de una categoría y a sus descendientes. Dejarlo vacío para todos los "
diff --git a/addons/product/i18n/eu.po b/addons/product/i18n/eu.po
index f01bcd3abda..5ea59fb6dd2 100644
--- a/addons/product/i18n/eu.po
+++ b/addons/product/i18n/eu.po
@@ -1675,7 +1675,7 @@ msgstr "Kopuru Minimoa"
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 
 #. module: product
diff --git a/addons/product/i18n/fi.po b/addons/product/i18n/fi.po
index b46d2160e96..4cdc4ed2849 100644
--- a/addons/product/i18n/fi.po
+++ b/addons/product/i18n/fi.po
@@ -1808,7 +1808,7 @@ msgstr "Hinnanalennus"
 #~ "tuotteita joilla on loppumaton varasto, tai ne ovat järjestelmässä ilman "
 #~ "varastonhallintaa."
 
-#~ msgid "Childs Categories"
+#~ msgid "children Categories"
 #~ msgstr "Alakategoriat"
 
 #~ msgid "You can not have 2 pricelist version that overlaps!"
diff --git a/addons/product/i18n/ko.po b/addons/product/i18n/ko.po
index 82ba1557ac2..09f2388f102 100644
--- a/addons/product/i18n/ko.po
+++ b/addons/product/i18n/ko.po
@@ -1744,7 +1744,7 @@ msgstr "가격 할인"
 #~ msgid "Rentable product"
 #~ msgstr "대여 가능한 상품"
 
-#~ msgid "Childs Categories"
+#~ msgid "children Categories"
 #~ msgstr "차일드 카테고리"
 
 #~ msgid "Price Max. Margin"
diff --git a/addons/product/i18n/mn.po b/addons/product/i18n/mn.po
index da9bb9f8b4a..4247b7290c0 100644
--- a/addons/product/i18n/mn.po
+++ b/addons/product/i18n/mn.po
@@ -1735,7 +1735,7 @@ msgstr "Хамгийн бага тоо"
 #: help:product.pricelist.item,categ_id:0
 msgid ""
 "Set a category of product if this rule only apply to products of a category "
-"and his childs. Keep empty for all products"
+"and his children. Keep empty for all products"
 msgstr ""
 "Энэ дүрэм үйлчлэх барааны ангиллыг сонгоно. Хэрэв бүх бараанд хамаатай бол "
 "хоосон орхино."
diff --git a/addons/product/i18n/nb.po b/addons/product/i18n/nb.po
index 8f242661526..57faa736d86 100644
--- a/addons/product/i18n/nb.po
+++ b/addons/product/i18n/nb.po
@@ -1712,7 +1712,7 @@ msgstr ""
 #~ "ferdigstillingen av det ferdige produktet. Dette er tiden du lover deg til "
 #~ "ovenfor kunden."
 
-#~ msgid "Childs Categories"
+#~ msgid "children Categories"
 #~ msgstr "Barnekategori"
 
 #~ msgid "Price Min. Margin"
diff --git a/addons/product/i18n/vi.po b/addons/product/i18n/vi.po
index d895f25efde..29d295e4965 100644
--- a/addons/product/i18n/vi.po
+++ b/addons/product/i18n/vi.po
@@ -1727,7 +1727,7 @@ msgstr "Giảm giá"
 #~ msgid "Rentable product"
 #~ msgstr "Sản phẩm có thể cho thuê"
 
-#~ msgid "Childs Categories"
+#~ msgid "children Categories"
 #~ msgstr "Danh mục con"
 
 #~ msgid "Price Max. Margin"
diff --git a/addons/project_planning/project_planning.py b/addons/project_planning/project_planning.py
index 759057fbaef..c36bd9eb594 100644
--- a/addons/project_planning/project_planning.py
+++ b/addons/project_planning/project_planning.py
@@ -68,12 +68,12 @@ class report_account_analytic_planning(osv.osv):
             ids_dept = obj_dept.search(cr, uid, [('id', 'child_of', mgnt_dept_ids)], context=context)
             if ids_dept:
                 data_dept = obj_dept.read(cr, uid, ids_dept, ['member_ids'], context=context)
-                childs = map(lambda x: x['member_ids'], data_dept)
-                childs = tools.flatten(childs)
-                childs = obj_user.search(cr, uid, [('id', 'in', childs),('active', '=', True)], context=context)
-                if user_id in childs:
-                    childs.remove(user_id)
-                child_ids.extend(tools.flatten(childs))
+                children = map(lambda x: x['member_ids'], data_dept)
+                children = tools.flatten(children)
+                children = obj_user.search(cr, uid, [('id', 'in', children),('active', '=', True)], context=context)
+                if user_id in children:
+                    children.remove(user_id)
+                child_ids.extend(tools.flatten(children))
                 set = {}
                 map(set.__setitem__, child_ids, [])
                 child_ids = set.keys()
diff --git a/addons/stock/i18n/es_EC.po b/addons/stock/i18n/es_EC.po
index ac5aab45c8e..f6b7ad99c70 100644
--- a/addons/stock/i18n/es_EC.po
+++ b/addons/stock/i18n/es_EC.po
@@ -359,7 +359,7 @@ msgstr "Líneas movimiento"
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr "Incluir todos los descendientes de la ubicación"
 
 #. module: stock
diff --git a/addons/stock/i18n/mn.po b/addons/stock/i18n/mn.po
index 33e60ea3573..70d9d21bb1b 100644
--- a/addons/stock/i18n/mn.po
+++ b/addons/stock/i18n/mn.po
@@ -359,7 +359,7 @@ msgstr "Шилжих шугамууд"
 
 #. module: stock
 #: wizard_field:stock.fill_inventory,init,recursive:0
-msgid "Include all childs for the location"
+msgid "Include all children for the location"
 msgstr ""
 
 #. module: stock
diff --git a/addons/stock/test/stock_report.yml b/addons/stock/test/stock_report.yml
index f6bcd60ad5e..41acade696a 100644
--- a/addons/stock/test/stock_report.yml
+++ b/addons/stock/test/stock_report.yml
@@ -1,5 +1,5 @@
 -
-  In order to test the PDF reports defined on a stock, we will print a Stock Overviewall(childs) report
+  In order to test the PDF reports defined on a stock, we will print a Stock Overviewall(children) report
 -
   !python {model: stock.location}: |
     import netsvc, tools, os
diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py
index 2d814485a7c..d05121a3a70 100644
--- a/addons/wiki/wiki.py
+++ b/addons/wiki/wiki.py
@@ -88,7 +88,7 @@ class wiki_group(osv.osv):
             value['view_type'] = 'form'
             value['view_mode'] = 'tree,form'
         elif group.method == 'tree':
-            view_id = self.pool.get('ir.ui.view').search(cr, uid, [('name', '=', 'wiki.wiki.tree.childs')])
+            view_id = self.pool.get('ir.ui.view').search(cr, uid, [('name', '=', 'wiki.wiki.tree.children')])
             value['view_id'] = view_id
             value['domain'] = [('group_id', '=', group.id), ('parent_id', '=', False)]
             value['view_type'] = 'tree'
diff --git a/addons/wiki/wizard/wiki_create_menu.py b/addons/wiki/wizard/wiki_create_menu.py
index 7cee4f88e96..cc0cea87ec5 100644
--- a/addons/wiki/wizard/wiki_create_menu.py
+++ b/addons/wiki/wizard/wiki_create_menu.py
@@ -70,7 +70,7 @@ class wiki_create_menu(osv.osv_memory):
             value['view_type'] = 'form'
             value['view_mode'] = 'tree,form'
         elif group.method == 'tree':
-            view_id = obj_view.search(cr, uid, [('name', '=', 'wiki.wiki.tree.childs')])
+            view_id = obj_view.search(cr, uid, [('name', '=', 'wiki.wiki.tree.children')])
             value['view_id'] = view_id
             value['domain'] = [('group_id', '=', group.id), ('parent_id', '=', False)]
             value['view_type'] = 'tree'