Merge branch 'master' of http://translate.ojuso.org/git/platform/map

Conflicts:
	support/locale/fr/LC_MESSAGES/django.po

support/locale/fr/LC_MESSAGES/django.po

@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-10-11 21:16+0000\n"
-"PO-Revision-Date: 2017-10-01 16:35+0000\n"
+"POT-Creation-Date: 2017-10-08 19:45+0000\n"
+"PO-Revision-Date: 2017-10-11 18:14+0000\n"
 "Last-Translator: Emilie Heidtmann <e.heidtmann@tutanota.com>\n"
-"Language-Team: French <http://translate.ojuso.org/projects/platform/map/fr/"
-">\n"
+"Language-Team: French <http://translate.ojuso.org/projects/platform/map/fr/>"
+"\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,155 +21,157 @@ msgstr ""
 
 #: apps/contact/views.py:10
 msgid "There was an error in the contact form."
-msgstr ""
+msgstr "Il y avait une erreur dans le formulaire de contact."
 
 #: apps/contact/views.py:11
 msgid "Thank you for your message."
-msgstr ""
+msgstr "Merci pour votre message."
 
 #: apps/map/models.py:17
 msgid "Renewable Energy Generation"
-msgstr ""
+msgstr "Production d'énergie renouvelable"
 
 #: apps/map/models.py:18
 msgid "Wind"
-msgstr ""
+msgstr "Vent"
 
 #: apps/map/models.py:19
 msgid "Solar"
-msgstr ""
+msgstr "Solaire"
 
 #: apps/map/models.py:20
 msgid "Hydro"
-msgstr ""
+msgstr "Hydro"
 
 #: apps/map/models.py:22
 msgid "Power Grids"
-msgstr ""
+msgstr "Réseaux Électriques"
 
 #: apps/map/models.py:23
 msgid "Supply of Minerals"
-msgstr ""
+msgstr "Alimentation de Minéraux"
 
 #: apps/map/models.py:27
 msgid "Positive"
-msgstr ""
+msgstr "Positif"
 
 #: apps/map/models.py:28
 msgid "Negative"
-msgstr ""
+msgstr "Négatif"
 
 #: apps/map/models.py:32
 msgid "Private Land"
-msgstr ""
+msgstr "Terrain privé"
 
 #: apps/map/models.py:33
 msgid "Public Land"
-msgstr ""
+msgstr "Terrain public"
 
 #: apps/map/models.py:34
 msgid "Community Land"
-msgstr ""
+msgstr "Terrain communautaire"
 
 #: apps/map/models.py:35
 msgid "Other"
-msgstr ""
+msgstr "Autre"
 
 #: apps/map/models.py:39
 msgid "Rural"
-msgstr ""
+msgstr "Rural"
 
 #: apps/map/models.py:40 apps/map/models.py:54
 msgid "Urban"
-msgstr ""
+msgstr "Urbain"
 
 #: apps/map/models.py:44
 msgid "Water Based"
-msgstr ""
+msgstr "À base d'eau"
 
 #: apps/map/models.py:45
 msgid "Marine (e.g. Ocean, Sea)"
-msgstr ""
+msgstr "Marin (par exemple Océan, Mer)"
 
 #: apps/map/models.py:46
 msgid "Freshwater (e.g. Freshwater, Lake)"
-msgstr ""
+msgstr "Eau douce (par exemple, eau douce, lac)"
 
 #: apps/map/models.py:48
 msgid "Land Based"
-msgstr ""
+msgstr "À Base de Terre"
 
 #: apps/map/models.py:49
 msgid "Forest/Jungle"
-msgstr ""
+msgstr "Forêt/Jungle"
 
 #: apps/map/models.py:50
 msgid "Agricultural Land"
-msgstr ""
+msgstr "Terre Agricole"
 
 #: apps/map/models.py:51
 msgid "Grassland"
-msgstr ""
+msgstr "Prairie"
 
 #: apps/map/models.py:52
 msgid "Desert (Tundra, Ice or Sand)"
-msgstr ""
+msgstr "Désert (Toundra, glace ou sable)"
 
 #: apps/map/models.py:53
 msgid "Wetland (Marsh, Mangrove, Peat Soil)"
-msgstr ""
+msgstr "Terres humides (marais, mangroves, sol de tourbe)"
 
 #: apps/map/models.py:59
 msgid "Existing Project"
-msgstr ""
+msgstr "Projet Existant"
 
 #: apps/map/models.py:60
 msgid "Under Construction"
-msgstr ""
+msgstr "Sous construction"
 
 #: apps/map/models.py:61
 msgid "Projected Project"
-msgstr ""
+msgstr "Projet Projeté"
 
 #: apps/map/models.py:91
 msgid "Entry Name"
-msgstr ""
+msgstr "Nom d'entrée"
 
 #: apps/map/models.py:92
 msgid ""
 "Enter the name of the entry. This should usually be the                   "
 "name of project."
 msgstr ""
+"Entrez le nom de l'entrée. Cela devrait normalement être le nom du projet."
 
 #: apps/map/models.py:102
 msgid "Sector of economy"
-msgstr ""
+msgstr "Secteur d'économie"
 
 #: apps/map/models.py:103
 msgid ""
 "Which sector of the renewable energy economy is most                    "
 "relevant?"
 msgstr ""
+"Quel secteur de l'économie des énergies renouvelables est le plus pertinent?"
 
 #: apps/map/models.py:111
 msgid "Positive or negative?"
-msgstr ""
+msgstr "Positif ou négatif?"
 
 #: apps/map/models.py:112
 msgid "Is the case study a positive case or a negative case?"
-msgstr ""
+msgstr "L'étude de cas est-elle un cas positif ou un cas négatif?"
 
 #: apps/map/models.py:122 apps/map/templates/map/detail.html:88
 msgid "Approximate land area"
-msgstr ""
+msgstr "Superficie approximative"
 
 #: apps/map/models.py:123
 msgid "The area of land covered by the project (in km²)"
-msgstr ""
+msgstr "La superficie de terrain couverte par le projet (en km²)"
 
 #: apps/map/models.py:128
 msgid "Land ownership"
-msgstr ""
+msgstr "Propriété foncière"
 
 #: apps/map/models.py:129
 msgid "What type of ownership does the land fall under?"