Merge branch 'master' of upstream server, and a merge conflict has been
resolved.
In the area of translations: I have renamed the fr-be and nl-be folders to fr_BE and nl_BE respectively, which seemed necessary according to Django. Additionally, I also removed some obsolete code, and changed all the old DTL tags for translation to their newer counterparts. Next to blocktranslate, I added the "trimmed" keyword, which removes newlines from the generated .po files. Next commit will be changes to the text that I wanted to change, and after that, the actual translation process can begin.
- Author
- Maarten Vangeneugden
- Date
- Dec. 3, 2022, 8:21 p.m.
- Hash
- fa2fffba4ada6c95d7181b518fd50d71baf04a9e
- Parents
-
0c65899b734f4aa30789da73dd07c6c7e49e7e62
- f4b625bb14e0d436f1d0baf1c7b680c913c2a2fb
- Modified files
- f4b625bb14e0d436f1d0baf1c7b680c913c2a2fb