Marius Stanciu e8dc4aece7 - fixing merge errors il y a 6 ans
..
strings.pot e8dc4aece7 - fixing merge errors il y a 6 ans