From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 3 Nov 2016 22:06:09 +0000 (+0100)
Subject: Merge remote-tracking branch 'gitlab/patch-9' into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=d6a01feef286f8d45985e31bb833dbe2b11e6c80;p=mezzo.git

Merge remote-tracking branch 'gitlab/patch-9' into dev
---

d6a01feef286f8d45985e31bb833dbe2b11e6c80
diff --cc app/locale/fr/LC_MESSAGES/django.po
index a31218bf,e1bcbf11..fba6fb46
--- a/app/locale/fr/LC_MESSAGES/django.po
+++ b/app/locale/fr/LC_MESSAGES/django.po
@@@ -754,8 -832,10 +756,8 @@@ msgid "R&D quota (text)
  msgstr ""
  
  #: organization/network/models.py:403
 -#, fuzzy
 -#| msgid "Program"
  msgid "R&D program"
- msgstr "Programme R&D"
+ msgstr "Programme"
  
  #: organization/network/models.py:406
  msgid "doctoral school"
@@@ -2301,11 -2439,13 +2303,11 @@@ msgstr "
  
  #: templates/media/inc/playlist_shutter.html:15
  msgid "See all videos >"
- msgstr "À voir"
+ msgstr ""
  
  #: templates/media/inc/playlist_shutter.html:37
 -#, fuzzy
 -#| msgid "Play the video"
  msgid "See the video"
 -msgstr "Jouer la vidéo"
 +msgstr "Voir la vidéo"
  
  #: templates/media/inc/playlist_shutter.html:39
  msgid "Hear the sound"
@@@ -2357,15 -2497,19 +2359,15 @@@ msgstr "
  
  #: templates/pages/teampage.html:105
  msgid "European and national projects"
- msgstr "Projets nationaux et européens"
+ msgstr ""
  
  #: templates/pages/teampage.html:130
 -#, fuzzy
 -#| msgid "Related posts"
  msgid "Products"
 -msgstr "Articles associés"
 +msgstr "Produits"
  
  #: templates/projects/project_detail.html:124
 -#, fuzzy
 -#| msgid "Projects"
  msgid "Project details"
- msgstr "Details du projet"
+ msgstr "Détails du projet"
  
  #: templates/projects/project_detail.html:130
  msgid "Program"