Marius Stanciu e8dc4aece7 - fixing merge errors 6 年之前
..
strings.mo e8dc4aece7 - fixing merge errors 6 年之前
strings.po e8dc4aece7 - fixing merge errors 6 年之前