From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 8 Nov 2016 10:28:36 +0000 (+0100)
Subject: Merge branch 'dev' of gitlab.com:yomguy/ircam-www into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0dcb335c4114c5c45822fd389363cb145923be82;p=mezzo.git

Merge branch 'dev' of gitlab.com:yomguy/ircam-www into dev

Conflicts:
	app/locale/fr/LC_MESSAGES/django.po
---

0dcb335c4114c5c45822fd389363cb145923be82
diff --cc app/locale/fr/LC_MESSAGES/django.po
index 0613cf71,84639996..5d569557
--- a/app/locale/fr/LC_MESSAGES/django.po
+++ b/app/locale/fr/LC_MESSAGES/django.po
@@@ -8,7 -8,7 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2016-11-08 11:20+0100\n"
 -"POT-Creation-Date: 2016-11-03 23:09+0100\n"
++"POT-Creation-Date: 2016-11-08 11:28+0100\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@@ -1998,11 -2054,11 +1998,15 @@@ msgid "Follow us on Vimeo
  msgstr "Suivez-nous sur Vimeo"
  
  #: templates/base.html:154
 -msgid "Opening Times"
++#, fuzzy
++#| msgid "Opening Times"
 +msgid "Opening times"
  msgstr "Horaires d'ouverture"
  
  #: templates/base.html:161
 -msgid "Subway Access"
++#, fuzzy
++#| msgid "Subway Access"
 +msgid "Subway access"
  msgstr "Accès en transports"
  
  #: templates/base.html:180
@@@ -2331,7 -2304,7 +2335,7 @@@ msgstr "
  #: templates/magazine/article/article_detail.html:38
  #: templates/magazine/article/includes/article_card.html:45
  msgid "News"
--msgstr ""
++msgstr "À la une"
  
  #: templates/includes/calendar.html:3
  msgid "Festival calendar"
@@@ -2391,8 -2364,8 +2395,8 @@@ msgid "Medias
  msgstr ""
  
  #: templates/index.html:30
 -msgid "News"
 -msgstr "À la une"
 +msgid "News Headlines"
- msgstr "À la une"
++msgstr ""
  
  #: templates/index.html:43
  msgid "Brief"
@@@ -2442,42 -2417,46 +2446,39 @@@ msgstr "Brève !
  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 >"
 +#: templates/media/inc/playlist_shutter.html:35
 +#: templates/media/inc/playlist_shutter.html:36
 +msgid "View all medias"
  msgstr ""
  
 -#: templates/media/inc/playlist_shutter.html:14
 -msgid "View all the video medias"
 -msgstr ""
 +#: templates/network/inc/person/person_card_circle.html:32
 +msgid "resume"
 +msgstr "résumé"
  
 -#: templates/media/inc/playlist_shutter.html:15
 -msgid "See all videos >"
 -msgstr ""
 +#: templates/network/person_detail.html:37
- #| msgid "activities"
 +msgid "Activities"
 +msgstr "Activités"
  
 -#: templates/media/inc/playlist_shutter.html:37
 -msgid "See the video"
 -msgstr "Voir la vidéo"
 +#: templates/network/person_detail.html:42
- #| msgid "function"
 +msgid "Functions"
 +msgstr "Fonctions"
  
 -#: templates/media/inc/playlist_shutter.html:39
 -msgid "Hear the sound"
 -msgstr ""
 +#: templates/network/person_detail.html:46
- #| msgid "teams"
 +msgid "Teams"
 +msgstr "Équipes"
  
 -#: templates/network/inc/person/person_card_circle.html:32
 -msgid "resume"
 -msgstr ""
 +#: templates/network/person_detail.html:54
 +msgid "Organization"
 +msgstr "Organisation"
  
  #: templates/pages/form.html:24
  msgid "Submit"
  msgstr "Soumettre"
  
 -#: templates/pages/menus/current_tree_primary.html:11
 +#: templates/pages/menus/current_tree_primary.html:12
  #: templates/pages/menus/current_tree_secondary.html:31
  msgid "Accueil"
- msgstr ""
+ msgstr "Back"
  
  #: templates/pages/menus/vous_etes.html:6
  #: templates/pages/menus/vous_etes.html:15
@@@ -2512,25 -2491,8 +2513,26 @@@ msgstr "Domaines de recherche et projet
  
  #: templates/pages/teampage.html:97
  msgid "European and national projects"
- msgstr "Projets européens et nationaux"
+ msgstr "Projets nationaux et européens"
  
 +#: templates/pages/teampage.html:128
++#, fuzzy
++#| msgid "Teams"
 +msgid "Team"
- msgstr "Équipe"
++msgstr "Équipes"
 +
 +#: templates/projects/project_demo_detail.html:4
 +msgid "Demo"
 +msgstr ""
 +
 +#: templates/projects/project_demo_detail.html:18
 +msgid "Demos"
 +msgstr ""
 +
 +#: templates/projects/project_demo_detail.html:35
- #| msgid "Projects"
 +msgid "Project"
 +msgstr "Projet"
 +
  #: templates/projects/project_detail.html:124
  msgid "Project details"
  msgstr "Détails du projet"
@@@ -2568,8 -2530,8 +2570,10 @@@ msgid "Project lead team
  msgstr ""
  
  #: templates/projects/project_detail.html:213
 -msgid "Coordinator"
 -msgstr "Coordinateur"
++#, fuzzy
++#| msgid "lead organization"
 +msgid "Project lead organization"
- msgstr "Projet de l'organisation principale"
++msgstr "organisation principale"
  
  #: templates/projects/project_detail.html:230
  msgid "Partners"
@@@ -2885,21 -2853,6 +2889,24 @@@ msgstr "
  msgid "Recent Tweets"
  msgstr "Tweets récents"
  
++#~ msgid "Coordinator"
++#~ msgstr "Coordinateur"
++
 +#~ msgid "attachment organization"
 +#~ msgstr "organisation rattachée"
 +
 +#~ msgid "Location:"
 +#~ msgstr "Lieu :"
 +
 +#~ msgid "Archives"
 +#~ msgstr "Archives"
 +
 +#~ msgid "archive"
 +#~ msgstr "archive"
 +
 +#~ msgid "See the video"
 +#~ msgstr "Voir la vidéo"
 +
  #~ msgid "Jobs/Internships"
  #~ msgstr "Offres d'emplois et stages"