Fixed conflict with translation catalog

This commit is contained in:
2023-04-09 17:21:16 -06:00
21 changed files with 34668 additions and 42993 deletions

File diff suppressed because it is too large Load Diff