Marius Stanciu e8dc4aece7 - fixing merge errors 7 lat temu
..
strings.pot e8dc4aece7 - fixing merge errors 7 lat temu