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

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

4c8a0f18e86d0d8bfcffdb5cdb82652b152a9d77
diff --cc app/locale/fr/LC_MESSAGES/django.po
index fba6fb46,ca59cde4..52c3c004
--- a/app/locale/fr/LC_MESSAGES/django.po
+++ b/app/locale/fr/LC_MESSAGES/django.po
@@@ -47,12 -49,16 +47,12 @@@ msgstr "Magazine
  
  #: local_settings.py:101 templates/network/organization_list.html:4
  #: templates/network/organization_list.html:18
 -#, fuzzy
 -#| msgid "work"
  msgid "Network"
- msgstr "Travail"
+ msgstr "Réseaux"
  
  #: local_settings.py:109
 -#, fuzzy
 -#| msgid "activity"
  msgid "Activity"
 -msgstr "activité"
 +msgstr "Activité"
  
  #: local_settings.py:119
  msgid "Projects"
@@@ -1547,12 -1643,14 +1547,12 @@@ msgstr "
  #: organization/projects/models.py:32 organization/projects/models.py:84
  #: organization/projects/models.py:89 organization/projects/models.py:94
  #: organization/projects/models.py:99 organization/projects/models.py:104
 -#, fuzzy
 -#| msgid "Projects"
  msgid "project"
 -msgstr "Projets"
 +msgstr "projets"
  
  #: organization/projects/models.py:44
- msgid "in progress"
- msgstr ""
+ msgid "In progress"
+ msgstr "En cours"
  
  #: organization/projects/models.py:46 organization/projects/models.py:50
  msgid "pending"