Improvements of program appearance in the editor + Internationalisation
Merge