Fix i18n merge issues

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel
2020-10-02 16:32:15 +02:00
parent 48344072ec
commit 084bda87f9
4 changed files with 678 additions and 539 deletions

File diff suppressed because it is too large Load Diff