Yohann D'ANELLO e3ae7bcacf Resolve merge conflicts on german translation file		2020-12-07 22:00:27 +01:00
..
de/LC_MESSAGES	Resolve merge conflicts on german translation file	2020-12-07 22:00:27 +01:00
en/LC_MESSAGES	Don't translate in english since it is the main language	2020-12-05 13:07:37 +01:00
fr/LC_MESSAGES	Merge branch 'master' into village	2020-12-06 11:50:11 +01:00