Traduction de noms + Correction conflit
Authored by: lianhua 2015-11-10
Parent: [r164]
Child: [r166]