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

diff --cc app/locale/fr/LC_MESSAGES/django.po
index fba6fb4637dc9c6178cd3ea81036e55efd2b0c05,ca59cde41efcf357bd91411c7338cb13c83ca04e..52c3c0040ac4a640913ba90ba88fc698c6c41e5f
--- 1/app/locale/fr/LC_MESSAGES/django.po
--- 2/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"