Merge conflicts fixed

This commit is contained in:
2022-01-28 12:15:51 +01:00
parent f4516f8369
commit 646f39b9ed
48 changed files with 1161 additions and 115 deletions

View File

@@ -52,6 +52,8 @@ Since %date%: Depuis le %date%
since %date%: depuis le %date%
Until %date%: Jusqu'au %date%
until %date%: jusqu'au %date%
Since: Depuis le
Until: Jusqu'au
#elements used in software
centers: centres
Centers: Centres