From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 15 Nov 2016 11:57:35 +0000 (+0100)
Subject: Merge remote-tracking branch 'gitlab/patch-13'
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=78aa9318b9b33078a714f5369948980736745fba;p=mezzo.git

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

78aa9318b9b33078a714f5369948980736745fba
diff --cc app/locale/fr/LC_MESSAGES/django.po
index 164fa89b,8e1d9498..a6e6a5ed
--- a/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 ""