Bug fix #194
Synchronization with production and improve translations on events
Merge master