Merge remote-tracking branch 'gitlab/patch-13'

diff --cc app/locale/fr/LC_MESSAGES/django.po
index 164fa89b5a1762916357b8b08615d3acb4788ec9,8e1d94980ff1f2a55eecb35944547530ccc4cf8f..a6e6a5ed2c1ed3946a23995e1b4f892b887d9a09
--- 1/app/locale/fr/LC_MESSAGES/django.po
--- 2/app/locale/fr/LC_MESSAGES/django.po
+++ b/app/locale/fr/LC_MESSAGES/django.po
@@@ -60,12 -61,12 +60,12 @@@ msgstr "Projets
  msgid "Shop"
  msgstr ""
  
 -#: local_settings.py:134 templates/job/job_offer_list.html:4
 +#: local_settings.py:138 templates/job/job_offer_list.html:4
  #: templates/job/job_offer_list.html:15
  msgid "Jobs"
- msgstr "Offres d'emploi"
+ msgstr "Offres d'emplois et stages"
  
 -#: local_settings.py:135
 +#: local_settings.py:139
  msgid "Festival"
  msgstr ""