[MERGE] removed a few warnings.

bzr revid: vmt@openerp.com-20121022132759-64qupagcv9cdqnkq

diff --cc openerp/addons/base/ir/ir_translation.py
Simple merge

diff --cc openerp/addons/base/security/ir.model.access.csv
index 2b49887,92118a0..8e9134f
--- 1/openerp/addons/base/security/ir.model.access.csv
--- 2/openerp/addons/base/security/ir.model.access.csv
+++ b/openerp/addons/base/security/ir.model.access.csv
@@@ -7,7 -7,8 +7,8 @@@
  "access_ir_cron_user","ir_cron user","model_ir_cron","group_user",1,0,0,0
  "access_ir_default_group_system","ir_default group_system","model_ir_default",,1,1,1,1
  "access_ir_exports_group_system","ir_exports group_system","model_ir_exports","base.group_user",1,1,1,1
 -"access_ir_exports_line_group_system","ir_exports_line group_system","model_ir_exports_line","base.group_user",1,0,0,0
 +"access_ir_exports_line_group_system","ir_exports_line group_system","model_ir_exports_line","base.group_user",1,1,1,1
+ "access_ir_fields_converter_group_system","ir_fields_converter","model_ir_fields_converter","base.group_user",1,1,1,1
  "access_ir_model_group_erp_manager","ir_model group_erp_manager","model_ir_model","group_erp_manager",1,1,1,1
  "access_ir_model_constraint_group_erp_manager","ir_model_constraint group_erp_manager","model_ir_model_constraint","group_erp_manager",1,1,1,1
  "access_ir_model_relation_group_erp_manager","ir_model_relation group_erp_manager","model_ir_model_relation","group_erp_manager",1,1,1,1