klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2025-07-10 20:09:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into taiste

Browse Source 
# Conflicts:
#	eboutic/templates/eboutic/eboutic_main.jinja
#	locale/fr/LC_MESSAGES/django.po
This commit is contained in:
thomas girod
2024-07-08 10:01:37 +02:00
parent 3014d8cead 0dca152436
commit eb2454eded
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
locale/fr/LC_MESSAGES/django.po
View File

@ -2454,7 +2454,7 @@ msgstr "Les clubs de L'AE"
msgid "Others UTBM's Associations"
msgstr "Les autres associations de l'UTBM"
#: core/templates/core/base.jinja:212 core/templates/core/user_tools.jinja:180
#: core/templates/core/base.jinja:187 core/templates/core/user_tools.jinja:118
msgid "Elections"
msgstr "Élections"