From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Wed, 26 Oct 2016 11:19:07 +0000 (+0200)
Subject: Merge remote-tracking branch 'gitlab/patch-7' into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3b653b78ec58f52bec0cb5eef668cab822c6df1a;p=mezzo.git

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

3b653b78ec58f52bec0cb5eef668cab822c6df1a
diff --cc app/locale/fr/LC_MESSAGES/django.po
index 1d8a784d,21d9adf4..647c51d4
--- a/app/locale/fr/LC_MESSAGES/django.po
+++ b/app/locale/fr/LC_MESSAGES/django.po
@@@ -2413,45 -2338,9 +2413,45 @@@ msgstr "
  #, fuzzy
  #| msgid "brief"
  msgid "Brief !"
- msgstr "brève"
+ msgstr "Brève"
  
 -#: templates/network/inc/person/list_circle_style.html:63
 +#: templates/media/audio/inc/audio_search.html:20
 +#: templates/media/inc/playlist_search.html:49
 +#: templates/media/video/inc/video_search.html:20
 +msgid "read more"
 +msgstr "lire la suite"
 +
 +#: templates/media/inc/playlist_shutter.html:5
 +msgid "Audios"
 +msgstr ""
 +
 +#: templates/media/inc/playlist_shutter.html:6
 +msgid "View all the audio medias"
 +msgstr ""
 +
 +#: templates/media/inc/playlist_shutter.html:7
 +msgid "See all audios >"
 +msgstr ""
 +
 +#: templates/media/inc/playlist_shutter.html:14
 +msgid "View all the video medias"
 +msgstr ""
 +
 +#: templates/media/inc/playlist_shutter.html:15
 +msgid "See all videos >"
 +msgstr ""
 +
 +#: templates/media/inc/playlist_shutter.html:37
 +#, fuzzy
 +#| msgid "Play the video"
 +msgid "See the video"
 +msgstr "Jouer la vidéo"
 +
 +#: templates/media/inc/playlist_shutter.html:39
 +msgid "Hear the sound"
 +msgstr ""
 +
 +#: templates/network/inc/person/person_card_circle.html:32
  msgid "resume"
  msgstr ""
  
@@@ -2509,9 -2393,9 +2509,9 @@@ msgstr "Articles associés
  #, fuzzy
  #| msgid "Projects"
  msgid "Project details"
- msgstr "Projets"
+ msgstr "Détails du projet"
  
 -#: templates/projects/project_detail.html:136
 +#: templates/projects/project_detail.html:130
  msgid "Program"
  msgstr "Programme"
  
@@@ -2519,25 -2403,25 +2519,25 @@@
  #, fuzzy
  #| msgid "Program"
  msgid "Program type"
- msgstr "Programme"
+ msgstr "Type de programme"
  
 -#: templates/projects/project_detail.html:157
 +#: templates/projects/project_detail.html:151
  msgid "Beginning"
- msgstr ""
+ msgstr "Début"
  
 -#: templates/projects/project_detail.html:166
 +#: templates/projects/project_detail.html:160
  msgid "End"
- msgstr ""
+ msgstr "Fin"
  
 -#: templates/projects/project_detail.html:175
 +#: templates/projects/project_detail.html:169
  msgid "Status"
- msgstr ""
+ msgstr "Statut"
  
 -#: templates/projects/project_detail.html:185
 +#: templates/projects/project_detail.html:179
  msgid "Website"
- msgstr ""
+ msgstr "Site internet"
  
 -#: templates/projects/project_detail.html:204
 +#: templates/projects/project_detail.html:198
  #, fuzzy
  #| msgid "artists"
  msgid "Participants"
@@@ -2555,10 -2439,10 +2555,10 @@@ msgstr "Coordinateur
  
  #: templates/projects/project_detail.html:230
  msgid "Partners"
- msgstr ""
+ msgstr "Partenaires"
  
  #: templates/search_results.html:5 templates/search_results.html:6
 -#: templates/search_results.html:15 templates/search_results.html:22
 +#: templates/search_results.html:15
  msgid "Search Results"
  msgstr "Resultats de recherche"