merge

trytond/model/modelview.py

@@ -131,7 +131,7 @@ class ModelView(Model):
                 cursor.execute('SELECT arch, field_childs, id, type, ' \
                         'inherit, model ' \
                         'FROM ir_ui_view ' \
-                        'WHERE model = %s AND type = %s' \
+                        'WHERE model = %s AND type = %s ' \
                         'ORDER BY inherit DESC, priority ASC, id ASC',
                         (self._name, view_type))
             sql_res = cursor.fetchone()

trytond/webdav/fr_FR.csv

@@ -17,7 +17,7 @@ field,"webdav.collection,parent",0,Parent,Parent,0
 field,"webdav.collection,rec_name",0,Name,Nom,0
 model,"ir.action,name",act_collection_form,Collections,Collections,0
 model,"ir.action,name",act_collection_tree,Collections,Collections,0
-model,"ir.ui.menu,name",menu_collection_form,New Collection,Editer les collections,0
+model,"ir.ui.menu,name",menu_collection_form,New Collection,Nouvelle collection,0
 model,"ir.ui.menu,name",menu_collection_tree,Collections,Collections,0
 model,"ir.ui.menu,name",menu_webdav,WebDAV,WebDAV,0
 model,"webdav.collection,name",0,Collection,Collection,0