fix translations after conflict

This commit is contained in:
clovis 2023-01-13 13:50:41 +01:00
parent 9fb32bbfd2
commit d9fc3754bf

File diff suppressed because it is too large Load diff