Marius Stanciu e8dc4aece7 - fixing merge errors 7 lat temu
..
LC_MESSAGES e8dc4aece7 - fixing merge errors 7 lat temu