[IMP] wording: children intead of childs (again)

bzr revid: ls@numerigraphe.fr-20101025084851-3ri17e8ct5x7lue0
2010-10-25 10:48:51 +02:00
parent ae6b790237
commit c1cb4b70d0
18 changed files with 28 additions and 28 deletions
@@ -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):
@@ -1461,7 +1461,7 @@ msgstr ""

 #. module: auction
 #: help:aie.category,child_ids:0
-msgid "Childs aie category"
+msgid "children aie category"
 msgstr ""

 #. module: auction
@@ -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()
@@ -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

@@ -1927,7 +1927,7 @@ msgstr "Έκπτωση Τιμής"
 #~ "αποθηκευόμενα προϊόντα με απεριόριστο στόκ ή χωρίς διαχείριση αποθήκευσης "
 #~ "στο σύστημα."

-#~ msgid "Childs Categories"
+#~ msgid "children Categories"
 #~ msgstr "Υποκατηγορίες"

 #~ msgid ""
@@ -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 "
@@ -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
@@ -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!"
@@ -1744,7 +1744,7 @@ msgstr "가격 할인"
 #~ msgid "Rentable product"
 #~ msgstr "대여 가능한 상품"

-#~ msgid "Childs Categories"
+#~ msgid "children Categories"
 #~ msgstr "차일드 카테고리"

 #~ msgid "Price Max. Margin"
@@ -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 ""
 "Энэ дүрэм үйлчлэх барааны ангиллыг сонгоно. Хэрэв бүх бараанд хамаатай бол "
 "хоосон орхино."
@@ -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"
@@ -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"
@@ -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()
@@ -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
@@ -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
@@ -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
@@ -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'
@@ -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'